refactor: COMMITs added to release locks immediately. UTC usage. Testing env for test branch.

postgresql/docker/docker-compose.yml

@@ -0,0 +1,20 @@
+services:
+  postgres:
+    image: postgres:${PG_VERSION}
+    container_name: zabbix-db-test
+    environment:
+      POSTGRES_PASSWORD: zabbix
+      POSTGRES_USER: zabbix
+      POSTGRES_DB: zabbix
+      PGDATA: /var/lib/postgresql/data/pgdata
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./init_scripts:/docker-entrypoint-initdb.d
+    tmpfs:
+      - /var/lib/postgresql/data
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U zabbix"]
+      interval: 5s
+      timeout: 5s
+      retries: 5

postgresql/docker/init_scripts/00_init_extra_users.sql

@@ -0,0 +1,5 @@
+-- Create additional user for partitioning tasks
+CREATE USER zbx_part WITH PASSWORD 'zbx_part';
+GRANT CONNECT ON DATABASE zabbix TO zbx_part;
+-- Grant usage on public schema (standard for PG 15+)
+GRANT USAGE ON SCHEMA public TO zbx_part;

postgresql/docker/init_scripts/01_10_partitions_init.sql

@@ -0,0 +1,49 @@
+-- ============================================================================
+-- SCRIPT: 00_partitions_init.sql
+-- DESCRIPTION: Creates the 'partitions' schema and configuration table.
+--              Defines the structure for managing Zabbix partitioning.
+-- ============================================================================
+
+CREATE SCHEMA IF NOT EXISTS partitions;
+
+-- Configuration table to store partitioning settings per table
+CREATE TABLE IF NOT EXISTS partitions.config (
+    table_name      text NOT NULL,
+    period          text NOT NULL CHECK (period IN ('day', 'week', 'month', 'year')),
+    keep_history    interval NOT NULL,
+    future_partitions integer NOT NULL DEFAULT 5,
+    last_updated    timestamp WITH TIME ZONE DEFAULT (now() AT TIME ZONE 'UTC'),
+    PRIMARY KEY (table_name)
+);
+
+-- Table to track installed version of the partitioning solution
+CREATE TABLE IF NOT EXISTS partitions.version (
+    version text PRIMARY KEY,
+    installed_at timestamp with time zone DEFAULT (now() AT TIME ZONE 'UTC'),
+    description text
+);
+
+-- Set initial version
+INSERT INTO partitions.version (version, description) VALUES ('1.0', 'Initial release')
+ON CONFLICT (version) DO NOTHING;
+
+-- Default configuration for Zabbix tables (adjust as needed)
+-- History tables: Daily partitions, keep 30 days
+INSERT INTO partitions.config (table_name, period, keep_history) VALUES
+('history', 'day', '30 days'),
+('history_uint', 'day', '30 days'),
+('history_str', 'day', '30 days'),
+('history_log', 'day', '30 days'),
+('history_text', 'day', '30 days')
+ON CONFLICT (table_name) DO NOTHING;
+
+-- Trends tables: Monthly partitions, keep 12 months
+INSERT INTO partitions.config (table_name, period, keep_history) VALUES
+('trends', 'month', '12 months'),
+('trends_uint', 'month', '12 months')
+ON CONFLICT (table_name) DO NOTHING;
+
+-- Auditlog: Monthly partitions, keep 12 months
+INSERT INTO partitions.config (table_name, period, keep_history) VALUES
+('auditlog', 'month', '12 months')
+ON CONFLICT (table_name) DO NOTHING;

postgresql/docker/init_scripts/01_20_auditlog_prep.sql

@@ -0,0 +1,27 @@
+-- ============================================================================
+-- SCRIPT: 01_auditlog_prep.sql
+-- DESCRIPTION: Modifies the 'auditlog' table Primary Key to include 'clock'.
+--              This is REQUIRED for range partitioning by 'clock'.
+-- ============================================================================
+
+DO $$
+BEGIN
+    -- Check if PK needs modification
+    -- Original PK is typically on (auditid) named 'auditlog_pkey'
+    IF EXISTS (
+        SELECT 1 FROM pg_constraint 
+        WHERE conname = 'auditlog_pkey' 
+        AND conrelid = 'auditlog'::regclass
+    ) THEN
+        -- Verify if 'clock' is already in PK (basic check)
+        -- Realistically, if 'auditlog_pkey' exists on default Zabbix, it's just (auditid).
+        
+        RAISE NOTICE 'Dropping existing Primary Key on auditlog...';
+        ALTER TABLE auditlog DROP CONSTRAINT auditlog_pkey;
+        
+        RAISE NOTICE 'Creating new Primary Key on auditlog (auditid, clock)...';
+        ALTER TABLE auditlog ADD PRIMARY KEY (auditid, clock);
+    ELSE
+        RAISE NOTICE 'Constraint auditlog_pkey not found. Skipping or already modified.';
+    END IF;
+END $$;

