docs: Change admonition type from critical to warning in README.md

.gitattributes

@@ -1,3 +0,0 @@
-postgresql/tests/ export-ignore
-tests/ export-ignore
-.gitignore export-ignore

.gitignore

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

QUICKSTART.md

@@ -0,0 +1,52 @@
+# 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/CHANGELOG.md

@@ -1,15 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-## [7-2] - 2026-04-29
-
-### Added
-- **Housekeeper Interceptor**: Added a PostgreSQL `BEFORE INSERT` trigger to the `housekeeper` table. This trigger dynamically checks `partitions.config` and silently discards Housekeeper tasks (inserts) for any tables managed by the partitioning system. This prevents Zabbix from filling the `housekeeper` table with unnecessary tasks, eliminating Sequential Scans and Table Bloat on the `housekeeper` table, while still allowing tasks for unpartitioned tables (like `events`) to be recorded normally.
-
-## [7-1] - Previous Release
-
-### Added
-- Zabbix 7.0 and 7.4 compatibility.
-- Special handling for the `auditlog` table primary key changes in Zabbix 7.0+.
-- Dynamic creation of partitions and retention management logic.

postgresql/README.md

@@ -1,8 +0,0 @@
-# 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_10_partitions_init.sql

@@ -1,6 +1,7 @@
 -- ============================================================================
--- Creates the 'partitions' schema and configuration table.
--- Defines the structure for managing Zabbix partitioning.
+-- 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;
@@ -8,7 +9,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,
+    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'),
@@ -22,7 +23,8 @@ CREATE TABLE IF NOT EXISTS partitions.version (
     description text
 );
 
-INSERT INTO partitions.version (version, description) VALUES ('7-2', 'Added housekeeper task interceptor trigger to drop tasks for partitioned tables')
+-- 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)
@@ -32,16 +34,9 @@ INSERT INTO partitions.config (table_name, period, keep_history) VALUES
 ('history_uint', 'day', '30 days'),
 ('history_str', 'day', '30 days'),
 ('history_log', 'day', '30 days'),
-('history_text', 'day', '30 days'),
-('history_bin', 'day', '30 days')
+('history_text', 'day', '30 days')
 ON CONFLICT (table_name) DO NOTHING;
 
--- Zabbix 8.0+ only: Uncomment the following lines if running Zabbix 8.0 or later
--- INSERT INTO partitions.config (table_name, period, keep_history) VALUES
--- ('history_json', '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'),

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

@@ -1,16 +1,17 @@
 -- ============================================================================
--- Core functions for Zabbix partitioning (Create, Drop, Maintain).
+-- SCRIPT: 02_maintenance.sql
+-- DESCRIPTION: Core functions for Zabbix partitioning (Create, Drop, Maintain).
 -- ============================================================================
 
--- Function to check if a partition exists in a specific schema
-CREATE OR REPLACE FUNCTION partitions.partition_exists(p_partition_name text, p_schema text) 
+-- 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 = p_schema
+        AND n.nspname = 'public'
     );
 END;
 $$ LANGUAGE plpgsql;
@@ -27,45 +28,24 @@ DECLARE
     v_start_ts bigint;
     v_end_ts bigint;
     v_suffix text;
-    v_parent_schema text;
 BEGIN
-    -- Determine the schema of the parent table
-    SELECT n.nspname INTO v_parent_schema
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = p_parent_table AND pg_table_is_visible(c.oid);
-
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'Parent table % not found', p_parent_table;
-    END IF;
     -- (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');
-    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;
     
     v_partition_name := p_parent_table || '_p' || v_suffix;
 
-    IF NOT partitions.partition_exists(v_partition_name, v_parent_schema) THEN
-        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;
-            WHEN duplicate_table THEN
-                -- Ignore race condition: another process created the partition concurrently
-                RAISE NOTICE 'Partition % already exists (concurrent creation). Skipping.', v_partition_name;
-        END;
+    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;
 $$;
@@ -81,20 +61,17 @@ DECLARE
     v_partition record;
     v_partition_date timestamp with time zone;
     v_suffix text;
-    v_partition_schema 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,
-            n.nspname AS partition_schema
+            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
-        JOIN pg_namespace n ON child.relnamespace = n.oid
-        WHERE parent.relname = p_parent_table AND pg_table_is_visible(parent.oid)
+        WHERE parent.relname = p_parent_table
     LOOP
         -- Parse partition suffix to determine age
         -- Format: parent_pYYYYMM or parent_pYYYYMMDD
@@ -102,48 +79,27 @@ BEGIN
         
         BEGIN
             IF length(v_suffix) = 6 THEN -- YYYYMM
-                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
+                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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
                     COMMIT; -- Release lock immediately
                 END IF;
-            ELSE
+            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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
                     COMMIT; -- Release lock immediately
                 END IF;
             END IF;
-        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;
+        EXCEPTION WHEN OTHERS THEN
+            -- Ignore parsing errors for non-standard partitions
+            NULL;
+        END;
     END LOOP;
 END;
 $$;
@@ -163,29 +119,23 @@ DECLARE
 BEGIN
     IF p_period = 'day' THEN
         v_period_interval := '1 day'::interval;
-        v_start_time := date_trunc('day', now(), 'UTC');
+        v_start_time := date_trunc('day', now() AT TIME ZONE '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(), 'UTC');
+        v_start_time := date_trunc('week', now() AT TIME ZONE '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(), 'UTC');
+        v_start_time := date_trunc('month', now() AT TIME ZONE '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
-        RAISE EXCEPTION 'Unsupported partitioning period: %', p_period;
+        RETURN;
     END IF;
 
     -- 1. Create Future Partitions (Current + Buffer)
@@ -231,14 +181,3 @@ BEGIN
     END LOOP;
 END;
 $$;
-
--- Trigger function to silently discard housekeeper tasks for partitioned tables
-CREATE OR REPLACE FUNCTION partitions.housekeeper_insert_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF EXISTS (SELECT 1 FROM partitions.config WHERE table_name = NEW.tablename) THEN
-        RETURN NULL;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;

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

@@ -1,5 +1,6 @@
 -- ============================================================================
--- Creates a view to monitor partition status and sizes.
+-- SCRIPT: 04_monitoring_view.sql
+-- DESCRIPTION: Creates a view to monitor partition status and sizes.
 -- ============================================================================
 
 CREATE OR REPLACE VIEW partitions.monitoring AS
@@ -8,26 +9,20 @@ SELECT
     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() AT TIME ZONE 'UTC', 'YYYYMMDD')))
+           (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() 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,
+           (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 AND pg_table_is_visible(parent.oid)
+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.future_partitions, c.last_updated;
+GROUP BY parent.relname, c.table_name, c.period, c.keep_history, c.last_updated;

postgresql/docker/run_test_env.sh

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

@@ -1,6 +1,7 @@
 -- ============================================================================
--- Creates the 'partitions' schema and configuration table.
--- Defines the structure for managing Zabbix partitioning.
+-- 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;
@@ -8,21 +9,13 @@ 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,
+    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)
 );
 
--- Ensure the future_partitions column exists for users upgrading from older versions
-DO $$
-BEGIN
-    IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_schema = 'partitions' AND table_name = 'config' AND column_name = 'future_partitions') THEN
-        ALTER TABLE partitions.config ADD COLUMN future_partitions integer NOT NULL DEFAULT 5;
-    END IF;
-END $$;
-
 -- Table to track installed version of the partitioning solution
 CREATE TABLE IF NOT EXISTS partitions.version (
     version text PRIMARY KEY,
@@ -30,7 +23,8 @@ CREATE TABLE IF NOT EXISTS partitions.version (
     description text
 );
 
-INSERT INTO partitions.version (version, description) VALUES ('7-2', 'Added housekeeper task interceptor trigger to drop tasks for partitioned tables')
+-- 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)
@@ -40,16 +34,9 @@ INSERT INTO partitions.config (table_name, period, keep_history) VALUES
 ('history_uint', 'day', '30 days'),
 ('history_str', 'day', '30 days'),
 ('history_log', 'day', '30 days'),
-('history_text', 'day', '30 days'),
-('history_bin', 'day', '30 days')
+('history_text', 'day', '30 days')
 ON CONFLICT (table_name) DO NOTHING;
 
--- Zabbix 8.0+ only: Uncomment the following lines if running Zabbix 8.0 or later
--- INSERT INTO partitions.config (table_name, period, keep_history) VALUES
--- ('history_json', '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'),

postgresql/procedures/01_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/procedures/02_enable_partitioning.sql

@@ -1,97 +0,0 @@
--- ============================================================================
--- 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;
-    v_schema text;
-BEGIN
-    FOR v_row IN SELECT * FROM partitions.config LOOP
-        v_table := v_row.table_name;
-        v_old_table := v_table || '_old';
-        
-        -- Determine schema
-        SELECT n.nspname INTO v_schema
-        FROM pg_class c
-        JOIN pg_namespace n ON n.oid = c.relnamespace
-        WHERE c.relname = v_table AND pg_table_is_visible(c.oid);
-
-        
-        IF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'r' AND pg_table_is_visible(oid)) 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 (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;
-            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 %I.%I SELECT * FROM %I.%I', v_schema, v_table, v_schema, v_old_table);
-            
-        ELSIF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'p' AND pg_table_is_visible(oid)) THEN
-             RAISE NOTICE 'Table % is already partitioned. Skipping conversion.', v_table;
-             -- Just run maintenance for this specific table to ensure partitions exist
-             CALL partitions.maintain_table(v_table, v_row.period, v_row.keep_history, v_row.future_partitions);
-        ELSE
-             RAISE WARNING 'Table % not found!', v_table;
-        END IF;
-    END LOOP;
-
-    -- Attach trigger to housekeeper table to silently discard tasks for partitioned tables.
-    -- Dynamically determine the schema of the housekeeper table to support custom schemas.
-    SELECT n.nspname INTO v_schema
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = 'housekeeper' AND pg_table_is_visible(c.oid);
-
-    IF v_schema IS NOT NULL THEN
-        EXECUTE format('DROP TRIGGER IF EXISTS housekeeper_filter ON %I.housekeeper', v_schema);
-        EXECUTE format('CREATE TRIGGER housekeeper_filter BEFORE INSERT ON %I.housekeeper FOR EACH ROW EXECUTE FUNCTION partitions.housekeeper_insert_trigger()', v_schema);
-        RAISE NOTICE 'Housekeeper intercept trigger installed on %.housekeeper', v_schema;
-    ELSE
-        RAISE WARNING 'housekeeper table not found — trigger NOT installed!';
-    END IF;
-END $$;
-
--- ==========================================================================
--- IMPORTANT: To ensure the Zabbix Server can insert into the housekeeper
--- table without permission issues, we automatically grant access to the 
--- partitions schema to the owner of the housekeeper table.
--- ==========================================================================
-DO $$
-DECLARE
-    v_owner text;
-BEGIN
-    SELECT pg_get_userbyid(c.relowner) INTO v_owner
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = 'housekeeper' AND pg_table_is_visible(c.oid);
-
-    IF v_owner IS NOT NULL THEN
-        EXECUTE format('GRANT USAGE ON SCHEMA partitions TO %I', v_owner);
-        EXECUTE format('GRANT SELECT ON partitions.config TO %I', v_owner);
-        RAISE NOTICE 'Granted partitions schema permissions to housekeeper owner: %', v_owner;
-    ELSE
-        RAISE WARNING 'housekeeper table not found, could not grant permissions automatically!';
-    END IF;
-END $$;

