docs: document configurable future_partitions buffer

.gitignore

@@ -0,0 +1,2 @@
+db_credentials
+global-bundle.pem

QUICKSTART.md

@@ -1,52 +0,0 @@
-# Quickstart (PostgreSQL Partitioning Test)
-
-## Start Environment
-> **Note**: If `docker` commands fail with permission errors, run `newgrp docker` or ensure your user is in the `docker` group (`sudo usermod -aG docker $USER`) and log out/in.
-
-```bash
-cd postgresql/docker
-sudo ./run_test_env.sh --pg 16 --zabbix 7.0
-# Options: --pg <16|17|18> --zabbix <7.0|7.4>
-```
-
-## Verify
-```bash
-# Check status
-docker ps
-
-# SQL Shell
-docker exec -it zabbix-db-test psql -U zabbix -d zabbix
-# Password: zabbix
-```
-
-## Reset
-```bash
-docker compose down -v
-```
-
-## Partitioning
-See [PARTITIONING.md](../PARTITIONING.md) for details on the implemented declarative partitioning.
-
-## 🐳 Docker Deployment (Production)
-The `run_test_env.sh` script automatically populates `init_scripts` for the test environment. To deploy this in your own Docker setup:
-
-1.  **Mount Scripts**: Map the SQL procedures to `/docker-entrypoint-initdb.d/` in your PostgreSQL container.
-2.  **Order Matters**: Scripts execute alphabetically. Ensure they run **after** the Zabbix schema import.
-
-**Example `docker-compose.yml` snippet:**
-```yaml
-services:
-  postgres-server:
-    image: postgres:16
-    volumes:
-      # Mount Zabbix Schema first (e.g., as 01_schema.sql)
-      - ./zabbix_schema.sql:/docker-entrypoint-initdb.d/01_schema.sql
-      
-      # Mount Partitioning Procedures (Prefix to run AFTER schema)
-      - ../postgresql/procedures/00_partitions_init.sql:/docker-entrypoint-initdb.d/02_00_part_init.sql
-      - ../postgresql/procedures/01_auditlog_prep.sql:/docker-entrypoint-initdb.d/02_01_audit_prep.sql
-      - ../postgresql/procedures/02_maintenance.sql:/docker-entrypoint-initdb.d/02_02_maintenance.sql
-      - ../postgresql/procedures/03_enable_partitioning.sql:/docker-entrypoint-initdb.d/02_03_enable.sql
-      - ../postgresql/procedures/04_monitoring_view.sql:/docker-entrypoint-initdb.d/02_04_monitor.sql
-``` 
-The container will automatically execute these scripts on first startup, partitioning the tables.

postgresql/README.md

@@ -0,0 +1,8 @@
+# PostgreSQL Partitioning for Zabbix
+
+This directory contains solutions for partitioning a Zabbix database running on PostgreSQL. Partitioning is essential for large Zabbix environments as it eliminates the need for the built-in Zabbix Housekeeper to aggressively delete old data row-by-row, replacing it with instant DDL operations that drop entire daily or monthly chunks.
+
+## Implementations
+
+- **[procedures](procedures/)**: The recommended Declarative (SQL-based) implementation. It uses native PostgreSQL procedures and features like `pg_cron` for entirely self-contained maintenance.
+- **[script](script/)**: External script-based management solution. (Coming soon)

postgresql/docker/init_scripts/01_20_auditlog_prep.sql

@@ -1,27 +0,0 @@
--- ============================================================================
--- 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/run_test_env.sh

@@ -1,135 +0,0 @@
-#!/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"

postgresql/procedures/00_schema_create.sql

@@ -1,7 +1,6 @@
 -- ============================================================================
--- SCRIPT: 00_partitions_init.sql
--- DESCRIPTION: Creates the 'partitions' schema and configuration table.
---              Defines the structure for managing Zabbix partitioning.
+-- Creates the 'partitions' schema and configuration table.
+-- Defines the structure for managing Zabbix partitioning.
 -- ============================================================================
 
 CREATE SCHEMA IF NOT EXISTS partitions;
@@ -9,7 +8,7 @@ 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')),
+    period          text NOT NULL,
     keep_history    interval NOT NULL,
     future_partitions integer NOT NULL DEFAULT 5,
     last_updated    timestamp WITH TIME ZONE DEFAULT (now() AT TIME ZONE 'UTC'),
@@ -23,8 +22,7 @@ CREATE TABLE IF NOT EXISTS partitions.version (
     description text
 );
 
--- Set initial version
-INSERT INTO partitions.version (version, description) VALUES ('1.0', 'Initial release')
+INSERT INTO partitions.version (version, description) VALUES ('7-1', 'Zabbix 7.4 and 7.0 compatible version')
 ON CONFLICT (version) DO NOTHING;
 
 -- Default configuration for Zabbix tables (adjust as needed)

postgresql/procedures/01_auditlog_prep.sql

@@ -1,26 +0,0 @@
--- ============================================================================
--- 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/procedures/01_maintenance.sql

@@ -43,6 +43,8 @@ BEGIN
     
     IF p_period = 'month' THEN
         v_suffix := to_char(p_start_time, 'YYYYMM');
+    ELSIF p_period LIKE '%hour%' THEN
+        v_suffix := to_char(p_start_time, 'YYYYMMDDHH24');
     ELSE
         v_suffix := to_char(p_start_time, 'YYYYMMDD');
     END IF;
@@ -50,10 +52,15 @@ BEGIN
     v_partition_name := p_parent_table || '_p' || v_suffix;
 
     IF NOT partitions.partition_exists(v_partition_name) THEN
-        EXECUTE format(
-            'CREATE TABLE %I.%I PARTITION OF %I.%I FOR VALUES FROM (%s) TO (%s)',
-            v_parent_schema, v_partition_name, v_parent_schema, p_parent_table, v_start_ts, v_end_ts
-        );
+        BEGIN
+            EXECUTE format(
+                'CREATE TABLE %I.%I PARTITION OF %I.%I FOR VALUES FROM (%s) TO (%s)',
+                v_parent_schema, v_partition_name, v_parent_schema, p_parent_table, v_start_ts, v_end_ts
+            );
+        EXCEPTION WHEN invalid_object_definition THEN
+            -- Ignore overlap errors (e.g., when transitioning from daily to hourly partitioning)
+            RAISE NOTICE 'Partition % overlaps with an existing partition. Skipping.', v_partition_name;
+        END;
     END IF;
 END;
 $$;
@@ -90,27 +97,48 @@ BEGIN
         
         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