postgresql/docker/init_scripts/01_30_maintenance.sql

@@ -0,0 +1,189 @@
+-- ============================================================================
+-- SCRIPT: 02_maintenance.sql
+-- DESCRIPTION: Core functions for Zabbix partitioning (Create, Drop, Maintain).
+-- ============================================================================
+
+-- Function to check if a partition exists
+CREATE OR REPLACE FUNCTION partitions.partition_exists(p_partition_name text) 
+RETURNS boolean AS $$
+BEGIN
+    RETURN EXISTS (
+        SELECT 1 FROM pg_class c
+        JOIN pg_namespace n ON n.oid = c.relnamespace
+        WHERE c.relname = p_partition_name
+        AND n.nspname = 'public'
+    );
+END;
+$$ LANGUAGE plpgsql;
+
+-- Function to create a partition
+CREATE OR REPLACE PROCEDURE partitions.create_partition(
+    p_parent_table text,
+    p_start_time timestamp with time zone,
+    p_end_time timestamp with time zone,
+    p_period text
+) LANGUAGE plpgsql AS $$
+DECLARE
+    v_partition_name text;
+    v_start_ts bigint;
+    v_end_ts bigint;
+    v_suffix text;
+BEGIN
+    -- (No changes needed for time here as passed params are already UTC-adjusted in caller)
+    v_start_ts := extract(epoch from p_start_time)::bigint;
+    v_end_ts := extract(epoch from p_end_time)::bigint;
+    
+    IF p_period = 'month' THEN
+        v_suffix := to_char(p_start_time, 'YYYYMM');
+    ELSE
+        v_suffix := to_char(p_start_time, 'YYYYMMDD');
+    END IF;
+    
+    v_partition_name := p_parent_table || '_p' || v_suffix;
+
+    IF NOT partitions.partition_exists(v_partition_name) THEN
+        EXECUTE format(
+            'CREATE TABLE public.%I PARTITION OF public.%I FOR VALUES FROM (%s) TO (%s)',
+            v_partition_name, p_parent_table, v_start_ts, v_end_ts
+        );
+    END IF;
+END;
+$$;
+
+-- Function to drop old partitions
+CREATE OR REPLACE PROCEDURE partitions.drop_old_partitions(
+    p_parent_table text,
+    p_retention interval,
+    p_period text
+) LANGUAGE plpgsql AS $$
+DECLARE
+    v_cutoff_ts bigint;
+    v_partition record;
+    v_partition_date timestamp with time zone;
+    v_suffix text;
+BEGIN
+    -- Calculate cutoff timestamp
+    v_cutoff_ts := extract(epoch from (now() - p_retention))::bigint;
+
+    FOR v_partition IN 
+        SELECT 
+            child.relname AS partition_name
+        FROM pg_inherits
+        JOIN pg_class parent ON pg_inherits.inhparent = parent.oid
+        JOIN pg_class child ON pg_inherits.inhrelid = child.oid
+        WHERE parent.relname = p_parent_table
+    LOOP
+        -- Parse partition suffix to determine age
+        -- Format: parent_pYYYYMM or parent_pYYYYMMDD
+        v_suffix := substring(v_partition.partition_name from length(p_parent_table) + 3);
+        
+        BEGIN
+            IF length(v_suffix) = 6 THEN -- YYYYMM
+                v_partition_date := to_timestamp(v_suffix || '01', 'YYYYMMDD') AT TIME ZONE 'UTC';
+                -- For monthly, we check if the END of the month is older than retention? 
+                -- Or just strict retention. 
+                -- To be safe, adding 1 month to check vs cutoff.
+                IF extract(epoch from (v_partition_date + '1 month'::interval)) < v_cutoff_ts THEN
+                    RAISE NOTICE 'Dropping old partition %', v_partition.partition_name;
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
+                    COMMIT; -- Release lock immediately
+                END IF;
+            ELSIF length(v_suffix) = 8 THEN -- YYYYMMDD
+                v_partition_date := to_timestamp(v_suffix, 'YYYYMMDD') AT TIME ZONE 'UTC';
+                IF extract(epoch from (v_partition_date + '1 day'::interval)) < v_cutoff_ts THEN
+                    RAISE NOTICE 'Dropping old partition %', v_partition.partition_name;
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
+                    COMMIT; -- Release lock immediately
+                END IF;
+            END IF;
+        EXCEPTION WHEN OTHERS THEN
+            -- Ignore parsing errors for non-standard partitions
+            NULL;
+        END;
+    END LOOP;
+END;
+$$;
+
+-- MAIN Procedure to maintain a single table
+CREATE OR REPLACE PROCEDURE partitions.maintain_table(
+    p_table_name text,
+    p_period text,
+    p_keep_history interval,
+    p_future_partitions integer DEFAULT 5
+) LANGUAGE plpgsql AS $$
+DECLARE
+    v_start_time timestamp with time zone;
+    v_period_interval interval;
+    i integer;
+    v_past_iterations integer;
+BEGIN
+    IF p_period = 'day' THEN
+        v_period_interval := '1 day'::interval;
+        v_start_time := date_trunc('day', now() AT TIME ZONE 'UTC');
+        -- Calculate how many past days cover the retention period
+        v_past_iterations := extract(day from p_keep_history)::integer;
+        -- Safety cap or ensure minimum? default 7 if null?
+        IF v_past_iterations IS NULL THEN v_past_iterations := 7; END IF;
+        
+    ELSIF p_period = 'week' THEN
+        v_period_interval := '1 week'::interval;
+        v_start_time := date_trunc('week', now() AT TIME ZONE 'UTC');
+        v_past_iterations := (extract(day from p_keep_history) / 7)::integer;
+
+    ELSIF p_period = 'month' THEN
+        v_period_interval := '1 month'::interval;
+        v_start_time := date_trunc('month', now() AT TIME ZONE 'UTC');
+        -- Approximate months
+        v_past_iterations := (extract(year from p_keep_history) * 12 + extract(month from p_keep_history))::integer;
+        -- Fallback if interval is just days (e.g. '365 days')
+        IF v_past_iterations = 0 THEN 
+             v_past_iterations := (extract(day from p_keep_history) / 30)::integer; 
+        END IF;
+    ELSE
+        RETURN;
+    END IF;
+
+    -- 1. Create Future Partitions (Current + Buffer)
+    FOR i IN 0..p_future_partitions LOOP
+        CALL partitions.create_partition(
+            p_table_name,
+            v_start_time + (i * v_period_interval),
+            v_start_time + ((i + 1) * v_period_interval),
+            p_period
+        );
+        COMMIT; -- Release lock immediately
+    END LOOP;
+    END LOOP;
+    
+    -- 2. Create Past Partitions (Covering retention period)
+    IF v_past_iterations > 0 THEN
+        FOR i IN 1..v_past_iterations LOOP
+            CALL partitions.create_partition(
+                p_table_name,
+                v_start_time - (i * v_period_interval),
+                v_start_time - ((i - 1) * v_period_interval),
+                p_period
+            );
+            COMMIT; -- Release lock immediately
+        END LOOP;
+    END IF;
+
+    -- 3. Drop Old Partitions
+    CALL partitions.drop_old_partitions(p_table_name, p_keep_history, p_period);
+    
+    -- 4. Update Metadata
+    UPDATE partitions.config SET last_updated = now() WHERE table_name = p_table_name;
+END;
+$$;
+
+-- Global Maintenance Procedure
+CREATE OR REPLACE PROCEDURE partitions.run_maintenance() 
+LANGUAGE plpgsql AS $$
+DECLARE
+    v_row record;
+BEGIN
+    FOR v_row IN SELECT * FROM partitions.config LOOP
+        CALL partitions.maintain_table(v_row.table_name, v_row.period, v_row.keep_history, v_row.future_partitions);
+    END LOOP;
+END;
+$$;