postgresql/procedures/02_maintenance.sql

@@ -1,16 +1,17 @@
 -- ============================================================================
--- Core functions for Zabbix partitioning (Create, Drop, Maintain).
+-- SCRIPT: 02_maintenance.sql
+-- DESCRIPTION: Core functions for Zabbix partitioning (Create, Drop, Maintain).
 -- ============================================================================
 
--- Function to check if a partition exists in a specific schema
-CREATE OR REPLACE FUNCTION partitions.partition_exists(p_partition_name text, p_schema text) 
+-- 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 = p_schema
+        AND n.nspname = 'public'
     );
 END;
 $$ LANGUAGE plpgsql;
@@ -27,45 +28,24 @@ DECLARE
     v_start_ts bigint;
     v_end_ts bigint;
     v_suffix text;
-    v_parent_schema text;
 BEGIN
-    -- Determine the schema of the parent table
-    SELECT n.nspname INTO v_parent_schema
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = p_parent_table AND pg_table_is_visible(c.oid);
-
-    IF NOT FOUND THEN
-        RAISE EXCEPTION 'Parent table % not found', p_parent_table;
-    END IF;
     -- (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');
-    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;
     
     v_partition_name := p_parent_table || '_p' || v_suffix;
 
-    IF NOT partitions.partition_exists(v_partition_name, v_parent_schema) THEN
-        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;
-            WHEN duplicate_table THEN
-                -- Ignore race condition: another process created the partition concurrently
-                RAISE NOTICE 'Partition % already exists (concurrent creation). Skipping.', v_partition_name;
-        END;
+    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;
 $$;
@@ -81,20 +61,17 @@ DECLARE
     v_partition record;
     v_partition_date timestamp with time zone;
     v_suffix text;
-    v_partition_schema 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,
-            n.nspname AS partition_schema
+            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
-        JOIN pg_namespace n ON child.relnamespace = n.oid
-        WHERE parent.relname = p_parent_table AND pg_table_is_visible(parent.oid)
+        WHERE parent.relname = p_parent_table
     LOOP
         -- Parse partition suffix to determine age
         -- Format: parent_pYYYYMM or parent_pYYYYMMDD
@@ -102,48 +79,27 @@ BEGIN
         
         BEGIN
             IF length(v_suffix) = 6 THEN -- YYYYMM
-                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
+                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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
                     COMMIT; -- Release lock immediately
                 END IF;
-            ELSE
+            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 %I.%I', v_partition.partition_schema, v_partition.partition_name);
+                    EXECUTE format('DROP TABLE public.%I', v_partition.partition_name);
                     COMMIT; -- Release lock immediately
                 END IF;
             END IF;
-        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;
+        EXCEPTION WHEN OTHERS THEN
+            -- Ignore parsing errors for non-standard partitions
+            NULL;
+        END;
     END LOOP;
 END;
 $$;
@@ -163,29 +119,23 @@ DECLARE
 BEGIN
     IF p_period = 'day' THEN
         v_period_interval := '1 day'::interval;
-        v_start_time := date_trunc('day', now(), 'UTC');
+        v_start_time := date_trunc('day', now() AT TIME ZONE '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(), 'UTC');
+        v_start_time := date_trunc('week', now() AT TIME ZONE '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(), 'UTC');
+        v_start_time := date_trunc('month', now() AT TIME ZONE '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
-        RAISE EXCEPTION 'Unsupported partitioning period: %', p_period;
+        RETURN;
     END IF;
 
     -- 1. Create Future Partitions (Current + Buffer)
@@ -231,14 +181,3 @@ BEGIN
     END LOOP;
 END;
 $$;
-
--- Trigger function to silently discard housekeeper tasks for partitioned tables
-CREATE OR REPLACE FUNCTION partitions.housekeeper_insert_trigger()
-RETURNS TRIGGER AS $$
-BEGIN
-    IF EXISTS (SELECT 1 FROM partitions.config WHERE table_name = NEW.tablename) THEN
-        RETURN NULL;
-    END IF;
-    RETURN NEW;
-END;
-$$ LANGUAGE plpgsql;

postgresql/procedures/03_enable_partitioning.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/procedures/03_monitoring_view.sql

@@ -1,42 +0,0 @@
--- ============================================================================
--- 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,
-    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() AT TIME ZONE 'UTC', 'YYYYMMDD')))
-           OR
-           (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,
-    c.last_updated
-FROM partitions.config c
-JOIN pg_class parent ON parent.relname = c.table_name AND pg_table_is_visible(parent.oid)
-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.future_partitions, c.last_updated;
-
--- ============================================================================
--- IMPORTANT: Since DROP VIEW / CREATE VIEW resets permissions, we automatically
--- grant read access to PUBLIC. This ensures that whatever monitoring user
--- (e.g. zbx_monitor) is connecting to the DB will always be able to read 
--- the monitoring stats without manual intervention after upgrades.
--- ==========================================================================
-GRANT USAGE ON SCHEMA partitions TO PUBLIC;
-GRANT SELECT ON partitions.monitoring TO PUBLIC;

postgresql/procedures/04_monitoring_view.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/procedures/04_undo_partitioning.sql

@@ -1,79 +0,0 @@
--- ============================================================================
--- Reverts Zabbix partitioned tables back to standard non-partitioned tables.
--- Existing partitioned tables will be renamed to *_part (data is preserved).
--- ============================================================================
-
-DO $$
-DECLARE
-    v_row record;
-    v_table text;
-    v_part_table text;
-    v_schema text;
-BEGIN
-    FOR v_row IN SELECT * FROM partitions.config LOOP
-        v_table := v_row.table_name;
-        v_part_table := v_table || '_part';
-        
-        -- Determine schema of the partitioned table
-        SELECT n.nspname INTO v_schema
-        FROM pg_class c
-        JOIN pg_namespace n ON n.oid = c.relnamespace
-        WHERE c.relname = v_table AND c.relkind = 'p' AND pg_table_is_visible(c.oid);
-
-        IF v_schema IS NOT NULL THEN
-            RAISE NOTICE 'Reverting partitioned table %...', v_table;
-            
-            -- 1. Rename existing partitioned table to *_part
-            EXECUTE format('ALTER TABLE %I.%I RENAME TO %I', v_schema, v_table, v_part_table);
-            
-            -- 2. Create standard (unpartitioned) replacement table based on the structure
-            IF v_table = 'auditlog' THEN
-                -- For auditlog, we need to try and restore the original single-column PK (auditid) if possible
-                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING DEFAULTS INCLUDING COMMENTS)', v_schema, v_table, v_schema, v_part_table);
-                BEGIN
-                    EXECUTE format('ALTER TABLE %I.%I ADD PRIMARY KEY (auditid)', v_schema, v_table);
-                EXCEPTION WHEN others THEN
-                    RAISE WARNING 'Failed to create primary key on auditlog, might already exist or duplicates present.';
-                END;
-                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);
-                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_3 ON %I.%I (resourcetype, resourceid)', v_schema, v_table);
-                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_4 ON %I.%I (recordsetid)', v_schema, v_table);
-                EXECUTE format('CREATE INDEX IF NOT EXISTS auditlog_5 ON %I.%I (ip)', v_schema, v_table);
-            ELSE
-                -- For others, copy everything including indexes
-                EXECUTE format('CREATE TABLE %I.%I (LIKE %I.%I INCLUDING ALL)', v_schema, v_table, v_schema, v_part_table);
-            END IF;
-            
-            RAISE NOTICE 'SUCCESS: % reverted to default. Partitioned data stored in % (You can DROP TABLE % CASCADE; later).', v_table, v_part_table, v_part_table;
-            
-        ELSIF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'r' AND pg_table_is_visible(oid)) THEN
-            RAISE NOTICE 'Table % is already a regular table. Skipping.', v_table;
-        ELSE
-            RAISE WARNING 'Partitioned table % not found!', v_table;
-        END IF;
-    END LOOP;
-    
-    -- Drop the housekeeper intercept trigger (dynamically determine schema for custom schema support)
-    SELECT n.nspname INTO v_schema
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = 'housekeeper' AND pg_table_is_visible(c.oid);
-
-    IF v_schema IS NOT NULL THEN
-        EXECUTE format('DROP TRIGGER IF EXISTS housekeeper_filter ON %I.housekeeper', v_schema);
-        RAISE NOTICE 'Housekeeper intercept trigger removed from %.housekeeper', v_schema;
-    ELSE
-        RAISE WARNING 'housekeeper table not found — trigger removal skipped.';
-    END IF;
-    
-    RAISE NOTICE '================================================================================';
-    RAISE NOTICE 'Undo complete. Partitioned tables have been renamed to *_part.';
-    RAISE NOTICE 'If you want to migrate your history back, you must do it manually:';
-    RAISE NOTICE '    INSERT INTO history SELECT * FROM history_part;';
-    RAISE NOTICE 'Once done, or if you do not need the data, drop the partitioned tables:';
-    RAISE NOTICE '    DROP TABLE history_part CASCADE;';
-    RAISE NOTICE 'After that, you can safely remove the partitions infrastructure:';
-    RAISE NOTICE '    DROP SCHEMA partitions CASCADE;';
-    RAISE NOTICE '================================================================================';
-END $$;

postgresql/procedures/MANUAL.md