+                v_partition_date := timezone('UTC', to_timestamp(v_suffix || '01', 'YYYYMMDD')::timestamp without time zone);
+            ELSIF length(v_suffix) = 8 THEN -- YYYYMMDD
+                v_partition_date := timezone('UTC', to_timestamp(v_suffix, 'YYYYMMDD')::timestamp without time zone);
+            ELSIF length(v_suffix) = 10 THEN -- YYYYMMDDHH
+                v_partition_date := timezone('UTC', to_timestamp(v_suffix, 'YYYYMMDDHH24')::timestamp without time zone);
+            ELSE
+                CONTINUE; -- Ignore non-matching suffix lengths
+            END IF;
+        EXCEPTION WHEN OTHERS THEN
+            -- Safely ignore parsing errors for oddly named partitions
+            CONTINUE;
+        END;
+
+        -- Now check retention and execute DROP TABLE (so dropping errors are correctly raised!)
+        IF length(v_suffix) = 6 THEN -- YYYYMM
+            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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                COMMIT; -- Release lock immediately
+            END IF;
+        ELSIF length(v_suffix) = 8 THEN -- YYYYMMDD
+            -- If period is weekly, the partition spans an entire week. Otherwise, it spans one day.
+            IF p_period = 'week' THEN
+                IF extract(epoch from (v_partition_date + '1 week'::interval)) < v_cutoff_ts THEN
                     RAISE NOTICE 'Dropping old partition %', v_partition.partition_name;
                     EXECUTE format('DROP TABLE %I.%I', v_partition.partition_schema, 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';
+            ELSE
                 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 %I.%I', v_partition.partition_schema, 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;
+        ELSIF length(v_suffix) = 10 THEN -- YYYYMMDDHH
+            IF extract(epoch from (v_partition_date + p_period::interval)) < v_cutoff_ts THEN
+                RAISE NOTICE 'Dropping old partition %', v_partition.partition_name;
+                EXECUTE format('DROP TABLE %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                COMMIT; -- Release lock immediately
+            END IF;
+        END IF;
     END LOOP;
 END;
 $$;
@@ -130,23 +158,29 @@ DECLARE
 BEGIN
     IF p_period = 'day' THEN
         v_period_interval := '1 day'::interval;
-        v_start_time := date_trunc('day', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('day', now(), 'UTC');
         -- Calculate how many past days cover the retention period (86400 seconds = 1 day)
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 86400)::integer;
         
     ELSIF p_period = 'week' THEN
         v_period_interval := '1 week'::interval;
-        v_start_time := date_trunc('week', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('week', now(), 'UTC');
         -- 604800 seconds = 1 week
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 604800)::integer;
 
     ELSIF p_period = 'month' THEN
         v_period_interval := '1 month'::interval;
-        v_start_time := date_trunc('month', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('month', now(), 'UTC');
         -- Approximate 30 days per month (2592000 seconds)
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 2592000)::integer;
+        
+    ELSIF p_period LIKE '%hour%' THEN
+        v_period_interval := p_period::interval;
+        v_start_time := to_timestamp(floor(extract(epoch from now()) / extract(epoch from v_period_interval)) * extract(epoch from v_period_interval));
+        v_past_iterations := ceil(extract(epoch from p_keep_history) / extract(epoch from v_period_interval))::integer;
+        
     ELSE
-        RETURN;
+        RAISE EXCEPTION 'Unsupported partitioning period: %', p_period;
     END IF;
 
     -- 1. Create Future Partitions (Current + Buffer)

postgresql/procedures/02_enable_partitioning.sql

@@ -1,7 +1,6 @@
 -- ============================================================================
--- SCRIPT: 03_enable_partitioning.sql
--- DESCRIPTION: Converts standard Zabbix tables to Partitioned tables.
---              WARNING: This renames existing tables to *_old.
+-- Converts standard Zabbix tables to Partitioned tables.
+-- WARNING: This renames existing tables to *_old.
 -- ============================================================================
 
 DO $$
@@ -23,15 +22,24 @@ BEGIN
         WHERE c.relname = v_table;
 
         
-        -- 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 %I.%I RENAME TO %I', v_schema, v_table, v_old_table);
             
-            -- 2. Create new partitioned table (copying structure)
-            EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING ALL) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+            -- 2. Create new partitioned table (handling auditlog PK uniquely)
+            IF v_table = 'auditlog' THEN
+                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING DEFAULTS INCLUDING COMMENTS) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+                EXECUTE format('ALTER TABLE %I.%I ADD PRIMARY KEY (auditid, clock)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_p_1 ON %I.%I (userid, clock)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_p_2 ON %I.%I (clock)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_p_3 ON %I.%I (resourcetype, resourceid)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_p_4 ON %I.%I (recordsetid)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_p_5 ON %I.%I (ip)', v_schema, v_table);
+            ELSE
+                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING ALL) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+            END IF;
             
             -- 3. Create initial partitions
             RAISE NOTICE 'Creating initial partitions for %...', v_table;

postgresql/procedures/03_monitoring_view.sql

@@ -1,21 +1,27 @@
 -- ============================================================================
--- SCRIPT: 04_monitoring_view.sql
--- DESCRIPTION: Creates a view to monitor partition status and sizes.
+-- Creates a view to monitor partition status and sizes.
 -- ============================================================================
 
-CREATE OR REPLACE VIEW partitions.monitoring AS
+DROP VIEW IF EXISTS partitions.monitoring;
+CREATE VIEW partitions.monitoring AS
 SELECT
     parent.relname AS parent_table,
     c.table_name,
     c.period,
     c.keep_history,
+    c.future_partitions AS configured_future_partitions,
     count(child.relname) AS partition_count,
     count(child.relname) FILTER (
         WHERE
-           (c.period = 'day' AND child.relname > (parent.relname || '_p' || to_char(now(), 'YYYYMMDD')))
+           (c.period = 'day' AND child.relname > (parent.relname || '_p' || to_char(now() AT TIME ZONE 'UTC', 'YYYYMMDD')))
            OR
-           (c.period = 'month' AND child.relname > (parent.relname || '_p' || to_char(now(), 'YYYYMM')))
-    ) AS future_partitions,
+           (c.period = 'month' AND child.relname > (parent.relname || '_p' || to_char(now() AT TIME ZONE 'UTC', 'YYYYMM')))
+           OR
+           (c.period = 'week' AND child.relname > (parent.relname || '_p' || to_char(date_trunc('week', now() AT TIME ZONE 'UTC'), 'YYYYMMDD')))
+           OR
+           (c.period LIKE '%hour%' AND child.relname > (parent.relname || '_p' || to_char(now() AT TIME ZONE 'UTC', 'YYYYMMDDHH24')))
+    ) AS actual_future_partitions,
+    sum(pg_total_relation_size(child.oid)) AS total_size_bytes,
     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,
@@ -25,4 +31,4 @@ 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;
+GROUP BY parent.relname, c.table_name, c.period, c.keep_history, c.future_partitions, c.last_updated;

postgresql/procedures/README.md

@@ -1,12 +1,27 @@
 # PostgreSQL Partitioning for Zabbix
 