postgresql/docker/init_scripts/01_40_enable.sql

@@ -0,0 +1,43 @@
+-- ============================================================================
+-- SCRIPT: 03_enable_partitioning.sql
+-- DESCRIPTION: Converts standard Zabbix tables to Partitioned tables.
+--              WARNING: This renames existing tables to *_old.
+-- ============================================================================
+
+DO $$
+DECLARE
+    v_row record;
+    v_table text;
+    v_old_table text;
+    v_pk_sql text;
+BEGIN
+    FOR v_row IN SELECT * FROM partitions.config LOOP
+        v_table := v_row.table_name;
+        v_old_table := v_table || '_old';
+        
+        -- Check if table exists and is NOT already partitioned
+        IF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'r') THEN
+            RAISE NOTICE 'Converting table % to partitioned table...', v_table;
+            
+            -- 1. Rename existing table
+            EXECUTE format('ALTER TABLE public.%I RENAME TO %I', v_table, v_old_table);
+            
+            -- 2. Create new partitioned table (copying structure)
+            EXECUTE format('CREATE TABLE public.%I (LIKE public.%I INCLUDING ALL) PARTITION BY RANGE (clock)', v_table, v_old_table);
+            
+            -- 3. Create initial partitions
+            RAISE NOTICE 'Creating initial partitions for %...', v_table;
+            CALL partitions.maintain_table(v_table, v_row.period, v_row.keep_history, v_row.future_partitions); 
+            
+            -- Optional: Migrate existing data
+            -- EXECUTE format('INSERT INTO public.%I SELECT * FROM public.%I', v_table, v_old_table);
+            
+        ELSIF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'p') THEN
+             RAISE NOTICE 'Table % is already partitioned. Skipping conversion.', v_table;
+             -- Just run maintenance to ensure partitions exist
+             CALL partitions.run_maintenance();
+        ELSE
+             RAISE WARNING 'Table % not found!', v_table;
+        END IF;
+    END LOOP;
+END $$;