@@ -1,189 +0,0 @@
-# Zabbix Partitioning Deployment Manual
-
-This guide provides a step-by-step process for deploying the PostgreSQL partitioning solution for Zabbix.
-
-**🚨 DANGER: CRITICAL WARNING 🚨**
-**BEFORE YOU PROCEED, YOU ABSOLUTELY MUST TAKE A FULL BACKUP OF YOUR ZABBIX DATABASE.**
-**DO NOT SKIP THIS STEP. Schema modifications are dangerous. If something goes wrong and you do not have a backup, your historical data will be lost permanently, and we take ZERO responsibility.**
-
----
-
-## Step 1: Preparation & Safety
-
-Because database migrations can take time (especially on large tables), **never** run these scripts directly in a standard SSH session that might disconnect.
-
-1. Open a safe terminal session using `tmux` or `screen`:
-   ```bash
-   tmux new -s zabbix_partitioning
-   # OR
-   screen -S zabbix_partitioning
-   ```
-2. Disable the Zabbix Housekeeper for History and Trends:
-   - Go to your Zabbix Web UI -> **Administration** -> **Housekeeping**.
-   - **Uncheck** "Enable internal housekeeping" for **History and Trends**.
-   - Click **Update**.
-3. Stop your Zabbix Server to ensure no new data is being written during the schema migration:
-   ```bash
-   sudo systemctl stop zabbix-server
-   ```
-
----
-
-## Step 2: Database Connection & Schema Selection
-
-Connect to your PostgreSQL server as an administrator (e.g., `postgres` or the database owner).
-
-```bash
-psql -U postgres -h localhost
-```
-
-Once inside `psql`, connect to your Zabbix database (usually named `zabbix`):
-
-```sql
-\c zabbix
-```
-
-> [!IMPORTANT]
-> **Custom Schemas:** By default, Zabbix installs into the `public` schema. If you installed Zabbix into a custom schema (e.g., `zabbix_schema`), you **must** set your `search_path` now before running the scripts, otherwise they will fail to find your tables:
-> ```sql
-> SET search_path TO zabbix_schema, public;
-> ```
-
----
-
-## Step 3: Execute Installation Scripts
-
-Run the scripts in the following exact order. You can execute them directly from your bash terminal, from within the interactive `psql` console, or by pasting their contents into a GUI tool (like pgAdmin).
-
-> [!NOTE]
-> **Zabbix 8.0+ Users:** Zabbix 8.0 introduced a new `history_json` table. Before running the first script, open `00_schema_create.sql` in a text editor and uncomment the lines specifically marked for Zabbix 8.0 at the end of the history tables block.
-
-### Option A: From bash terminal (Recommended)
-If you are in your normal Linux terminal, run these commands one by one:
-```bash
-psql -U postgres -d zabbix -f 00_schema_create.sql
-psql -U postgres -d zabbix -f 01_maintenance.sql
-# MIGRATION STEP: The next script renames your existing large tables to `_old` 
-# and instantly creates new partitioned tables. This might take a few moments.
-psql -U postgres -d zabbix -f 02_enable_partitioning.sql
-psql -U postgres -d zabbix -f 03_monitoring_view.sql
-```
-
-### Option B: Inside interactive `psql`
-If you already connected via `psql` (as in Step 2), use the `\i` command:
-```sql
-\i 00_schema_create.sql
-\i 01_maintenance.sql
-\i 02_enable_partitioning.sql
-\i 03_monitoring_view.sql
-```
-
-### Option C: GUI Tools (pgAdmin, DBeaver, etc.)
-If you use a visual database manager, simply open each file in your query editor and execute them one by one in the exact order (00, 01, 02, 03).
-
----
-
-## Step 4: Schedule Automated Maintenance
-
-Partitioning requires a daily job to create new partitions for tomorrow and drop old partitions from last month.
-
-> [!WARNING]
-> **CRITICAL EXECUTION RULE**: You MUST execute the maintenance procedure as a standalone command exactly as shown below. **DO NOT** wrap it in a transaction block (`BEGIN; ... COMMIT;`) or batch it with other SQL commands in a single string, or it will crash with an `invalid transaction termination` error.
-
-If you are using **AWS RDS** or a managed database with `pg_cron` enabled, run this inside `psql`:
-
-```sql
-CREATE EXTENSION IF NOT EXISTS pg_cron;
-SELECT cron.schedule('zabbix_partition_maintenance', '30 5,23 * * *', 'CALL partitions.run_maintenance();');
-```
-
-If you are **self-hosting** and prefer standard system `cron`, simply add this to your `crontab -e`:
-
-```bash
-# Run Zabbix partition maintenance twice daily (5:30 AM and 11:30 PM)
-30 5,23 * * * psql -U postgres -d zabbix -c "CALL partitions.run_maintenance();" >> /var/log/zabbix_maintenance.log 2>&1
-```
-
----
-
-## Step 5: Start Zabbix Server
-
-Now that the database is fully partitioned, you can safely start Zabbix Server again:
-
-```bash
-sudo systemctl start zabbix-server
-```
-
-*(Note: Your old history data remains safely preserved in tables like `history_old`. It is no longer visible in the UI, but it is available in the database if you ever need to manually migrate it.)*
-
----
-
-## Step 6: Configure Zabbix Agent Monitoring
-
-To ensure your partitions don't run out, you must monitor them. We use Zabbix Agent 2 for this.
-
-1. On your database server (where Zabbix Agent 2 is installed), create the SQL query file using this simple one-liner. Copy and paste the entire block below into your terminal:
-
-```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
-```
-*(Note: If your Zabbix Agent is configured to look for custom queries in a different directory like `/etc/zabbix/postgresql/sql/`, modify the destination path above).*
-
-2. Configure the PostgreSQL Plugin by editing `/etc/zabbix/zabbix_agent2.d/plugins.d/postgresql.conf`. Ensure you have defined a session (e.g., `MY_DB`) and enabled custom queries:
-
-```ini
-Plugins.PostgreSQL.CustomQueriesPath=/etc/zabbix/zabbix_agent2.d/
-Plugins.PostgreSQL.CustomQueriesEnabled=true
-
-# Example Session (replace with your actual credentials)
-Plugins.PostgreSQL.Sessions.MY_DB.Uri=tcp://localhost:5432
-Plugins.PostgreSQL.Sessions.MY_DB.User=zbx_monitor
-Plugins.PostgreSQL.Sessions.MY_DB.Password=your_password
-```
-
-3. Restart the Zabbix Agent 2:
-```bash
-sudo systemctl restart zabbix-agent2
-```
-
----
-
-## Step 7: Import Template in Zabbix
-
-1. Log into your Zabbix Web UI.
-2. Go to **Data collection** -> **Templates** and click **Import**.
-3. Upload the `template/zbx_pg_partitions_monitor_agent2.yaml` file from this repository.
-4. Go to your Database Host in Zabbix, and link the newly imported template: `PostgreSQL Partitioning by Zabbix Agent 2`.
-5. On the Host configuration, go to the **Macros** tab. 
-6. You will see a macro named `{$PG.CONNSTRING.AGENT2}` with the value `<replace_me>`. 
-7. Change `<replace_me>` to the name of the session you configured in Step 6 (e.g., `MY_DB`).
-8. Click **Update**.
-
-**Congratulations!** Your Zabbix database is now fully partitioned, optimized, and monitored.
-
----
-
-## Step 8: Upgrades & Updates
-
-To apply future updates or fixes to the partitioning logic, the scripts are fully idempotent and safe to re-run on a live database.
-Simply connect to `psql` and re-execute the updated scripts in order:
-
-```bash
-psql -U postgres -d zabbix -f 00_schema_create.sql
-psql -U postgres -d zabbix -f 01_maintenance.sql
-psql -U postgres -d zabbix -f 02_enable_partitioning.sql
-psql -U postgres -d zabbix -f 03_monitoring_view.sql
-```
-
-> [!WARNING]
-> If you update the agent SQL query, always remember to restart the agent (`sudo systemctl restart zabbix-agent2`) so it flushes its cache!

postgresql/procedures/README.md

@@ -1,29 +1,12 @@
 # PostgreSQL Partitioning for Zabbix
 