-This is the declarative (PostgreSQL procedures based) partitioning implementation for Zabbix `history`, `trends`, and `auditlog` tables on PostgreSQL. This solution is intended to replace standard Zabbix housekeeping for the configured tables. Partitioning is very useful for large environments because it completely eliminates the housekeeper from the process. Instead of huge DELETE queries on several million rows, fast DDL queries (ALTER TABLE) are executed, which drop an entire partition. 
+This is the declarative partitioning implementation for Zabbix `history*`, `trends*`, and `auditlog` tables on PostgreSQL. This solution is intended to replace standard Zabbix housekeeping for the configured tables. Partitioning is very useful for large environments because it completely eliminates the housekeeper from the process. Instead of huge DELETE queries on several million rows, fast DDL queries (ALTER TABLE) are executed, which drop an entire partition. 
 
 
 > [!WARNING]
-> **High-Load Environments**:
 > 1.  **Data Visibility**: After enabling partitioning, old data remains in `*_old` tables and is **NOT visible** in Zabbix. You must migrate data manually if needed.
-> 2.  **Disable Housekeeping**: You **MUST** disable Zabbix Housekeeper for History and Trends in *Administration -> Housekeeping*. Failure to do so will cause massive `DELETE` loads.
+> 2.  **Disable Housekeeping**: You **MUST** disable Zabbix Housekeeper for History and Trends in *Administration -> Housekeeping*. 
+
+## Table of Contents
+- [Architecture](#architecture)
+  - [Components](#components)
+- [Installation](#installation)
+- [Configuration](#configuration)
+  - [Modifying Retention](#modifying-retention)
+- [Maintenance](#maintenance)
+  - [Scheduling Maintenance](#scheduling-maintenance)
+- [Monitoring & Permissions](#monitoring--permissions)
+  - [Versioning](#versioning)
+  - [Least Privilege Access (`zbxpart_monitor`)](#least-privilege-access-zbxpart_monitor)
+- [Implementation Details](#implementation-details)
+  - [`auditlog` Table](#auditlog-table)
+  - [Converting Existing Tables](#converting-existing-tables)
+- [Upgrades](#upgrades)
 
 ## Architecture
 
@@ -22,11 +37,32 @@ All procedures, information, statistics and configuration are stored in the `par
 ## Installation
 
 The installation is performed by executing the SQL procedures in the following order:
-1.  Initialize schema (`00_partitions_init.sql`).
-2.  Auditlog PK adjustment (`01_auditlog_prep.sql`).
-3.  Install maintenance procedures (`02_maintenance.sql`).
-4.  Enable partitioning on tables (`03_enable_partitioning.sql`).
-5.  Install monitoring views (`04_monitoring_view.sql`).
+1.  Initialize schema (`00_schema_create.sql`).
+2.  Install maintenance procedures (`01_maintenance.sql`).
+3.  Enable partitioning on tables (`02_enable_partitioning.sql`).
+4.  Install monitoring views (`03_monitoring_view.sql`).
+
+**Command Example:**
+You can deploy these scripts manually against your Zabbix database using `psql`. Navigate to the `procedures/` directory and run:
+
+```bash
+# Connect as the zabbix database user
+export PGPASSWORD="your_zabbix_password"
+DB_HOST="localhost" # Or your DB endpoint
+DB_NAME="zabbix"
+DB_USER="zbxpart_admin"
+
+for script in 00_schema_create.sql 01_maintenance.sql 02_enable_partitioning.sql 03_monitoring_view.sql; do
+    echo "Applying $script..."
+    # -v ON_ERROR_STOP=1 forces psql to exit immediately with an error code if any statement fails
+    if ! psql -v ON_ERROR_STOP=1 -h $DB_HOST -U $DB_USER -d $DB_NAME -f "$script"; then
+        echo -e "\nERROR: Failed to apply $script."
+        read -p "Press [Enter] to forcefully continue anyway, or Ctrl+C to abort... "
+    else
+        echo -e "Successfully applied $script.\n----------------------------------------"
+    fi
+done
+```
 
 ## Configuration
 
@@ -61,14 +97,108 @@ This procedure should be scheduled to run periodically (e.g., daily via `pg_cron
 ```sql
 CALL partitions.run_maintenance();
 ```
-### Automatic Maintenance (Cron)
+### Scheduling Maintenance
 
 To ensure partitions are created in advance and old data is cleaned up, the maintenance procedure should be scheduled to run automatically. 
 
-It is recommended to run the maintenance **twice a day** (e.g., at 05:30 and 23:30).
+It is recommended to run the maintenance **twice a day** and not in round hours because of the way housekeeper works (e.g., at 05:30 and 23:30).
 *   **Primary Run**: Creates new future partitions and drops old ones.
 *   **Secondary Run**: Acts as a safety check. Since the procedure is idempotent (safe to run multiple times), a second run ensures everything is consistent if the first run failed or was interrupted.
 
+You can schedule this using one of the following methods:
+
+#### Option 1: `pg_cron` (Recommended)
+`pg_cron` is a cron-based job scheduler that runs directly inside the database as an extension. It is very useful for cloud based databases like AWS RDS, Aurora, Azure, GCP, because it handles the authentication/connections securely for you automatically and its available as a managed extension. You do **not** need to install OS packages or configure anything. Simply modify the RDS Parameter Group to include `shared_preload_libraries = 'pg_cron'` and `cron.database_name = 'zabbix'`, reboot the instance, and execute `CREATE EXTENSION pg_cron;`.
+
+**Setup `pg_cron` (Self-Hosted):**
+1. Install the package via your OS package manager (e.g., `postgresql-15-cron` on Debian/Ubuntu, or `pg_cron_15` on RHEL/CentOS).
+2. Configure it modifying `postgresql.conf`:
+   ```ini
+   shared_preload_libraries = 'pg_cron'
+   cron.database_name = 'zabbix'
+   ```
+3. Restart PostgreSQL:
+   ```bash
+   systemctl restart postgresql
+   ```
+4. Connect to your `zabbix` database as a superuser and create the extension:
+   ```sql
+   CREATE EXTENSION pg_cron;
+   ```
+5. Schedule the job to run:
+   ```sql
+   SELECT cron.schedule('zabbix_partition_maintenance', '30 5,23 * * *', 'CALL partitions.run_maintenance();');
+   ```
+
+**⚠️ Troubleshooting `pg_cron` Connection Errors:**
+If your cron jobs fail to execute and you see `FATAL: password authentication failed` in your PostgreSQL logs, it is because `pg_cron` attempts to connect via TCP (`localhost`) by default, which usually requires a password. 
+
+**Solution A: Use Local Unix Sockets (Easier)**
+Edit your `postgresql.conf` to force `pg_cron` to use the local Unix socket (which uses passwordless `peer` authentication):
+```ini
+cron.host = '/var/run/postgresql'  # Or '/tmp', depending on your OS
+```
+*(Restart PostgreSQL after making this change).*
+
+**Solution B: Provide a Password (`.pgpass`)**
+If you *must* connect via TCP with a specific database user and password, the `pg_cron` background worker needs a way to authenticate. You provide this by creating a `.pgpass` file for the OS `postgres` user.
+1. Switch to the OS database user:
+   ```bash
+   sudo su - postgres
+   ```
+2. Create or append your database credentials to `~/.pgpass` using the format `hostname:port:database:username:password`:
+   ```bash
+   echo "localhost:5432:zabbix:zabbix:my_secure_password" >> ~/.pgpass
+   ```
+3. Set strict permissions (PostgreSQL will ignore the file if permissions are too loose):
+   ```bash
+   chmod 0600 ~/.pgpass
+   ```
+
+**Managing `pg_cron` Jobs:**
+If you need to verify or manage your scheduled jobs (run as superuser):
+- To **list all active schedules**: `SELECT * FROM cron.job;`
+- To **view execution logs/history**: `SELECT * FROM cron.job_run_details;`
+- To **remove/unschedule** the job: `SELECT cron.unschedule('zabbix_partition_maintenance');`
+
+#### Option 2: Systemd Timers
+Systemd timers provide better logging and error handling properties than standard cron.
+
+1. Create a service file **`/etc/systemd/system/zabbix-partitions.service`**:
+   ```ini
+   [Unit]
+   Description=Zabbix PostgreSQL Partition Maintenance
+   After=network.target postgresql.service
+   
+   [Service]
+   Type=oneshot
+   User=postgres
+   ExecStart=/usr/bin/psql -d zabbix -c "CALL partitions.run_maintenance();"
+   ```
+
+2. Create a timer file **`/etc/systemd/system/zabbix-partitions.timer`**:
+   ```ini
+   [Unit]
+   Description=Run Zabbix Partition Maintenance Twice Daily
+   
+   [Timer]
+   OnCalendar=*-*-* 05:30:00
+   OnCalendar=*-*-* 23:30:00
+   Persistent=true
+   
+   [Install]
+   WantedBy=timers.target
+   ```
+
+3. Enable and start the timer:
+   ```bash
+   systemctl daemon-reload
+   systemctl enable --now zabbix-partitions.timer
+   ```
+
+#### Option 3: System Cron (`crontab`)
+Standard system cron is a simple fallback.
+
 **Example Crontab Entry (`crontab -e`):**
 ```bash
 # Run Zabbix partition maintenance twice daily (5:30 AM and 5:30 PM)
@@ -76,47 +206,70 @@ It is recommended to run the maintenance **twice a day** (e.g., at 05:30 and 23:
 ```
 
 **Docker Environment:**
-If running in Docker, you can execute it via the container:
+If running in Docker, you can execute it via the host's cron by targeting the container:
 ```bash
 30 5,23 * * * docker exec zabbix-db-test psql -U zabbix -d zabbix -c "CALL partitions.run_maintenance();"
 ```
+
 ## Monitoring & Permissions
 
-System state can be monitored via the `partitions.monitoring` view. It includes a `future_partitions` column which counts how many partitions exist *after* the current period. This is useful for alerting (e.g., trigger if `future_partitions < 2`).
+System state can be monitored via the `partitions.monitoring` view. It includes the information about number of future partitions and the time since the last maintenance run. Plus it includes the total size of the partitioned table in bytes.
 
 ```sql
 SELECT * FROM partitions.monitoring;
 ```
 
+### Zabbix Agent Integration
+To monitor the state of the partitions directly from Zabbix, you need to provide the Zabbix Agent with the SQL query used to fetch this data. You can automatically generate the required `partitions.get_all.sql` file on your agent using this one-liner:
+
+```bash
+cat << 'EOF' | sudo tee /etc/zabbix/zabbix_agent2.d/partitions.get_all.sql > /dev/null
+SELECT 
+    table_name,
+    period,
+    keep_history::text AS keep_history,
+    configured_future_partitions,
+    actual_future_partitions,
+    total_size_bytes,
+    EXTRACT(EPOCH FROM (now() - last_updated)) AS age_seconds
+FROM partitions.monitoring;
+EOF
+```
+*(Make sure to adjust the destination path according to your Zabbix Agent template directory)*
+
 ### Versioning
 To check the installed version of the partitioning solution:
 ```sql
 SELECT * FROM partitions.version ORDER BY installed_at DESC LIMIT 1;
 ```
 
-### Least Privilege Access (`zbx_monitor`)
-For monitoring purposes, it is recommended to create a dedicated user with read-only access to the monitoring view.
+### Least Privilege Access (`zbxpart_monitor`)
+For monitoring purposes, it is highly recommended to create a dedicated user with read-only access to the monitoring view instead of using the `zbxpart_admin` owner account.
 
 ```sql
-CREATE USER zbx_monitor WITH PASSWORD 'secure_password';
-GRANT USAGE ON SCHEMA partitions TO zbx_monitor;
-GRANT SELECT ON partitions.monitoring TO zbx_monitor;
+CREATE USER zbxpart_monitor WITH PASSWORD 'secure_password';
+GRANT USAGE ON SCHEMA partitions TO zbxpart_monitor;
+GRANT SELECT ON partitions.monitoring TO zbxpart_monitor;
 ```
 
+> [!WARNING]
+> Because `03_monitoring_view.sql` uses a `DROP VIEW` command to apply updates, re-running the script will destroy all previously assigned `GRANT` permissions. If you ever update the view script, you **must** manually re-run the `GRANT SELECT` command above to restore access for the `zbxpart_monitor` user!
+
 ## Implementation Details
 
 ### `auditlog` Table
-The standard `auditlog` table Primary Key is `(auditid)`. Partitioning by `clock` requires the partition key to be part of the Primary Key. The initialization script modifies the PK to `(auditid, clock)`.
+The standard Zabbix `auditlog` table has a primary key on `(auditid)`. Partitioning by `clock` requires the partition key to be part of the primary key. 
+To prevent placing a heavy, blocking lock on an `auditlog` table to alter its primary key, the enablement script (`02_enable_partitioning.sql`) detects it and handles it exactly like the history tables: it automatically renames the live, existing table to `auditlog_old`, and instantly creates a brand new, empty partitioned `auditlog` table pre-configured with the required `(auditid, clock)` composite primary key.
 
 ### Converting Existing Tables
-The enablement script renames the existing table to `table_name_old` and creates a new partitioned table with the same structure.
-*   **Note**: Data from the old table is NOT automatically migrated to minimize downtime.
-*   New data flows into the new partitioned table immediately.
-*   Old data remains accessible in `table_name_old` for manual query or migration if required.
+The enablement script guarantees practically zero downtime by automatically renaming the existing tables to `table_name_old` and creating new partitioned tables matching the exact schema.
+*   **Note**: Data from the old tables is NOT automatically migrated to minimize downtime.
+*   New data flows into the new partitioned tables immediately.
+*   Old data remains accessible in `table_name_old` for manual lookup or migration if required.
 
 ## Upgrades
 
 When upgrading Zabbix:
 1.  **Backup**: Ensure a full database backup exists.
 2.  **Compatibility**: Zabbix upgrade scripts may attempt to `ALTER` tables. PostgreSQL supports `ALTER TABLE` on partitioned tables for adding columns, which propagates to partitions.
-3.  **Failure Scenarios**: If an upgrade script fails due to partitioning, the table may need to be temporarily reverted or the partition structure manually adjusted.
+3.  **Failure Scenarios**: If an upgrade script fails due to partitioning, the table may need to be temporarily reverted or the partition structure manually adjusted.

postgresql/script/README.md

@@ -0,0 +1,3 @@
+# Script-based Partitioning
+
+(Coming soon)

postgresql/template/README.md

@@ -0,0 +1,32 @@
+# Zabbix PostgreSQL Partitioning Monitoring
+
+This template relies on Zabbix Agent 2 and its PostgreSQL plugin. It allows you to monitor the health of your partitioned PostgreSQL database tables. It uses a single master item to pull all metrics in bulk over a single database connection, dynamically distributing the numbers to Zabbix using Dependent Items.
+There are three item prototypes:
+1. Future Partitions Buffer: Number of future partitions to be created
+2. Total Size Bytes: Total size of the partitioned table in bytes
+3. Time Since Last Maintenance: Time since the last maintenance script was run
+They allows to monitor all the critical metrics and also they do have a triggers, which will create a problem in case something is wrong with the partitioning. 
+
+### Setup
+1. Copy the SQL file (`template/partitions.get_all.sql`) into a directory on your Agent machine. E.g., `/etc/zabbix/zabbix_agent2.d/postgresql/`.
+2. Install  zabbix-agent2-plugin-postgresql package.
+3. Open your Plugin configuration file `/etc/zabbix/zabbix_agent2.d/plugins.d/postgresql.conf` and add these lines to establish your custom query module AND a secure named session (e.g., `AWS_RDS`). Adjust the parameters to match your environment. You can use uri instead of named session if you want. In this case you will need to modify the item keys to use the correct parameters.
+   ```ini
+   # 1. Enable Loadable Custom Queries (Mandatory in Zabbix 7.4+)
+   Plugins.PostgreSQL.CustomQueriesPath=/etc/zabbix/zabbix_agent2.d/postgresql/
+   Plugins.PostgreSQL.CustomQueriesEnabled=true
+
+   # 2. Establish a Secure Backend Session
+   Plugins.PostgreSQL.Sessions.AWS_RDS.Uri=tcp://your-cluster-endpoint.amazonaws.com:5432
+   Plugins.PostgreSQL.Sessions.AWS_RDS.User=zabbix
+   Plugins.PostgreSQL.Sessions.AWS_RDS.Password=<YOUR_ZABBIX_PASSWORD>
+   Plugins.PostgreSQL.Sessions.AWS_RDS.TLSConnect=verify_full
+   Plugins.PostgreSQL.Sessions.AWS_RDS.TLSCAFile=/etc/zabbix/global-bundle.pem
+   ```
+4. Restart your agent to apply the changes: 
+   ```bash
+   systemctl restart zabbix-agent2
+   ```
+5. Import the `zbx_pg_partitions_monitor_agent2.yaml` template into your Zabbix.
+6. Link the template to your Host, navigate to its "Macros" tab, and define the needed macros (in this case it's just named session):
+   * `{$PG.CONNSTRING.AGENT2}`: `AWS_RDS`

postgresql/template/partitions.get_all.sql

@@ -0,0 +1,9 @@
+SELECT 
+    table_name,
+    period,
+    keep_history::text AS keep_history,
+    configured_future_partitions,
+    actual_future_partitions,
+    total_size_bytes,
+    EXTRACT(EPOCH FROM (now() - last_updated)) AS age_seconds
+FROM partitions.monitoring;

postgresql/template/zbx_pg_partitions_monitor_agent2.yaml

@@ -0,0 +1,137 @@
+zabbix_export:
+  version: '7.0'
+  template_groups:
+    - uuid: 748ad4d098d447d492bb935c907f652f
+      name: Templates/Databases
+  templates:
+    - uuid: a1d5f8c3b2e44a7c9d6b1f2e8a3c5b4d
+      template: 'PostgreSQL Partitioning by Zabbix Agent 2'
+      name: 'PostgreSQL Partitioning by Zabbix Agent 2'
+      description: 'Monitors the custom partitions.monitoring view via the native Zabbix Agent 2 PostgreSQL plugin. Using a single master to minimize the DB connections and load.'
+      vendor:
+        name: Zabbix Support
+        version: 7.0-0 
+      groups:
+        - name: Templates/Databases
+      items:
+        - uuid: b8c7d6e5f4a34b2c8d2e3f4a5b6c7d8e
+          name: 'PostgreSQL: Get Partitioning Data'
+          key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+          history: '0'
+          value_type: TEXT
+          description: 'Master item that queries all partition statistics in a single bulk JSON sequence.'
+          tags:
+            - tag: component
+              value: raw
+      discovery_rules:
+        - uuid: b7c2a5d8f1e44b9c8a3f6d2e1c5b4a7d
+          name: 'Partitioned Tables Discovery'
+          type: DEPENDENT
+          key: db.partitions.discovery.dependent
+          item_prototypes:
+            - uuid: f1a2b3c4d5e64f7a9b8c7d6e5f4a3b2c
+              name: '{#TABLE_NAME}: Time Since Last Maintenance'
+              type: DEPENDENT
+              key: 'db.partitions.age["{#TABLE_NAME}"]'
+              units: s
+              preprocessing:
+                - type: JSONPATH
+                  parameters:
+                    - '$.[?(@.table_name == "{#TABLE_NAME}")].age_seconds.first()'
+              master_item:
+                key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+              tags:
+                - tag: metric
+                  value: age
+                - tag: table
+                  value: '{#TABLE_NAME}'
+              trigger_prototypes:
+                - uuid: a9b8c7d6e5f44a3b8c1d2e3f4a5b6c7d
+                  expression: 'last(/PostgreSQL Partitioning by Zabbix Agent 2/db.partitions.age["{#TABLE_NAME}"])>{$PARTITIONS.AGE}'
+                  name: 'Table {#TABLE_NAME}: Maintenance script has not run successfully in over 48 hours'
+                  priority: WARNING
+            - uuid: c4b9e2a5f1d84c7a9f3b6d1e5a2c8b4d
+              name: '{#TABLE_NAME}: Future Partitions Buffer'
+              type: DEPENDENT
+              key: 'db.partitions.future["{#TABLE_NAME}"]'
+              preprocessing:
+                - type: JSONPATH
+                  parameters:
+                    - '$.[?(@.table_name == "{#TABLE_NAME}")].future_partitions.first()'
+              master_item:
+                key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+              tags:
+                - tag: metric
+                  value: partitions
+                - tag: table
+                  value: '{#TABLE_NAME}'
+              trigger_prototypes:
+                - uuid: d6e3a5c8b2f14d9e8a7b6c5d4e3f2a1b
+                  expression: 'last(/PostgreSQL Partitioning by Zabbix Agent 2/db.partitions.future["{#TABLE_NAME}"])<{$PARTITIONS.LOW}'
+                  name: 'Table {#TABLE_NAME}: Future partitions buffer is critically low (< 2)'
+                  priority: HIGH
+            - uuid: e8f2a1b3c4d54e6f9a8b7c6d5e4f3a2b
+              name: '{#TABLE_NAME}: Total Size Bytes'
+              type: DEPENDENT
+              key: 'db.partitions.size["{#TABLE_NAME}"]'
+              units: B
+              preprocessing:
+                - type: JSONPATH
+                  parameters:
+                    - '$.[?(@.table_name == "{#TABLE_NAME}")].total_size_bytes.first()'
+              master_item:
+                key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+              tags:
+                - tag: metric
+                  value: size
+                - tag: table
+                  value: '{#TABLE_NAME}'
+            - uuid: ffa2b3c4d5e64f7a9b8c7d6e5f4a1001
+              name: '{#TABLE_NAME}: Configured Partition Period'
+              type: DEPENDENT
+              key: 'db.partitions.period["{#TABLE_NAME}"]'
+              value_type: CHAR
+              preprocessing:
+                - type: JSONPATH
+                  parameters:
+                    - '$.[?(@.table_name == "{#TABLE_NAME}")].period.first()'
+              master_item:
+                key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+              tags:
+                - tag: metric
+                  value: config
+                - tag: table
+                  value: '{#TABLE_NAME}'
+            - uuid: ffa2b3c4d5e64f7a9b8c7d6e5f4a1002
+              name: '{#TABLE_NAME}: Configured Retention (Keep History)'
+              type: DEPENDENT
+              key: 'db.partitions.retention["{#TABLE_NAME}"]'
+              value_type: CHAR
+              preprocessing:
+                - type: JSONPATH
+                  parameters:
+                    - '$.[?(@.table_name == "{#TABLE_NAME}")].keep_history.first()'
+              master_item:
+                key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+              tags:
+                - tag: metric
+                  value: config
+                - tag: table
+                  value: '{#TABLE_NAME}'
+          master_item:
+            key: 'pgsql.custom.query["{$PG.CONNSTRING.AGENT2}",,,"{$PG.DBNAME}","partitions.get_all"]'
+          lld_macro_paths:
+            - lld_macro: '{#TABLE_NAME}'
+              path: $.table_name
+      macros:
+        - macro: '{$PARTITIONS.AGE}'
+          value: 24h
+          description: 'The maximum period during which no new partitions may be created'
+        - macro: '{$PARTITIONS.LOW}'
+          value: '2'
+          description: 'The minimum number of partitions that must exist in the future'
+        - macro: '{$PG.CONNSTRING.AGENT2}'
+          value: AWS_RDS
+          description: 'Session name or URI of the PostgreSQL instance'
+        - macro: '{$PG.DBNAME}'
+          value: zabbix

postgresql/tests/ARCHITECTURE.md

@@ -21,20 +21,14 @@ This ensures that the partitioning scripts will work flawlessly, even in custom
 
 The solution is divided into a series of SQL scripts that must be executed sequentially to set up the environment.
 
-### 1. `00_partitions_init.sql`
+### 1. `00_schema_create.sql`
 *   **Purpose:** Initializes the foundation for the partitioning system.
 *   **Actions:** 
     *   Creates the isolated `partitions` schema to keep everything separate from Zabbix's own structure.
     *   Creates the `partitions.config` table (which stores retention policies).
     *   Creates the `partitions.version` table for tracking the installed version.
 
-### 2. `01_auditlog_prep.sql`
-*   **Purpose:** Prepares the Zabbix `auditlog` table for partitioning.
-*   **Actions:**
-    *   PostgreSQL range partitioning requires the partition key (in this case, `clock`) to be part of the Primary Key.
-    *   This script dynamically locates the existing Primary Key (usually just `auditid`) and alters it to a composite key `(auditid, clock)`.
-
-### 3. `02_maintenance.sql`
+### 2. `01_maintenance.sql`
 *   **Purpose:** Contains the core PL/pgSQL procedural logic that manages the lifecycle of the partitions.
 *   **Key Functions/Procedures:**
     *   `partition_exists()`: Queries `pg_class` to verify if a specific child partition partition exists.
@@ -43,14 +37,15 @@ The solution is divided into a series of SQL scripts that must be executed seque
     *   `maintain_table()`: The orchestrator for a single table. It calculates the necessary UTC timestamps, calls `create_partition()` to build the future buffer, calls `create_partition()` recursively backward to cover the retention period, and finally calls `drop_old_partitions()`.
     *   `run_maintenance()`: The global loop that iterates through `partitions.config` and triggers `maintain_table()` for every configured Zabbix table.
 
-### 4. `03_enable_partitioning.sql`
+### 3. `02_enable_partitioning.sql`
 *   **Purpose:** The migration script that actually executes the partition conversion on the live database.
 *   **Actions:** 
+    *   It dynamically locates the existing Primary Key on the active `auditlog` table (usually just `auditid`) and alters it to a composite key `(auditid, clock)` so it supports range partitioning.
     *   It takes the original Zabbix table (e.g., `history`) and renames it to `history_old` (`ALTER TABLE ... RENAME TO ...`).
     *   It immediately creates a new partitioned table with the original name, inheriting the exact structure of the old table (`CREATE TABLE ... (LIKE ... INCLUDING ALL) PARTITION BY RANGE (clock)`).
     *   It triggers the first maintenance run so new incoming data has immediate partitions to land in.
 
-### 5. `04_monitoring_view.sql`
+### 4. `03_monitoring_view.sql`
 *   **Purpose:** Provides an easy-to-read observability layer.
 *   **Actions:** 
     *   Creates the `partitions.monitoring` view by joining `pg_class`, `pg_inherits`, `pg_tablespace`, and `pg_size_pretty`. 

postgresql/tests/QUICKSTART.md

@@ -0,0 +1,90 @@
+# Quickstart (PostgreSQL Partitioning Test)
+
+## Start Environment
+> **Note**: If `docker` commands fail with permission errors, run `newgrp docker` or ensure your user is in the `docker` group (`sudo usermod -aG docker $USER`) and log out/in.
+
+```bash
+cd postgresql/docker
+sudo ./run_test_env.sh --pg 16 --zabbix 7.0
+# Options: --pg <16|17|18> --zabbix <7.0|7.4>
+```
+
+## Verify
+```bash
+# Check status
+docker ps
+
+# SQL Shell
+docker exec -it zabbix-db-test psql -U zabbix -d zabbix
+# Password: zabbix
+```
+
+## Reset
+```bash
+docker compose down -v
+```
+
+## Partitioning
+See [ARCHITECTURE.md](../ARCHITECTURE.md) for details on the implemented declarative partitioning.
+
+## AWS RDS / External Database Testing
+
+You can run these partitioning tests against a real AWS RDS (or any external PostgreSQL instance). 
+
+### 1. Configure Credentials
+First, create a `db_credentials` file in the `postgresql/` directory. (This file is ignored by Git to keep your passwords safe). 
+Example `postgresql/db_credentials`:
+```bash
+# Admin credentials
+export DB_HOST="your-rds-endpoint.rds.amazonaws.com"
+export DB_PORT="5432"
+export DB_NAME="postgres"
+export DB_USER="postgres"
+export DB_PASSWORD="your_admin_password"
+
+# SSL Configuration
+export DB_SSL_MODE="verify-full"
+export DB_PEM_URL="https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem"
+export DB_SSL_ROOT_CERT="./global-bundle.pem"
+
+# Zabbix credentials to be created
+export ZBX_DB_NAME="zabbix"
+export ZBX_DB_USER="zabbix"
+export ZBX_DB_PASSWORD="zabbix_password"
+```
+
+### 2. Automated Testing
+You can run the same automated deployment script, but instruct it to deploy directly to your RDS instance instead of a local Docker container:
+
+```bash
+cd postgresql/docker
+./run_test_env.sh --pg 16 --zabbix 7.0 --rds
+```
+
+If you want to completely clean up the RDS database and start fresh (terminating existing connections and dropping all data), use the `--rds-drop` flag. You will be prompted to type `yes` to safely confirm the deletion:
+```bash
+./run_test_env.sh --pg 16 --zabbix 7.0 --rds-drop
+```
+
+### 3. Manual Setup & Zabbix Integration
+If you want to prepare the real database for your Production Zabbix Server manually, you can just run the initialization script directly:
+
+```bash
+cd postgresql
+./setup_rds.sh
+# To drop an existing database and start fresh, use:
+# ./setup_rds.sh --drop
+```
+
+The script will automatically connect as the `postgres` user, conditionally download the SSL certificates if needed, and set up the `zabbix` user and database. 
+Upon success, the script will output the exact block you need to copy into your `zabbix_server.conf`, e.g.:
+
+```ini
+DBHost=your-rds-endpoint.rds.amazonaws.com
+DBName=zabbix
+DBUser=zabbix
+DBPassword=zabbix_password
+DBPort=5432
+DBTLSConnect=verify_full
+DBTLSCAFile=/full/path/to/global-bundle.pem
+```

postgresql/tests/docker/init_scripts/01_30_maintenance.sql

@@ -1,6 +1,5 @@
 -- ============================================================================
--- SCRIPT: 02_maintenance.sql
--- DESCRIPTION: Core functions for Zabbix partitioning (Create, Drop, Maintain).
+-- Core functions for Zabbix partitioning (Create, Drop, Maintain).
 -- ============================================================================
 
 -- Function to check if a partition exists
@@ -91,7 +90,7 @@ BEGIN
         
         BEGIN
             IF length(v_suffix) = 6 THEN -- YYYYMM
-                v_partition_date := to_timestamp(v_suffix || '01', 'YYYYMMDD') AT TIME ZONE 'UTC';
+                v_partition_date := timezone('UTC', to_timestamp(v_suffix || '01', 'YYYYMMDD')::timestamp without time zone);
                 -- 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.
@@ -101,7 +100,7 @@ BEGIN
                     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';
+                v_partition_date := timezone('UTC', to_timestamp(v_suffix, 'YYYYMMDD')::timestamp without time zone);
                 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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
@@ -131,19 +130,19 @@ DECLARE
 BEGIN
     IF p_period = 'day' THEN
         v_period_interval := '1 day'::interval;
-        v_start_time := date_trunc('day', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('day', now(), 'UTC');
         -- Calculate how many past days cover the retention period (86400 seconds = 1 day)
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 86400)::integer;
         
     ELSIF p_period = 'week' THEN
         v_period_interval := '1 week'::interval;
-        v_start_time := date_trunc('week', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('week', now(), 'UTC');
         -- 604800 seconds = 1 week
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 604800)::integer;
 
     ELSIF p_period = 'month' THEN
         v_period_interval := '1 month'::interval;
-        v_start_time := date_trunc('month', now() AT TIME ZONE 'UTC');
+        v_start_time := date_trunc('month', now(), 'UTC');
         -- Approximate 30 days per month (2592000 seconds)
         v_past_iterations := ceil(extract(epoch from p_keep_history) / 2592000)::integer;
     ELSE

postgresql/tests/docker/init_scripts/01_40_enable.sql

@@ -22,15 +22,21 @@ BEGIN
         WHERE c.relname = v_table;
 
         
-        -- 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 %I.%I RENAME TO %I', v_schema, v_table, v_old_table);
             
-            -- 2. Create new partitioned table (copying structure)
-            EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING ALL) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+            -- 2. Create new partitioned table (handling auditlog PK uniquely)
+            IF v_table = 'auditlog' THEN
+                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING DEFAULTS INCLUDING COMMENTS) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+                EXECUTE format('ALTER TABLE %I.%I ADD PRIMARY KEY (auditid, clock)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_1 ON %I.%I (userid, clock)', v_schema, v_table);
+                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_2 ON %I.%I (clock)', v_schema, v_table);
+            ELSE
+                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING ALL) PARTITION BY RANGE (clock)', v_schema, v_table, v_schema, v_old_table);
+            END IF;
             
             -- 3. Create initial partitions
             RAISE NOTICE 'Creating initial partitions for %...', v_table;

postgresql/tests/docker/run_test_env.sh

@@ -0,0 +1,164 @@
+#!/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> [--rds] [--rds-drop]"
+    echo "Example: $0 --pg 16 --zabbix 7.0 [--rds-drop]"
+    exit 1
+}
+
+# Parse arguments
+USE_RDS=false
+DROP_RDS=false
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        --pg) PG_VERSION="$2"; shift ;;
+        --zabbix) ZABBIX_VERSION="$2"; shift ;;
+        --rds) USE_RDS=true ;;
+        --rds-drop) USE_RDS=true; DROP_RDS=true ;;
+        *) 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_schema_create.sql" ]]; then
+       cp "../../procedures/00_schema_create.sql" ./init_scripts/01_10_schema_create.sql
+    fi
+     if [[ -f "../../procedures/01_maintenance.sql" ]]; then
+       cp "../../procedures/01_maintenance.sql" ./init_scripts/01_30_maintenance.sql
+     fi
+     if [[ -f "../../procedures/02_enable_partitioning.sql" ]]; then
+       cp "../../procedures/02_enable_partitioning.sql" ./init_scripts/01_40_enable.sql
+     fi
+     if [[ -f "../../procedures/03_monitoring_view.sql" ]]; then
+       cp "../../procedures/03_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
+
+if [ "$USE_RDS" = "true" ]; then
+    echo -e "${GREEN}Deploying directly to RDS environment...${NC}"
+    if [ ! -f "../db_credentials" ]; then
+        echo -e "${RED}Error: ../db_credentials file not found. Please create it first.${NC}"
+        exit 1
+    fi
+    
+    # Initialize RDS (create/drop user and db)
+    if [ "$DROP_RDS" = "true" ]; then
+        echo "Initializing Zabbix RDS user and database (with DROP requested)..."
+        bash ../setup_rds.sh --drop
+    else
+        echo "Initializing Zabbix RDS user and database..."
+        bash ../setup_rds.sh
+    fi
+    
+    source ../db_credentials
+    export PGPASSWORD="$ZBX_DB_PASSWORD"
+    
+    echo "Applying scripts from init_scripts/ to RDS..."
+    for sql_file in $(ls ./init_scripts/*.sql | sort); do
+        echo "Executing $sql_file..."
+        psql "host=$DB_HOST port=$DB_PORT dbname=$ZBX_DB_NAME user=$ZBX_DB_USER sslmode=$DB_SSL_MODE sslrootcert=../$DB_SSL_ROOT_CERT" -f "$sql_file" -v ON_ERROR_STOP=1
+    done
+    
+    echo -e "${GREEN}RDS Environment ready.${NC}"
+    echo "Connect: psql \"host=$DB_HOST port=$DB_PORT dbname=$ZBX_DB_NAME user=$ZBX_DB_USER sslmode=$DB_SSL_MODE sslrootcert=../$DB_SSL_ROOT_CERT\""
+else
+    # 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
+    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"
+fi

postgresql/tests/setup_rds.sh

@@ -0,0 +1,101 @@
+#!/bin/bash
+set -e
+
+# Change directory to script's location
+cd "$(dirname "$0")"
+
+DROP_DB=false
+while [[ "$#" -gt 0 ]]; do
+    case $1 in
+        --drop) DROP_DB=true ;;
+    esac
+    shift
+done
+
+# Source credentials from db_credentials file
+if [ -f "./db_credentials" ]; then
+    echo "Loading credentials from db_credentials..."
+    source ./db_credentials
+else
+    echo "Error: db_credentials file not found in $(pwd)"
+    exit 1
+fi
+
+# 1. Provide the PEM key for AWS RDS if not exists
+if [ -n "$DB_PEM_URL" ] && [ ! -f "$DB_SSL_ROOT_CERT" ]; then
+    echo "Downloading SSL root certificate from AWS..."
+    wget -qO "$DB_SSL_ROOT_CERT" "$DB_PEM_URL"
+fi
+
+# Ensure PEM has right permissions if it exists
+if [ -f "$DB_SSL_ROOT_CERT" ]; then
+    chmod 600 "$DB_SSL_ROOT_CERT"
+fi
+
+# 2. Login as the RDS admin user (postgres) to create the zabbix user/database
+echo "Connecting to PostgreSQL to create Zabbix user and database..."
+
+export PGPASSWORD="$DB_PASSWORD"
+
+# Create the zabbix user if it doesn't already exist
+psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -v ON_ERROR_STOP=1 <<EOF
+DO \$\$
+BEGIN
+    IF NOT EXISTS (SELECT FROM pg_catalog.pg_roles WHERE rolname = '$ZBX_DB_USER') THEN
+        CREATE ROLE $ZBX_DB_USER WITH LOGIN PASSWORD '$ZBX_DB_PASSWORD';
+    END IF;
+END
+\$\$;
+EOF
+
+echo "User '$ZBX_DB_USER' verified/created."
+
+# Create the zabbix database if it doesn't already exist
+DB_EXISTS=$(psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -t -c "SELECT 1 FROM pg_database WHERE datname='$ZBX_DB_NAME'" | tr -d '[:space:]')
+
+if [ "$DROP_DB" = "true" ] && [ "$DB_EXISTS" = "1" ]; then
+    echo -e "\n========================================"
+    echo -e "              WARNING!                  "
+    echo -e "========================================"
+    echo -e "You requested to completely DROP and RE-INITIATE the database '$ZBX_DB_NAME'."
+    echo -e "This will delete ALL data. Are you sure you want to proceed?"
+    read -p "Type 'yes' to proceed: " confirm_drop
+    if [ "$confirm_drop" != "yes" ]; then
+        echo "Database drop cancelled. Exiting."
+        exit 1
+    fi
+    echo "Terminating active connections and dropping database..."
+    psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -c "SELECT pg_terminate_backend(pid) FROM pg_stat_activity WHERE datname = '$ZBX_DB_NAME' AND pid <> pg_backend_pid();"
+    psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -c "DROP DATABASE $ZBX_DB_NAME;"
+    DB_EXISTS=""
+fi
+
+if [ "$DB_EXISTS" != "1" ]; then
+    echo "Database '$ZBX_DB_NAME' does not exist. Creating..."
+    psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -c "CREATE DATABASE $ZBX_DB_NAME OWNER $ZBX_DB_USER;"
+else
+    echo "Database '$ZBX_DB_NAME' already exists."
+fi
+
+# Grant necessary permissions
+psql "host=$DB_HOST port=$DB_PORT dbname=$DB_NAME user=$DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT" -c "GRANT ALL PRIVILEGES ON DATABASE $ZBX_DB_NAME TO $ZBX_DB_USER;"
+
+echo ""
+echo "================================================================================"
+echo "✅ Initialization Successful!"
+echo "================================================================================"
+echo "You can now use these settings in your Zabbix server configuration:"
+echo "--------------------------------------------------------------------------------"
+echo "DBHost=$DB_HOST"
+echo "DBName=$ZBX_DB_NAME"
+echo "DBUser=$ZBX_DB_USER"
+echo "DBPassword=$ZBX_DB_PASSWORD"
+echo "DBPort=$DB_PORT"
+echo "DBTLSConnect=verify_full"
+echo "DBTLSCAFile=$(realpath $DB_SSL_ROOT_CERT)"
+echo "================================================================================"
+echo ""
+echo "To connect manually for testing directly to the Zabbix DB:"
+echo "export PGPASSWORD=\"$ZBX_DB_PASSWORD\""
+echo "psql \"host=$DB_HOST port=$DB_PORT dbname=$ZBX_DB_NAME user=$ZBX_DB_USER sslmode=$DB_SSL_MODE sslrootcert=$DB_SSL_ROOT_CERT\""
+echo ""