postgresql/docker/init_scripts/01_50_monitoring.sql

@@ -0,0 +1,28 @@
+-- ============================================================================
+-- SCRIPT: 04_monitoring_view.sql
+-- DESCRIPTION: Creates a view to monitor partition status and sizes.
+-- ============================================================================
+
+CREATE OR REPLACE VIEW partitions.monitoring AS
+SELECT
+    parent.relname AS parent_table,
+    c.table_name,
+    c.period,
+    c.keep_history,
+    count(child.relname) AS partition_count,
+    count(child.relname) FILTER (
+        WHERE
+           (c.period = 'day' AND child.relname > (parent.relname || '_p' || to_char(now(), 'YYYYMMDD')))
+           OR
+           (c.period = 'month' AND child.relname > (parent.relname || '_p' || to_char(now(), 'YYYYMM')))
+    ) AS future_partitions,
+    pg_size_pretty(sum(pg_total_relation_size(child.oid))) AS total_size,
+    min(child.relname) AS oldest_partition,
+    max(child.relname) AS newest_partition,
+    c.last_updated
+FROM partitions.config c
+JOIN pg_class parent ON parent.relname = c.table_name
+LEFT JOIN pg_inherits ON pg_inherits.inhparent = parent.oid
+LEFT JOIN pg_class child ON pg_inherits.inhrelid = child.oid
+WHERE parent.relkind = 'p' -- Only partitioned tables
+GROUP BY parent.relname, c.table_name, c.period, c.keep_history, c.last_updated;

postgresql/docker/init_scripts/04_gen_data.sql