-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. 
+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. 
 
 
 > [!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*. 
-
-## 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)
-- [PostgreSQL Tuning](#postgresql-tuning)
-- [Uninstall / Reverting](#uninstall--reverting)
-- [Upgrades](#upgrades)
+> 2.  **Disable Housekeeping**: You **MUST** disable Zabbix Housekeeper for History and Trends in *Administration -> Housekeeping*. Failure to do so will cause massive `DELETE` loads.
 
 ## Architecture
 
@@ -38,10 +21,12 @@ All procedures, information, statistics and configuration are stored in the `par
 
 ## Installation
 
-> [!IMPORTANT]
-> **For deployment instructions, please refer to [MANUAL.md](MANUAL.md).**
-> `MANUAL.md` contains the step-by-step, foolproof installation guide intended for customer sharing. This `README.md` serves as an internal knowledge base for maintaining, troubleshooting, and understanding the architecture.
-
+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`).
 
 ## Configuration
 
@@ -76,108 +61,14 @@ This procedure should be scheduled to run periodically (e.g., daily via `pg_cron
 ```sql
 CALL partitions.run_maintenance();
 ```
-### Scheduling Maintenance
+### Automatic Maintenance (Cron)
 
 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** and not in round hours because of the way housekeeper works (e.g., at 05:30 and 23:30).
+It is recommended to run the maintenance **twice a day** (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)
@@ -185,138 +76,47 @@ Standard system cron is a simple fallback.
 ```
 
 **Docker Environment:**
-If running in Docker, you can execute it via the host's cron by targeting the container:
+If running in Docker, you can execute it via 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 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.
+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`).
 
 ```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 (`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.
+### Least Privilege Access (`zbx_monitor`)
+For monitoring purposes, it is recommended to create a dedicated user with read-only access to the monitoring view.
 
 ```sql
-CREATE USER zbxpart_monitor WITH PASSWORD 'secure_password';
-GRANT USAGE ON SCHEMA partitions TO zbxpart_monitor;
-GRANT SELECT ON partitions.monitoring TO zbxpart_monitor;
+CREATE USER zbx_monitor WITH PASSWORD 'secure_password';
+GRANT USAGE ON SCHEMA partitions TO zbx_monitor;
+GRANT SELECT ON partitions.monitoring TO zbx_monitor;
 ```
 
-> [!NOTE]
-> The `03_monitoring_view.sql` script is designed to automatically execute `GRANT SELECT ON partitions.monitoring TO PUBLIC;` so that read access is never lost during upgrades when the view is recreated.
-
 ## Implementation Details
 
 ### `auditlog` Table
-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.
+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)`.
 
 ### Converting Existing Tables
-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.
-
-> [!WARNING]
-> **Non-Atomic Enablement**: The `02_enable_partitioning.sql` script is executed within a `DO $$` block. However, because it calls the maintenance procedure (which issues `COMMIT` statements to manage locks), the enablement process is **not atomic**. If the script crashes halfway through (e.g., due to a missing table), it will not roll back the previously converted tables. The database will be in a partially partitioned state. Fortunately, the script is fully restartable. Simply fix the underlying issue and run the script again; it will skip already partitioned tables and resume where it left off.
-
-### Housekeeper Interceptor
-Even when Zabbix Housekeeping is disabled in the UI for History and Trends, the Zabbix Server daemon may still generate and insert tasks into the `housekeeper` table (e.g., when an item or trigger is deleted, it schedules the deletion of its historical data). Without intervention, this results in the `housekeeper` table bloating massively over time, leading to slow sequential scans and `autovacuum` overhead.
-
-To prevent this, this extension installs a `BEFORE INSERT` trigger on the `housekeeper` table. 
-*   When Zabbix attempts to insert a housekeeper task, the trigger intercepts it and checks if the target table is managed in `partitions.config`.
-*   If the table is partitioned (like `history`), the trigger **silently discards the insert** (`RETURNS NULL`), preventing disk I/O and table bloat entirely.
-*   If the table is not partitioned (like `events` or `sessions`), the task is allowed to be recorded and is cleaned up naturally by Zabbix.
-
-## Troubleshooting & Known Exceptions
-
-### `invalid transaction termination`
-When manually executing or scheduling the maintenance procedure (`CALL partitions.run_maintenance();`), you or the customer might encounter the following fatal error:
-`ERROR: invalid transaction termination`
-
-**Why this happens:**
-Inside the `partitions` PL/pgSQL procedures, we execute `COMMIT;` statements within loops to eagerly release locks and prevent transaction bloat when dropping dozens of partitions. PostgreSQL fundamentally prohibits executing `COMMIT` from within a procedure if that procedure was called from inside an explicit transaction block or a batched command string.
-
-**How to fix/avoid it:**
-Ensure the procedure is ALWAYS executed as a top-level, standalone command.
-* **Bad**: `BEGIN; CALL partitions.run_maintenance(); COMMIT;`
-* **Bad**: `psql -c "UPDATE partitions.config SET keep_history = '1 day'; CALL partitions.run_maintenance();"` (psql batches these into one transaction)
-* **Good**: `psql -c "CALL partitions.run_maintenance();"`
-
-## PostgreSQL Tuning
-
-Before or immediately after enabling partitioning, you should tune your `postgresql.conf`. The standard configuration is not optimized for partitioned tables and might cause performance degradation or out-of-memory errors.
-
-| Parameter | Recommended | Description |
-|-----------|-------------|-------------|
-| `max_locks_per_transaction`| `512` (or higher) | **Requires DB Restart.** Default is `64`, which is far too low. PostgreSQL lock tables per partition. With many partitioned tables (e.g., history x 30 days), operations like `pg_dump`, `VACUUM`, or queries crossing multiple boundaries will fail with *“out of shared memory”*. |
-| `jit` | `off` | **Highly Recommended.** JIT adds overhead to query planning. With many partitions, JIT can drastically increase CPU usage as PostgreSQL attempts to optimize simple queries across dozens of partitions. |
-
-**Default parameters to verify:**
-The following are usually set correctly by default, but you should verify them just in case:
-*   `enable_partition_pruning = on` : **Critical.** Ensures PostgreSQL only queries the necessary partitions instead of scanning everything.
-*   `enable_partitionwise_join = off` : Zabbix does not do massive joins on history tables; enabling this only wastes planner CPU time.
-*   `enable_partitionwise_aggregate = off` : Zabbix doesn't perform complex DB-side `GROUP BY` aggregations on history. Leave it disabled.
-
-## Uninstall / Reverting
-
-If you wish to stop using partitioning and revert back to standard, unpartitioned tables without data loss, carefully follow these steps. 
-
-> [!CAUTION]
-> Reverting partitioning replaces your partitioned tables with standard empty tables. If you need to retain data from the partitioned period, you must manually migrate it before dropping the partition sets. **Always stop Zabbix Server before proceeding.**
-
-1. **Stop Zabbix Server** to prevent new data from being inserted during the transition.
-2. **Execute Undo Script:** Run the `04_undo_partitioning.sql` script to recreate non-partitioned tables matching your original Zabbix schema. This script will rename your current partitioned tables to `*_part` (`history_part`, `trends_part`, etc.) and automatically create native, clean tables (`history`, `trends`) in their place.
-   ```bash
-   psql -h $DB_HOST -U zbxpart_admin -d zabbix -f 04_undo_partitioning.sql
-   ```
-3. **Data Migration (Optional):** If you want to keep the metrics collected during the partitioned period, you must manually insert them into the newly created regular tables. This step can take hours depending on table sizes.
-   ```sql
-   INSERT INTO history SELECT * FROM history_part;
-   INSERT INTO trends SELECT * FROM trends_part;
-   -- Repeat for all tables you wish to restore
-   ```
-4. **Cleanup:** Once you have migrated the data you need (or if you don't need it at all), you can drop the heavy partitioned tables and remove the partitioning extensions completely.
-   ```sql
-   DROP TABLE history_part CASCADE;
-   DROP TABLE history_uint_part CASCADE;
-   -- Repeat for all *_part tables ...
-   
-   -- To drop the automatic maintenance infrastructure:
-   DROP SCHEMA partitions CASCADE;
-   ```
-5. **Start Zabbix Server & Re-enable Housekeeper:** Once the tables are replaced, you can start the server. *Don't forget to re-enable Housekeeping for History and Trends in the Zabbix UI!*
+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.
 
 ## 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

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

postgresql/sql-scripts-70/schema.sql

@@ -86,8 +86,6 @@ CREATE TABLE hosts (
 	vendor_version           varchar(32)     DEFAULT ''                NOT NULL,
 	proxy_groupid            bigint                                    NULL,
 	monitored_by             integer         DEFAULT '0'               NOT NULL,
-	wizard_ready             integer         DEFAULT '0'               NOT NULL,
-	readme                   text            DEFAULT ''                NOT NULL,
 	PRIMARY KEY (hostid)
 );
 CREATE INDEX hosts_1 ON hosts (host);
@@ -362,20 +360,6 @@ CREATE TABLE media_type (
 	PRIMARY KEY (mediatypeid)
 );
 CREATE UNIQUE INDEX media_type_1 ON media_type (name);
-CREATE TABLE media_type_oauth (
-	mediatypeid              bigint                                    NOT NULL,
-	redirection_url          varchar(2048)   DEFAULT ''                NOT NULL,
-	client_id                varchar(255)    DEFAULT ''                NOT NULL,
-	client_secret            varchar(255)    DEFAULT ''                NOT NULL,
-	authorization_url        varchar(2048)   DEFAULT ''                NOT NULL,
-	tokens_status            integer         DEFAULT '0'               NOT NULL,
-	access_token             text            DEFAULT ''                NOT NULL,
-	access_token_updated     integer         DEFAULT '0'               NOT NULL,
-	access_expires_in        integer         DEFAULT '0'               NOT NULL,
-	refresh_token            text            DEFAULT ''                NOT NULL,
-	token_url                varchar(2048)   DEFAULT ''                NOT NULL,
-	PRIMARY KEY (mediatypeid)
-);
 CREATE TABLE media_type_param (
 	mediatype_paramid        bigint                                    NOT NULL,
 	mediatypeid              bigint                                    NOT NULL,
@@ -586,6 +570,132 @@ CREATE TABLE conditions (
 	PRIMARY KEY (conditionid)
 );
 CREATE INDEX conditions_1 ON conditions (actionid);
+CREATE TABLE config (
+	configid                 bigint                                    NOT NULL,
+	work_period              varchar(255)    DEFAULT '1-5,09:00-18:00' NOT NULL,
+	alert_usrgrpid           bigint                                    NULL,
+	default_theme            varchar(128)    DEFAULT 'blue-theme'      NOT NULL,
+	authentication_type      integer         DEFAULT '0'               NOT NULL,
+	discovery_groupid        bigint                                    NULL,
+	max_in_table             integer         DEFAULT '50'              NOT NULL,
+	search_limit             integer         DEFAULT '1000'            NOT NULL,
+	severity_color_0         varchar(6)      DEFAULT '97AAB3'          NOT NULL,
+	severity_color_1         varchar(6)      DEFAULT '7499FF'          NOT NULL,
+	severity_color_2         varchar(6)      DEFAULT 'FFC859'          NOT NULL,
+	severity_color_3         varchar(6)      DEFAULT 'FFA059'          NOT NULL,
+	severity_color_4         varchar(6)      DEFAULT 'E97659'          NOT NULL,
+	severity_color_5         varchar(6)      DEFAULT 'E45959'          NOT NULL,
+	severity_name_0          varchar(32)     DEFAULT 'Not classified'  NOT NULL,
+	severity_name_1          varchar(32)     DEFAULT 'Information'     NOT NULL,
+	severity_name_2          varchar(32)     DEFAULT 'Warning'         NOT NULL,
+	severity_name_3          varchar(32)     DEFAULT 'Average'         NOT NULL,
+	severity_name_4          varchar(32)     DEFAULT 'High'            NOT NULL,
+	severity_name_5          varchar(32)     DEFAULT 'Disaster'        NOT NULL,
+	ok_period                varchar(32)     DEFAULT '5m'              NOT NULL,
+	blink_period             varchar(32)     DEFAULT '2m'              NOT NULL,
+	problem_unack_color      varchar(6)      DEFAULT 'CC0000'          NOT NULL,
+	problem_ack_color        varchar(6)      DEFAULT 'CC0000'          NOT NULL,
+	ok_unack_color           varchar(6)      DEFAULT '009900'          NOT NULL,
+	ok_ack_color             varchar(6)      DEFAULT '009900'          NOT NULL,
+	problem_unack_style      integer         DEFAULT '1'               NOT NULL,
+	problem_ack_style        integer         DEFAULT '1'               NOT NULL,
+	ok_unack_style           integer         DEFAULT '1'               NOT NULL,
+	ok_ack_style             integer         DEFAULT '1'               NOT NULL,
+	snmptrap_logging         integer         DEFAULT '1'               NOT NULL,
+	server_check_interval    integer         DEFAULT '10'              NOT NULL,
+	hk_events_mode           integer         DEFAULT '1'               NOT NULL,
+	hk_events_trigger        varchar(32)     DEFAULT '365d'            NOT NULL,
+	hk_events_internal       varchar(32)     DEFAULT '1d'              NOT NULL,
+	hk_events_discovery      varchar(32)     DEFAULT '1d'              NOT NULL,
+	hk_events_autoreg        varchar(32)     DEFAULT '1d'              NOT NULL,
+	hk_services_mode         integer         DEFAULT '1'               NOT NULL,
+	hk_services              varchar(32)     DEFAULT '365d'            NOT NULL,
+	hk_audit_mode            integer         DEFAULT '1'               NOT NULL,
+	hk_audit                 varchar(32)     DEFAULT '31d'             NOT NULL,
+	hk_sessions_mode         integer         DEFAULT '1'               NOT NULL,
+	hk_sessions              varchar(32)     DEFAULT '365d'            NOT NULL,
+	hk_history_mode          integer         DEFAULT '1'               NOT NULL,
+	hk_history_global        integer         DEFAULT '0'               NOT NULL,
+	hk_history               varchar(32)     DEFAULT '31d'             NOT NULL,
+	hk_trends_mode           integer         DEFAULT '1'               NOT NULL,
+	hk_trends_global         integer         DEFAULT '0'               NOT NULL,
+	hk_trends                varchar(32)     DEFAULT '365d'            NOT NULL,
+	default_inventory_mode   integer         DEFAULT '-1'              NOT NULL,
+	custom_color             integer         DEFAULT '0'               NOT NULL,
+	http_auth_enabled        integer         DEFAULT '0'               NOT NULL,
+	http_login_form          integer         DEFAULT '0'               NOT NULL,
+	http_strip_domains       varchar(2048)   DEFAULT ''                NOT NULL,
+	http_case_sensitive      integer         DEFAULT '1'               NOT NULL,
+	ldap_auth_enabled        integer         DEFAULT '0'               NOT NULL,
+	ldap_case_sensitive      integer         DEFAULT '1'               NOT NULL,
+	db_extension             varchar(32)     DEFAULT ''                NOT NULL,
+	autoreg_tls_accept       integer         DEFAULT '1'               NOT NULL,
+	compression_status       integer         DEFAULT '0'               NOT NULL,
+	compress_older           varchar(32)     DEFAULT '7d'              NOT NULL,
+	instanceid               varchar(32)     DEFAULT ''                NOT NULL,
+	saml_auth_enabled        integer         DEFAULT '0'               NOT NULL,
+	saml_case_sensitive      integer         DEFAULT '0'               NOT NULL,
+	default_lang             varchar(5)      DEFAULT 'en_US'           NOT NULL,
+	default_timezone         varchar(50)     DEFAULT 'system'          NOT NULL,
+	login_attempts           integer         DEFAULT '5'               NOT NULL,
+	login_block              varchar(32)     DEFAULT '30s'             NOT NULL,
+	show_technical_errors    integer         DEFAULT '0'               NOT NULL,
+	validate_uri_schemes     integer         DEFAULT '1'               NOT NULL,
+	uri_valid_schemes        varchar(255)    DEFAULT 'http,https,ftp,file,mailto,tel,ssh' NOT NULL,
+	x_frame_options          varchar(255)    DEFAULT 'SAMEORIGIN'      NOT NULL,
+	iframe_sandboxing_enabled integer         DEFAULT '1'               NOT NULL,
+	iframe_sandboxing_exceptions varchar(255)    DEFAULT ''                NOT NULL,
+	max_overview_table_size  integer         DEFAULT '50'              NOT NULL,
+	history_period           varchar(32)     DEFAULT '24h'             NOT NULL,
+	period_default           varchar(32)     DEFAULT '1h'              NOT NULL,
+	max_period               varchar(32)     DEFAULT '2y'              NOT NULL,
+	socket_timeout           varchar(32)     DEFAULT '3s'              NOT NULL,
+	connect_timeout          varchar(32)     DEFAULT '3s'              NOT NULL,
+	media_type_test_timeout  varchar(32)     DEFAULT '65s'             NOT NULL,
+	script_timeout           varchar(32)     DEFAULT '60s'             NOT NULL,
+	item_test_timeout        varchar(32)     DEFAULT '60s'             NOT NULL,
+	session_key              varchar(32)     DEFAULT ''                NOT NULL,
+	url                      varchar(2048)   DEFAULT ''                NOT NULL,
+	report_test_timeout      varchar(32)     DEFAULT '60s'             NOT NULL,
+	dbversion_status         text            DEFAULT ''                NOT NULL,
+	hk_events_service        varchar(32)     DEFAULT '1d'              NOT NULL,
+	passwd_min_length        integer         DEFAULT '8'               NOT NULL,
+	passwd_check_rules       integer         DEFAULT '8'               NOT NULL,
+	auditlog_enabled         integer         DEFAULT '1'               NOT NULL,
+	ha_failover_delay        varchar(32)     DEFAULT '1m'              NOT NULL,
+	geomaps_tile_provider    varchar(255)    DEFAULT ''                NOT NULL,
+	geomaps_tile_url         varchar(2048)   DEFAULT ''                NOT NULL,
+	geomaps_max_zoom         integer         DEFAULT '0'               NOT NULL,
+	geomaps_attribution      varchar(1024)   DEFAULT ''                NOT NULL,
+	vault_provider           integer         DEFAULT '0'               NOT NULL,
+	ldap_userdirectoryid     bigint          DEFAULT NULL              NULL,
+	server_status            text            DEFAULT ''                NOT NULL,
+	jit_provision_interval   varchar(32)     DEFAULT '1h'              NOT NULL,
+	saml_jit_status          integer         DEFAULT '0'               NOT NULL,
+	ldap_jit_status          integer         DEFAULT '0'               NOT NULL,
+	disabled_usrgrpid        bigint          DEFAULT NULL              NULL,
+	timeout_zabbix_agent     varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_simple_check     varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_snmp_agent       varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_external_check   varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_db_monitor       varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_http_agent       varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_ssh_agent        varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_telnet_agent     varchar(255)    DEFAULT '3s'              NOT NULL,
+	timeout_script           varchar(255)    DEFAULT '3s'              NOT NULL,
+	auditlog_mode            integer         DEFAULT '1'               NOT NULL,
+	mfa_status               integer         DEFAULT '0'               NOT NULL,
+	mfaid                    bigint                                    NULL,
+	software_update_checkid  varchar(32)     DEFAULT ''                NOT NULL,
+	software_update_check_data text            DEFAULT ''                NOT NULL,
+	timeout_browser          varchar(255)    DEFAULT '60s'             NOT NULL,
+	PRIMARY KEY (configid)
+);
+CREATE INDEX config_1 ON config (alert_usrgrpid);
+CREATE INDEX config_2 ON config (discovery_groupid);
+CREATE INDEX config_3 ON config (ldap_userdirectoryid);
+CREATE INDEX config_4 ON config (disabled_usrgrpid);
+CREATE INDEX config_5 ON config (mfaid);
 CREATE TABLE triggers (
 	triggerid                bigint                                    NOT NULL,
 	expression               varchar(2048)   DEFAULT ''                NOT NULL,
@@ -715,18 +825,6 @@ CREATE TABLE hostmacro (
 	PRIMARY KEY (hostmacroid)
 );
 CREATE UNIQUE INDEX hostmacro_1 ON hostmacro (hostid,macro);
-CREATE TABLE hostmacro_config (
-	hostmacroid              bigint                                    NOT NULL,
-	type                     integer         DEFAULT '0'               NOT NULL,
-	priority                 integer         DEFAULT '0'               NOT NULL,
-	section_name             varchar(255)    DEFAULT ''                NOT NULL,
-	label                    varchar(255)    DEFAULT ''                NOT NULL,
-	description              text            DEFAULT ''                NOT NULL,
-	required                 integer         DEFAULT '0'               NOT NULL,
-	regex                    varchar(255)    DEFAULT ''                NOT NULL,
-	options                  text            DEFAULT ''                NOT NULL,
-	PRIMARY KEY (hostmacroid)
-);
 CREATE TABLE hosts_groups (
 	hostgroupid              bigint                                    NOT NULL,
 	hostid                   bigint                                    NOT NULL,
@@ -858,9 +956,6 @@ CREATE TABLE sysmaps (
 	userid                   bigint                                    NOT NULL,
 	private                  integer         DEFAULT '1'               NOT NULL,
 	show_suppressed          integer         DEFAULT '0'               NOT NULL,
-	background_scale         integer         DEFAULT '1'               NOT NULL,
-	show_element_label       integer         DEFAULT '1'               NOT NULL,
-	show_link_label          integer         DEFAULT '1'               NOT NULL,
 	PRIMARY KEY (sysmapid)
 );
 CREATE UNIQUE INDEX sysmaps_1 ON sysmaps (name);
@@ -887,8 +982,6 @@ CREATE TABLE sysmaps_elements (
 	viewtype                 integer         DEFAULT '0'               NOT NULL,
 	use_iconmap              integer         DEFAULT '1'               NOT NULL,
 	evaltype                 integer         DEFAULT '0'               NOT NULL,
-	show_label               integer         DEFAULT '-1'              NOT NULL,
-	zindex                   integer         DEFAULT '0'               NOT NULL,
 	PRIMARY KEY (selementid)
 );
 CREATE INDEX sysmaps_elements_1 ON sysmaps_elements (sysmapid);
@@ -904,15 +997,11 @@ CREATE TABLE sysmaps_links (
 	drawtype                 integer         DEFAULT '0'               NOT NULL,
 	color                    varchar(6)      DEFAULT '000000'          NOT NULL,
 	label                    varchar(2048)   DEFAULT ''                NOT NULL,
-	show_label               integer         DEFAULT '-1'              NOT NULL,
-	indicator_type           integer         DEFAULT '0'               NOT NULL,
-	itemid                   bigint                                    NULL,
 	PRIMARY KEY (linkid)
 );
 CREATE INDEX sysmaps_links_1 ON sysmaps_links (sysmapid);
 CREATE INDEX sysmaps_links_2 ON sysmaps_links (selementid1);
 CREATE INDEX sysmaps_links_3 ON sysmaps_links (selementid2);
-CREATE INDEX sysmaps_links_4 ON sysmaps_links (itemid);
 CREATE TABLE sysmaps_link_triggers (
 	linktriggerid            bigint                                    NOT NULL,
 	linkid                   bigint                                    NOT NULL,
@@ -923,18 +1012,6 @@ CREATE TABLE sysmaps_link_triggers (
 );
 CREATE UNIQUE INDEX sysmaps_link_triggers_1 ON sysmaps_link_triggers (linkid,triggerid);
 CREATE INDEX sysmaps_link_triggers_2 ON sysmaps_link_triggers (triggerid);
-CREATE TABLE sysmap_link_threshold (
-	linkthresholdid          bigint                                    NOT NULL,
-	linkid                   bigint                                    NOT NULL,
-	drawtype                 integer         DEFAULT '0'               NOT NULL,
-	color                    varchar(6)      DEFAULT '000000'          NOT NULL,
-	type                     integer         DEFAULT '0'               NOT NULL,
-	threshold                varchar(255)    DEFAULT ''                NOT NULL,
-	pattern                  varchar(255)    DEFAULT ''                NOT NULL,
-	sortorder                integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (linkthresholdid)
-);
-CREATE INDEX sysmap_link_threshold_1 ON sysmap_link_threshold (linkid);
 CREATE TABLE sysmap_element_url (
 	sysmapelementurlid       bigint                                    NOT NULL,
 	selementid               bigint                                    NOT NULL,
@@ -1103,13 +1180,6 @@ CREATE TABLE history_bin (
 	value                    bytea           DEFAULT ''                NOT NULL,
 	PRIMARY KEY (itemid,clock,ns)
 );
-CREATE TABLE history_json (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	value                    jsonb                                     NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
 CREATE TABLE proxy_history (
 	id                       bigint                                    NOT NULL,
 	itemid                   bigint                                    NOT NULL,
@@ -1127,6 +1197,7 @@ CREATE TABLE proxy_history (
 	write_clock              integer         DEFAULT '0'               NOT NULL,
 	PRIMARY KEY (id)
 );
+CREATE INDEX proxy_history_1 ON proxy_history (clock);
 CREATE INDEX proxy_history_2 ON proxy_history (write_clock);
 CREATE TABLE proxy_dhistory (
 	id                       bigint                                    NOT NULL,
@@ -1403,23 +1474,21 @@ CREATE UNIQUE INDEX images_1 ON images (name);
 CREATE TABLE item_discovery (
 	itemdiscoveryid          bigint                                    NOT NULL,
 	itemid                   bigint                                    NOT NULL,
-	parent_itemid            bigint                                    NULL,
+	parent_itemid            bigint                                    NOT NULL,
 	key_                     varchar(2048)   DEFAULT ''                NOT NULL,
 	lastcheck                integer         DEFAULT '0'               NOT NULL,
 	ts_delete                integer         DEFAULT '0'               NOT NULL,
 	status                   integer         DEFAULT '0'               NOT NULL,
 	disable_source           integer         DEFAULT '0'               NOT NULL,
 	ts_disable               integer         DEFAULT '0'               NOT NULL,
-	lldruleid                bigint                                    NULL,
 	PRIMARY KEY (itemdiscoveryid)
 );
 CREATE UNIQUE INDEX item_discovery_1 ON item_discovery (itemid,parent_itemid);
 CREATE INDEX item_discovery_2 ON item_discovery (parent_itemid);
-CREATE INDEX item_discovery_3 ON item_discovery (lldruleid);
 CREATE TABLE host_discovery (
 	hostid                   bigint                                    NOT NULL,
 	parent_hostid            bigint                                    NULL,
-	lldruleid                bigint                                    NULL,
+	parent_itemid            bigint                                    NULL,
 	host                     varchar(128)    DEFAULT ''                NOT NULL,
 	lastcheck                integer         DEFAULT '0'               NOT NULL,
 	ts_delete                integer         DEFAULT '0'               NOT NULL,
@@ -1429,7 +1498,7 @@ CREATE TABLE host_discovery (
 	PRIMARY KEY (hostid)
 );
 CREATE INDEX host_discovery_1 ON host_discovery (parent_hostid);
-CREATE INDEX host_discovery_2 ON host_discovery (lldruleid);
+CREATE INDEX host_discovery_2 ON host_discovery (parent_itemid);
 CREATE TABLE interface_discovery (
 	interfaceid              bigint                                    NOT NULL,
 	parent_interfaceid       bigint                                    NOT NULL,
@@ -1503,7 +1572,6 @@ CREATE TABLE trigger_tag (
 	triggerid                bigint                                    NOT NULL,
 	tag                      varchar(255)    DEFAULT ''                NOT NULL,
 	value                    varchar(255)    DEFAULT ''                NOT NULL,
-	automatic                integer         DEFAULT '0'               NOT NULL,
 	PRIMARY KEY (triggertagid)
 );
 CREATE INDEX trigger_tag_1 ON trigger_tag (triggerid);
@@ -1793,7 +1861,7 @@ CREATE TABLE widget_field (
 	type                     integer         DEFAULT '0'               NOT NULL,
 	name                     varchar(255)    DEFAULT ''                NOT NULL,
 	value_int                integer         DEFAULT '0'               NOT NULL,
-	value_str                text            DEFAULT ''                NOT NULL,
+	value_str                varchar(2048)   DEFAULT ''                NOT NULL,
 	value_groupid            bigint                                    NULL,
 	value_hostid             bigint                                    NULL,
 	value_itemid             bigint                                    NULL,
@@ -1860,12 +1928,6 @@ CREATE TABLE host_tag (
 	PRIMARY KEY (hosttagid)
 );
 CREATE INDEX host_tag_1 ON host_tag (hostid);
-CREATE TABLE host_template_cache (
-	hostid                   bigint                                    NOT NULL,
-	link_hostid              bigint                                    NOT NULL,
-	PRIMARY KEY (hostid,link_hostid)
-);
-CREATE INDEX host_template_cache_1 ON host_template_cache (link_hostid);
 CREATE TABLE config_autoreg_tls (
 	autoreg_tlsid            bigint                                    NOT NULL,
 	tls_psk_identity         varchar(128)    DEFAULT ''                NOT NULL,
@@ -2031,12 +2093,6 @@ CREATE TABLE item_tag (
 	PRIMARY KEY (itemtagid)
 );
 CREATE INDEX item_tag_1 ON item_tag (itemid);
-CREATE TABLE item_template_cache (
-	itemid                   bigint                                    NOT NULL,
-	link_hostid              bigint                                    NOT NULL,
-	PRIMARY KEY (itemid,link_hostid)
-);
-CREATE INDEX item_template_cache_1 ON item_template_cache (link_hostid);
 CREATE TABLE httptest_tag (
 	httptesttagid            bigint                                    NOT NULL,
 	httptestid               bigint                                    NOT NULL,
@@ -2243,9 +2299,6 @@ CREATE TABLE userdirectory_saml (
 	user_username            varchar(255)    DEFAULT ''                NOT NULL,
 	user_lastname            varchar(255)    DEFAULT ''                NOT NULL,
 	scim_status              integer         DEFAULT '0'               NOT NULL,
-	idp_certificate          text            DEFAULT ''                NOT NULL,
-	sp_certificate           text            DEFAULT ''                NOT NULL,
-	sp_private_key           text            DEFAULT ''                NOT NULL,
 	PRIMARY KEY (userdirectoryid)
 );
 CREATE TABLE userdirectory_media (
@@ -2430,36 +2483,13 @@ CREATE TABLE mfa_totp_secret (
 );
 CREATE INDEX mfa_totp_secret_1 ON mfa_totp_secret (mfaid);
 CREATE INDEX mfa_totp_secret_2 ON mfa_totp_secret (userid);
-CREATE TABLE settings (
-	name                     varchar(255)                              NOT NULL,
-	type                     integer                                   NOT NULL,
-	value_str                text            DEFAULT ''                NOT NULL,
-	value_int                integer         DEFAULT '0'               NOT NULL,
-	value_usrgrpid           bigint                                    NULL,
-	value_hostgroupid        bigint                                    NULL,
-	value_userdirectoryid    bigint                                    NULL,
-	value_mfaid              bigint                                    NULL,
-	PRIMARY KEY (name)
-);
-CREATE INDEX settings_2 ON settings (value_usrgrpid);
-CREATE INDEX settings_3 ON settings (value_hostgroupid);
-CREATE INDEX settings_4 ON settings (value_userdirectoryid);
-CREATE INDEX settings_5 ON settings (value_mfaid);
-CREATE TABLE lld_macro_export (
-	lld_macro_exportid       bigint                                    NOT NULL,
-	itemid                   bigint                                    NOT NULL,
-	lld_macro                varchar(255)    DEFAULT ''                NOT NULL,
-	value                    text            DEFAULT ''                NOT NULL,
-	PRIMARY KEY (lld_macro_exportid)
-);
-CREATE INDEX lld_macro_export_1 ON lld_macro_export (itemid);
 CREATE TABLE dbversion (
 	dbversionid              bigint                                    NOT NULL,
 	mandatory                integer         DEFAULT '0'               NOT NULL,
 	optional                 integer         DEFAULT '0'               NOT NULL,
 	PRIMARY KEY (dbversionid)
 );
-INSERT INTO dbversion VALUES ('1','7050033','7050033');
+INSERT INTO dbversion VALUES ('1','7000000','7000029');
 create or replace function changelog_hosts_insert() returns trigger as $$
 begin
 insert into changelog (object,objectid,operation,clock)
@@ -3134,7 +3164,6 @@ ALTER TABLE ONLY httpstepitem ADD CONSTRAINT c_httpstepitem_1 FOREIGN KEY (https
 ALTER TABLE ONLY httpstepitem ADD CONSTRAINT c_httpstepitem_2 FOREIGN KEY (itemid) REFERENCES items (itemid);
 ALTER TABLE ONLY httptestitem ADD CONSTRAINT c_httptestitem_1 FOREIGN KEY (httptestid) REFERENCES httptest (httptestid);
 ALTER TABLE ONLY httptestitem ADD CONSTRAINT c_httptestitem_2 FOREIGN KEY (itemid) REFERENCES items (itemid);
-ALTER TABLE ONLY media_type_oauth ADD CONSTRAINT c_media_type_oauth_1 FOREIGN KEY (mediatypeid) REFERENCES media_type (mediatypeid) ON DELETE CASCADE;
 ALTER TABLE ONLY media_type_param ADD CONSTRAINT c_media_type_param_1 FOREIGN KEY (mediatypeid) REFERENCES media_type (mediatypeid) ON DELETE CASCADE;
 ALTER TABLE ONLY media_type_message ADD CONSTRAINT c_media_type_message_1 FOREIGN KEY (mediatypeid) REFERENCES media_type (mediatypeid) ON DELETE CASCADE;
 ALTER TABLE ONLY usrgrp ADD CONSTRAINT c_usrgrp_2 FOREIGN KEY (userdirectoryid) REFERENCES userdirectory (userdirectoryid);
@@ -3168,6 +3197,11 @@ ALTER TABLE ONLY optemplate ADD CONSTRAINT c_optemplate_1 FOREIGN KEY (operation
 ALTER TABLE ONLY optemplate ADD CONSTRAINT c_optemplate_2 FOREIGN KEY (templateid) REFERENCES hosts (hostid);
 ALTER TABLE ONLY opconditions ADD CONSTRAINT c_opconditions_1 FOREIGN KEY (operationid) REFERENCES operations (operationid) ON DELETE CASCADE;
 ALTER TABLE ONLY conditions ADD CONSTRAINT c_conditions_1 FOREIGN KEY (actionid) REFERENCES actions (actionid) ON DELETE CASCADE;
+ALTER TABLE ONLY config ADD CONSTRAINT c_config_1 FOREIGN KEY (alert_usrgrpid) REFERENCES usrgrp (usrgrpid);
+ALTER TABLE ONLY config ADD CONSTRAINT c_config_2 FOREIGN KEY (discovery_groupid) REFERENCES hstgrp (groupid);
+ALTER TABLE ONLY config ADD CONSTRAINT c_config_3 FOREIGN KEY (ldap_userdirectoryid) REFERENCES userdirectory (userdirectoryid);
+ALTER TABLE ONLY config ADD CONSTRAINT c_config_4 FOREIGN KEY (disabled_usrgrpid) REFERENCES usrgrp (usrgrpid);
+ALTER TABLE ONLY config ADD CONSTRAINT c_config_5 FOREIGN KEY (mfaid) REFERENCES mfa (mfaid);
 ALTER TABLE ONLY triggers ADD CONSTRAINT c_triggers_1 FOREIGN KEY (templateid) REFERENCES triggers (triggerid);
 ALTER TABLE ONLY trigger_depends ADD CONSTRAINT c_trigger_depends_1 FOREIGN KEY (triggerid_down) REFERENCES triggers (triggerid) ON DELETE CASCADE;
 ALTER TABLE ONLY trigger_depends ADD CONSTRAINT c_trigger_depends_2 FOREIGN KEY (triggerid_up) REFERENCES triggers (triggerid) ON DELETE CASCADE;
@@ -3179,7 +3213,6 @@ ALTER TABLE ONLY graphs ADD CONSTRAINT c_graphs_3 FOREIGN KEY (ymax_itemid) REFE
 ALTER TABLE ONLY graphs_items ADD CONSTRAINT c_graphs_items_1 FOREIGN KEY (graphid) REFERENCES graphs (graphid) ON DELETE CASCADE;
 ALTER TABLE ONLY graphs_items ADD CONSTRAINT c_graphs_items_2 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;
 ALTER TABLE ONLY hostmacro ADD CONSTRAINT c_hostmacro_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
-ALTER TABLE ONLY hostmacro_config ADD CONSTRAINT c_hostmacro_config_1 FOREIGN KEY (hostmacroid) REFERENCES hostmacro (hostmacroid) ON DELETE CASCADE;
 ALTER TABLE ONLY hosts_groups ADD CONSTRAINT c_hosts_groups_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
 ALTER TABLE ONLY hosts_groups ADD CONSTRAINT c_hosts_groups_2 FOREIGN KEY (groupid) REFERENCES hstgrp (groupid) ON DELETE CASCADE;
 ALTER TABLE ONLY hosts_templates ADD CONSTRAINT c_hosts_templates_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
@@ -3208,10 +3241,8 @@ ALTER TABLE ONLY sysmaps_elements ADD CONSTRAINT c_sysmaps_elements_5 FOREIGN KE
 ALTER TABLE ONLY sysmaps_links ADD CONSTRAINT c_sysmaps_links_1 FOREIGN KEY (sysmapid) REFERENCES sysmaps (sysmapid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmaps_links ADD CONSTRAINT c_sysmaps_links_2 FOREIGN KEY (selementid1) REFERENCES sysmaps_elements (selementid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmaps_links ADD CONSTRAINT c_sysmaps_links_3 FOREIGN KEY (selementid2) REFERENCES sysmaps_elements (selementid) ON DELETE CASCADE;
-ALTER TABLE ONLY sysmaps_links ADD CONSTRAINT c_sysmaps_links_4 FOREIGN KEY (itemid) REFERENCES items (itemid);
 ALTER TABLE ONLY sysmaps_link_triggers ADD CONSTRAINT c_sysmaps_link_triggers_1 FOREIGN KEY (linkid) REFERENCES sysmaps_links (linkid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmaps_link_triggers ADD CONSTRAINT c_sysmaps_link_triggers_2 FOREIGN KEY (triggerid) REFERENCES triggers (triggerid) ON DELETE CASCADE;
-ALTER TABLE ONLY sysmap_link_threshold ADD CONSTRAINT c_sysmap_link_threshold_1 FOREIGN KEY (linkid) REFERENCES sysmaps_links (linkid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmap_element_url ADD CONSTRAINT c_sysmap_element_url_1 FOREIGN KEY (selementid) REFERENCES sysmaps_elements (selementid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmap_url ADD CONSTRAINT c_sysmap_url_1 FOREIGN KEY (sysmapid) REFERENCES sysmaps (sysmapid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmap_user ADD CONSTRAINT c_sysmap_user_1 FOREIGN KEY (sysmapid) REFERENCES sysmaps (sysmapid) ON DELETE CASCADE;
@@ -3245,10 +3276,9 @@ ALTER TABLE ONLY graph_discovery ADD CONSTRAINT c_graph_discovery_2 FOREIGN KEY
 ALTER TABLE ONLY host_inventory ADD CONSTRAINT c_host_inventory_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
 ALTER TABLE ONLY item_discovery ADD CONSTRAINT c_item_discovery_1 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;
 ALTER TABLE ONLY item_discovery ADD CONSTRAINT c_item_discovery_2 FOREIGN KEY (parent_itemid) REFERENCES items (itemid) ON DELETE CASCADE;
-ALTER TABLE ONLY item_discovery ADD CONSTRAINT c_item_discovery_3 FOREIGN KEY (lldruleid) REFERENCES items (itemid);
 ALTER TABLE ONLY host_discovery ADD CONSTRAINT c_host_discovery_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
 ALTER TABLE ONLY host_discovery ADD CONSTRAINT c_host_discovery_2 FOREIGN KEY (parent_hostid) REFERENCES hosts (hostid);
-ALTER TABLE ONLY host_discovery ADD CONSTRAINT c_host_discovery_3 FOREIGN KEY (lldruleid) REFERENCES items (itemid);
+ALTER TABLE ONLY host_discovery ADD CONSTRAINT c_host_discovery_3 FOREIGN KEY (parent_itemid) REFERENCES items (itemid);
 ALTER TABLE ONLY interface_discovery ADD CONSTRAINT c_interface_discovery_1 FOREIGN KEY (interfaceid) REFERENCES interface (interfaceid) ON DELETE CASCADE;
 ALTER TABLE ONLY interface_discovery ADD CONSTRAINT c_interface_discovery_2 FOREIGN KEY (parent_interfaceid) REFERENCES interface (interfaceid) ON DELETE CASCADE;
 ALTER TABLE ONLY profiles ADD CONSTRAINT c_profiles_1 FOREIGN KEY (userid) REFERENCES users (userid) ON DELETE CASCADE;
@@ -3262,13 +3292,13 @@ ALTER TABLE ONLY opinventory ADD CONSTRAINT c_opinventory_1 FOREIGN KEY (operati
 ALTER TABLE ONLY trigger_tag ADD CONSTRAINT c_trigger_tag_1 FOREIGN KEY (triggerid) REFERENCES triggers (triggerid);
 ALTER TABLE ONLY event_tag ADD CONSTRAINT c_event_tag_1 FOREIGN KEY (eventid) REFERENCES events (eventid) ON DELETE CASCADE;
 ALTER TABLE ONLY problem ADD CONSTRAINT c_problem_1 FOREIGN KEY (eventid) REFERENCES events (eventid) ON DELETE CASCADE;
-ALTER TABLE ONLY problem ADD CONSTRAINT c_problem_2 FOREIGN KEY (r_eventid) REFERENCES events (eventid);
+ALTER TABLE ONLY problem ADD CONSTRAINT c_problem_2 FOREIGN KEY (r_eventid) REFERENCES events (eventid) ON DELETE CASCADE;
 ALTER TABLE ONLY problem ADD CONSTRAINT c_problem_3 FOREIGN KEY (cause_eventid) REFERENCES events (eventid);
 ALTER TABLE ONLY problem_tag ADD CONSTRAINT c_problem_tag_1 FOREIGN KEY (eventid) REFERENCES problem (eventid) ON DELETE CASCADE;
 ALTER TABLE ONLY tag_filter ADD CONSTRAINT c_tag_filter_1 FOREIGN KEY (usrgrpid) REFERENCES usrgrp (usrgrpid) ON DELETE CASCADE;
 ALTER TABLE ONLY tag_filter ADD CONSTRAINT c_tag_filter_2 FOREIGN KEY (groupid) REFERENCES hstgrp (groupid) ON DELETE CASCADE;
 ALTER TABLE ONLY event_recovery ADD CONSTRAINT c_event_recovery_1 FOREIGN KEY (eventid) REFERENCES events (eventid) ON DELETE CASCADE;
-ALTER TABLE ONLY event_recovery ADD CONSTRAINT c_event_recovery_2 FOREIGN KEY (r_eventid) REFERENCES events (eventid);
+ALTER TABLE ONLY event_recovery ADD CONSTRAINT c_event_recovery_2 FOREIGN KEY (r_eventid) REFERENCES events (eventid) ON DELETE CASCADE;
 ALTER TABLE ONLY event_recovery ADD CONSTRAINT c_event_recovery_3 FOREIGN KEY (c_eventid) REFERENCES events (eventid) ON DELETE CASCADE;
 ALTER TABLE ONLY corr_condition ADD CONSTRAINT c_corr_condition_1 FOREIGN KEY (correlationid) REFERENCES correlation (correlationid) ON DELETE CASCADE;
 ALTER TABLE ONLY corr_condition_tag ADD CONSTRAINT c_corr_condition_tag_1 FOREIGN KEY (corr_conditionid) REFERENCES corr_condition (corr_conditionid) ON DELETE CASCADE;
@@ -3316,8 +3346,6 @@ ALTER TABLE ONLY event_suppress ADD CONSTRAINT c_event_suppress_3 FOREIGN KEY (u
 ALTER TABLE ONLY maintenance_tag ADD CONSTRAINT c_maintenance_tag_1 FOREIGN KEY (maintenanceid) REFERENCES maintenances (maintenanceid) ON DELETE CASCADE;
 ALTER TABLE ONLY lld_macro_path ADD CONSTRAINT c_lld_macro_path_1 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;
 ALTER TABLE ONLY host_tag ADD CONSTRAINT c_host_tag_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid);
-ALTER TABLE ONLY host_template_cache ADD CONSTRAINT c_host_template_cache_1 FOREIGN KEY (hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
-ALTER TABLE ONLY host_template_cache ADD CONSTRAINT c_host_template_cache_2 FOREIGN KEY (link_hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
 ALTER TABLE ONLY interface_snmp ADD CONSTRAINT c_interface_snmp_1 FOREIGN KEY (interfaceid) REFERENCES interface (interfaceid) ON DELETE CASCADE;
 ALTER TABLE ONLY lld_override ADD CONSTRAINT c_lld_override_1 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;
 ALTER TABLE ONLY lld_override_condition ADD CONSTRAINT c_lld_override_condition_1 FOREIGN KEY (lld_overrideid) REFERENCES lld_override (lld_overrideid) ON DELETE CASCADE;
@@ -3339,8 +3367,6 @@ ALTER TABLE ONLY role_rule ADD CONSTRAINT c_role_rule_3 FOREIGN KEY (value_servi
 ALTER TABLE ONLY token ADD CONSTRAINT c_token_1 FOREIGN KEY (userid) REFERENCES users (userid) ON DELETE CASCADE;
 ALTER TABLE ONLY token ADD CONSTRAINT c_token_2 FOREIGN KEY (creator_userid) REFERENCES users (userid);
 ALTER TABLE ONLY item_tag ADD CONSTRAINT c_item_tag_1 FOREIGN KEY (itemid) REFERENCES items (itemid);
-ALTER TABLE ONLY item_template_cache ADD CONSTRAINT c_item_template_cache_1 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;
-ALTER TABLE ONLY item_template_cache ADD CONSTRAINT c_item_template_cache_2 FOREIGN KEY (link_hostid) REFERENCES hosts (hostid) ON DELETE CASCADE;
 ALTER TABLE ONLY httptest_tag ADD CONSTRAINT c_httptest_tag_1 FOREIGN KEY (httptestid) REFERENCES httptest (httptestid) ON DELETE CASCADE;
 ALTER TABLE ONLY sysmaps_element_tag ADD CONSTRAINT c_sysmaps_element_tag_1 FOREIGN KEY (selementid) REFERENCES sysmaps_elements (selementid) ON DELETE CASCADE;
 ALTER TABLE ONLY report ADD CONSTRAINT c_report_1 FOREIGN KEY (userid) REFERENCES users (userid) ON DELETE CASCADE;
@@ -3379,8 +3405,3 @@ ALTER TABLE ONLY host_proxy ADD CONSTRAINT c_host_proxy_1 FOREIGN KEY (hostid) R
 ALTER TABLE ONLY host_proxy ADD CONSTRAINT c_host_proxy_2 FOREIGN KEY (proxyid) REFERENCES proxy (proxyid);
 ALTER TABLE ONLY mfa_totp_secret ADD CONSTRAINT c_mfa_totp_secret_1 FOREIGN KEY (mfaid) REFERENCES mfa (mfaid) ON DELETE CASCADE;
 ALTER TABLE ONLY mfa_totp_secret ADD CONSTRAINT c_mfa_totp_secret_2 FOREIGN KEY (userid) REFERENCES users (userid) ON DELETE CASCADE;
-ALTER TABLE ONLY settings ADD CONSTRAINT c_settings_2 FOREIGN KEY (value_usrgrpid) REFERENCES usrgrp (usrgrpid);
-ALTER TABLE ONLY settings ADD CONSTRAINT c_settings_3 FOREIGN KEY (value_hostgroupid) REFERENCES hstgrp (groupid);
-ALTER TABLE ONLY settings ADD CONSTRAINT c_settings_4 FOREIGN KEY (value_userdirectoryid) REFERENCES userdirectory (userdirectoryid);
-ALTER TABLE ONLY settings ADD CONSTRAINT c_settings_5 FOREIGN KEY (value_mfaid) REFERENCES mfa (mfaid);
-ALTER TABLE ONLY lld_macro_export ADD CONSTRAINT c_lld_macro_export_1 FOREIGN KEY (itemid) REFERENCES items (itemid) ON DELETE CASCADE;

postgresql/template/README.md

@@ -1,32 +0,0 @@
-# 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

@@ -1,9 +0,0 @@
-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

@@ -1,137 +0,0 @@
-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}")].actual_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: '<replace_me>'
-          description: 'Session name or URI of the PostgreSQL instance'
-        - macro: '{$PG.DBNAME}'
-          value: zabbix

postgresql/tests/ARCHITECTURE.md

@@ -1,60 +0,0 @@
-# Zabbix PostgreSQL Partitioning Architecture
-
-This document provides a brief technical overview of the components, logic, and dynamic querying mechanisms that power the PostgreSQL partitioning solution for Zabbix.
-
-## Schema-Agnostic Design
-
-A core architectural principle of this solution is its **schema-agnostic design**. It does not assume that your Zabbix database is installed in the default `public` schema.
-
-When the procedures need to create, drop, or manipulate a partitioned table (e.g., `history`), they do not hardcode the schema. Instead, they dynamically query PostgreSQL's internal system catalogs (`pg_class` and `pg_namespace`) to locate exactly which schema the target table belongs to:
-
-```sql
-SELECT n.nspname INTO v_schema
-FROM pg_class c
-JOIN pg_namespace n ON n.oid = c.relnamespace
-WHERE c.relname = v_table;
-```
-
-This ensures that the partitioning scripts will work flawlessly, even in custom Zabbix deployments where tables are housed in alternative schemas. 
-
-## File Structure & Queries
-
-The solution is divided into a series of SQL scripts that must be executed sequentially to set up the environment.
-
-### 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_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.
-    *   `create_partition()`: Executes the DDL `CREATE TABLE ... PARTITION OF ... FOR VALUES FROM (x) TO (y)` to generate a new time-bound chunk.
-    *   `drop_old_partitions()`: Iterates over existing child partitions (using `pg_inherits`) and calculates their age based on their suffix. Drops those older than the defined `keep_history` policy.
-    *   `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.
-    *   `housekeeper_insert_trigger()`: A trigger function that intercepts `INSERT` queries into the Zabbix `housekeeper` table, silently discarding tasks for tables managed by the partitioning system (based on `partitions.config`).
-
-### 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.
-    *   It attaches the `housekeeper_filter` trigger to the `housekeeper` table to prevent Zabbix from inserting garbage tasks for the partitioned tables.
-
-### 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`. 
-    *   This view aggregates the total size of each partitioned family and calculates how many "future partitions" exist as a safety buffer.
-
-## Automated Scheduling (`pg_cron`)
-
-While `systemd` timers or standard `cron` can be used to trigger the maintenance, the recommended approach (especially for AWS RDS/Aurora deployments) is using the `pg_cron` database extension. 
-
-`pg_cron` allows you to schedule the `CALL partitions.run_maintenance();` procedure directly within PostgreSQL, ensuring the database autonomously manages its own housekeeping without requiring external OS-level access or triggers.

postgresql/tests/QUICKSTART.md

@@ -1,90 +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 [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/.gitignore

@@ -1 +0,0 @@
-init_scripts/

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

@@ -1,84 +0,0 @@
--- ============================================================================
--- 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;
-    v_schema text;
-BEGIN
-    FOR v_row IN SELECT * FROM partitions.config LOOP
-        v_table := v_row.table_name;
-        v_old_table := v_table || '_old';
-        
-        -- Determine schema
-        SELECT n.nspname INTO v_schema
-        FROM pg_class c
-        JOIN pg_namespace n ON n.oid = c.relnamespace
-        WHERE c.relname = v_table AND pg_table_is_visible(c.oid);
-
-        
-        IF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'r' AND pg_table_is_visible(oid)) 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 (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;
-            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 %I.%I SELECT * FROM %I.%I', v_schema, v_table, v_schema, v_old_table);
-            
-        ELSIF EXISTS (SELECT 1 FROM pg_class WHERE relname = v_table AND relkind = 'p' AND pg_table_is_visible(oid)) THEN
-             RAISE NOTICE 'Table % is already partitioned. Skipping conversion.', v_table;
-             -- Just run maintenance for this specific table to ensure partitions exist
-             CALL partitions.maintain_table(v_table, v_row.period, v_row.keep_history, v_row.future_partitions);
-        ELSE
-             RAISE WARNING 'Table % not found!', v_table;
-        END IF;
-    END LOOP;
-
-    -- Attach trigger to housekeeper table to silently discard tasks for partitioned tables.
-    -- Dynamically determine the schema of the housekeeper table to support custom schemas.
-    SELECT n.nspname INTO v_schema
-    FROM pg_class c
-    JOIN pg_namespace n ON n.oid = c.relnamespace
-    WHERE c.relname = 'housekeeper' AND pg_table_is_visible(c.oid);
-
-    IF v_schema IS NOT NULL THEN
-        EXECUTE format('DROP TRIGGER IF EXISTS housekeeper_filter ON %I.housekeeper', v_schema);
-        EXECUTE format('CREATE TRIGGER housekeeper_filter BEFORE INSERT ON %I.housekeeper FOR EACH ROW EXECUTE FUNCTION partitions.housekeeper_insert_trigger()', v_schema);
-        RAISE NOTICE 'Housekeeper intercept trigger installed on %.housekeeper', v_schema;
-    ELSE
-        RAISE WARNING 'housekeeper table not found — trigger NOT installed!';
-    END IF;
-END $$;
-
--- ==========================================================================
--- IMPORTANT: If the Zabbix Server connects with a non-superuser (e.g., 'zabbix'),
--- that user MUST have access to the partitions schema for the housekeeper trigger
--- to work. Without these GRANTs, every INSERT into housekeeper will FAIL.
--- Uncomment and adjust the username below:
--- ==========================================================================
--- GRANT USAGE ON SCHEMA partitions TO zabbix;
--- GRANT SELECT ON partitions.config TO zabbix;
-

postgresql/tests/docker/run_test_env.sh

@@ -1,164 +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> [--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

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

postgresql/tests/sql-scripts-80/option-patches/history_upgrade_prepare.sql

@@ -1,49 +0,0 @@
-ALTER TABLE history RENAME TO history_old;
-CREATE TABLE history (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	value                    DOUBLE PRECISION DEFAULT '0.0000'          NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
-
-ALTER TABLE history_uint RENAME TO history_uint_old;
-CREATE TABLE history_uint (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	value                    numeric(20)     DEFAULT '0'               NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
-
-ALTER TABLE history_str RENAME TO history_str_old;
-CREATE TABLE history_str (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	value                    varchar(255)    DEFAULT ''                NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
-
-ALTER TABLE history_log RENAME TO history_log_old;
-CREATE TABLE history_log (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	timestamp                integer         DEFAULT '0'               NOT NULL,
-	source                   varchar(64)     DEFAULT ''                NOT NULL,
-	severity                 integer         DEFAULT '0'               NOT NULL,
-	value                    text            DEFAULT ''                NOT NULL,
-	logeventid               integer         DEFAULT '0'               NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
-
-ALTER TABLE history_text RENAME TO history_text_old;
-CREATE TABLE history_text (
-	itemid                   bigint                                    NOT NULL,
-	clock                    integer         DEFAULT '0'               NOT NULL,
-	value                    text            DEFAULT ''                NOT NULL,
-	ns                       integer         DEFAULT '0'               NOT NULL,
-	PRIMARY KEY (itemid,clock,ns)
-);
-