@@ -0,0 +1,91 @@
+-- ============================================================================
+-- SCRIPT: z_gen_history_data.sql
+-- DESCRIPTION: Generates mock data for Zabbix history and trends tables.
+--              Creates a dummy host and items if they don't exist.
+-- ============================================================================
+
+DO $$
+DECLARE
+    v_hostid bigint := 900001;
+    v_groupid bigint := 900001;
+    v_interfaceid bigint := 900001;
+    v_itemid_start bigint := 900001;
+    v_start_time integer := extract(epoch from (now() - interval '7 days'))::integer;
+    v_end_time integer := extract(epoch from now())::integer;
+    i integer;
+BEGIN
+    -- 1. CREATE DUMMY STRUCTURES
+    -- Host Group
+    INSERT INTO hstgrp (groupid, name, uuid, type)
+    VALUES (v_groupid, 'Partition Test Group', 'df77189c49034553999973d8e0500001', 0)
+    ON CONFLICT DO NOTHING;
+
+    -- Host
+    INSERT INTO hosts (hostid, host, name, status, uuid)
+    VALUES (v_hostid, 'partition-test-host', 'Partition Test Host', 0, 'df77189c49034553999973d8e0500002')
+    ON CONFLICT DO NOTHING;
+
+    -- Interface
+    INSERT INTO interface (interfaceid, hostid, main, type, useip, ip, dns, port)
+    VALUES (v_interfaceid, v_hostid, 1, 1, 1, '127.0.0.1', '', '10050')
+    ON CONFLICT DO NOTHING;
+
+    -- 2. CREATE DUMMY ITEMS AND GENERATE HISTORY
+    
+    -- Item 1: Numeric Float (HISTORY)
+    INSERT INTO items (itemid, hostid, interfaceid, name, key_, type, value_type, delay, uuid)
+    VALUES (v_itemid_start + 1, v_hostid, v_interfaceid, 'Test Float Item', 'test.float', 0, 0, '1m', 'df77189c49034553999973d8e0500003');
+
+    INSERT INTO history (itemid, clock, value, ns)
+    SELECT 
+        v_itemid_start + 1,
+        ts,
+        random() * 100,
+        0
+    FROM generate_series(v_start_time, v_end_time, 60) AS ts;
+
+    INSERT INTO trends (itemid, clock, num, value_min, value_avg, value_max)
+    SELECT
+        v_itemid_start + 1,
+        (ts / 3600) * 3600, -- Hourly truncation
+        60,
+        0,
+        50,
+        100
+    FROM generate_series(v_start_time, v_end_time, 3600) AS ts;
+
+    -- Item 2: Numeric Unsigned (HISTORY_UINT)
+    INSERT INTO items (itemid, hostid, interfaceid, name, key_, type, value_type, delay, uuid)
+    VALUES (v_itemid_start + 2, v_hostid, v_interfaceid, 'Test Uint Item', 'test.uint', 0, 3, '1m', 'df77189c49034553999973d8e0500004');
+
+    INSERT INTO history_uint (itemid, clock, value, ns)
+    SELECT 
+        v_itemid_start + 2,
+        ts,
+        (random() * 1000)::integer,
+        0
+    FROM generate_series(v_start_time, v_end_time, 60) AS ts;
+
+    INSERT INTO trends_uint (itemid, clock, num, value_min, value_avg, value_max)
+    SELECT
+        v_itemid_start + 2,
+        (ts / 3600) * 3600,
+        60,
+        0,
+        500,
+        1000
+    FROM generate_series(v_start_time, v_end_time, 3600) AS ts;
+
+    -- Item 3: Character (HISTORY_STR)
+    INSERT INTO items (itemid, hostid, interfaceid, name, key_, type, value_type, delay, uuid)
+    VALUES (v_itemid_start + 3, v_hostid, v_interfaceid, 'Test Str Item', 'test.str', 0, 1, '1m', 'df77189c49034553999973d8e0500005');
+
+    INSERT INTO history_str (itemid, clock, value, ns)
+    SELECT 
+        v_itemid_start + 3,
+        ts,
+        'test_value_' || ts,
+        0
+    FROM generate_series(v_start_time, v_end_time, 300) AS ts; -- Every 5 mins
+
+END $$;

postgresql/docker/run_test_env.sh

@@ -0,0 +1,134 @@
+#!/bin/bash
+
+# Default values
+PG_VERSION=""
+ZABBIX_VERSION=""
+
+# Color codes
+GREEN='\033[0;32m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+usage() {
+    echo "Usage: $0 --pg <16|17|18> --zabbix <7.0|7.4>"
+    echo "Example: $0 --pg 16 --zabbix 7.0"
+    exit 1
+}
+
+# Parse arguments
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        --pg) PG_VERSION="$2"; shift ;;
+        --zabbix) ZABBIX_VERSION="$2"; shift ;;
+        *) echo "Unknown parameter: $1"; usage ;;
+    esac
+    shift
+done
+
+if [[ -z "$PG_VERSION" || -z "$ZABBIX_VERSION" ]]; then
+    echo -e "${RED}Error: detailed arguments required.${NC}"
+    usage
+fi
+
+# Map Zabbix version to sql-scripts folder
+if [[ "$ZABBIX_VERSION" == "7.0" ]]; then
+    SQL_DIR="../sql-scripts-70"
+elif [[ "$ZABBIX_VERSION" == "7.4" ]]; then
+    SQL_DIR="../sql-scripts-74"
+else
+    echo -e "${RED}Error: Unsupported Zabbix version. Use 7.0 or 7.4.${NC}"
+    exit 1
+fi
+
+echo -e "${GREEN}Preparing environment for PostgreSQL $PG_VERSION and Zabbix $ZABBIX_VERSION...${NC}"
+
+# Cleanup previous run
+echo "Cleaning up containers and volumes..."
+docker compose down -v > /dev/null 2>&1
+rm -rf init_scripts
+mkdir -p init_scripts
+
+# Symlink SQL scripts
+echo "Setting up initialization scripts from $SQL_DIR..."
+
+# 0. Extra Users
+if [[ -f "../init_extra_users.sql" ]]; then
+    cp "../init_extra_users.sql" ./init_scripts/00_init_extra_users.sql
+    echo "Copied extra user init script."
+fi
+
+# 1. Schema
+if [[ -f "$SQL_DIR/schema.sql" ]]; then
+    # Use 01_00 to ensure it comes before 01_10
+    cp "$SQL_DIR/schema.sql" ./init_scripts/01_00_schema.sql
+    
+    # 1.1 Partitioning Infrastructure
+    if [[ -f "../procedures/00_partitions_init.sql" ]]; then
+       cp "../procedures/00_partitions_init.sql" ./init_scripts/01_10_partitions_init.sql
+    fi
+     if [[ -f "../procedures/01_auditlog_prep.sql" ]]; then
+       cp "../procedures/01_auditlog_prep.sql" ./init_scripts/01_20_auditlog_prep.sql
+    fi
+     if [[ -f "../procedures/02_maintenance.sql" ]]; then
+       cp "../procedures/02_maintenance.sql" ./init_scripts/01_30_maintenance.sql
+    fi
+     if [[ -f "../procedures/03_enable_partitioning.sql" ]]; then
+       cp "../procedures/03_enable_partitioning.sql" ./init_scripts/01_40_enable.sql
+    fi
+     if [[ -f "../procedures/04_monitoring_view.sql" ]]; then
+       cp "../procedures/04_monitoring_view.sql" ./init_scripts/01_50_monitoring.sql
+    fi
+else
+    echo -e "${RED}Error: schema.sql not found in $SQL_DIR${NC}"
+    exit 1
+fi
+
+# 2. Images
+if [[ -f "$SQL_DIR/images.sql" ]]; then
+    cp "$SQL_DIR/images.sql" ./init_scripts/02_images.sql
+else
+    echo -e "${RED}Error: images.sql not found in $SQL_DIR${NC}"
+    exit 1
+fi
+
+# 3. Data
+if [[ -f "$SQL_DIR/data.sql" ]]; then
+    cp "$SQL_DIR/data.sql" ./init_scripts/03_data.sql
+else
+    echo -e "${RED}Error: data.sql not found in $SQL_DIR${NC}"
+    exit 1
+fi
+
+# 4. Mock History Data
+if [[ -f "../z_gen_history_data.sql" ]]; then
+    cp "../z_gen_history_data.sql" ./init_scripts/04_gen_data.sql
+    echo "Copied mock data generator."
+else
+     echo -e "${RED}Warning: z_gen_history_data.sql not found!${NC}"
+fi
+
+# Check logic for 7.4 vs 7.0 (file names might slightly differ or be organized differently if using packages, but assuming source layout provided)
+
+# Export variable for Docker Compose
+export PG_VERSION=$PG_VERSION
+
+# Run Docker Compose
+echo -e "${GREEN}Starting PostgreSQL container...${NC}"
+docker compose up -d
+
+echo -e "${GREEN}Waiting for database to be ready...${NC}"
+# Simple wait loop
+for i in {1..30}; do
+    if docker exec zabbix-db-test pg_isready -U zabbix > /dev/null 2>&1; then
+        echo -e "${GREEN}Database is ready!${NC}"
+        break
+    fi
+    echo -n "."
+    sleep 1
+done
+
+# Check if data generation finished (it runs as part of init, which might take a bit longer than just port open)
+# We can check logs
+echo "To follow initialization logs, run: docker logs -f zabbix-db-test"
+echo -e "${GREEN}Environment ready.${NC}"
+echo "Connect: psql -h localhost -p 5432 -U zabbix -d zabbix"