Merge branch 'dev/tmpfiles' into develop

Add archive ready and temp file items to template
- Add the initital item definitions to the template for archive ready files and temp files. - Fix the temp file query to be able to return both columns in all cases.
2025-12-03 01:45:50 -05:00 · 2025-12-02 01:43:24 -05:00 · 2025-12-02 01:05:16 -05:00 · 2025-11-29 02:42:04 -05:00 · 2025-11-29 00:35:05 -05:00 · 2025-11-29 00:34:17 -05:00
7 changed files with 185 additions and 32 deletions
--- a/29
+++ b/29
@@ -34,7 +34,6 @@ BUILD_DIR := build
 SUPPORTED := ubuntu-20.04 \
             ubuntu-22.04 \
             ubuntu-24.04 \
-	     debian-10 \
 	     debian-11 \
 	     debian-12 \
 	     debian-13 \
@@ -42,6 +41,7 @@ SUPPORTED := ubuntu-20.04 \
 	     rockylinux-9 \
 	     rockylinux-10 \
 	     oraclelinux-7 \
+	     amazonlinux-2 \
 	     amazonlinux-2023 \
 	     gentoo

@@ -219,18 +219,21 @@ ubuntu-%-install-test:
 	     bash -c 'apt-get update && apt-get install -y /output/$(PACKAGE_NAME)-$(DEB_VERSION)-ubuntu-$*.deb'

 # Run an OracleLinux install test (this is for EL7 since CentOS7 images no longer exist)
+oraclelinux-%-install-test: MGR=$(intcmp $*, 7, yum, yum, dnf)
 oraclelinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
-	     oraclelinux:7 \
-	     bash -c 'yum makecache && yum install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'
+	     oraclelinux:$* \
+	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm'

 # Run a Amazon Linux install test
+# Note: AL2 is too old for dnf
+amazonlinux-%-install-test: MGR=$(intcmp $*, 2, yum, yum, dnf)
 amazonlinux-%-install-test:
 	docker run --rm \
 	     -v ./$(BUILD_DIR):/output \
 	     amazonlinux:$* \
-	     bash -c 'dnf makecache && dnf install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'
+	     bash -c '$(MGR) makecache && $(MGR) install -y /output/$(PACKAGE_NAME)-$(RPM_VERSION).amzn$*.noarch.rpm'

 # Run a Gentoo install test
 gentoo-install-test:
@@ -295,15 +298,31 @@ actually-package-ubuntu-%:
 	dpkg-deb -Zgzip --build /output/ubuntu-$* "/output/$(PACKAGE_NAME)-$(DEB_VERSION)-ubuntu-$*.deb"

 # OracleLinux package creation
+# Note: This needs to work inside OEL7, so we can't use intcmp
+actually-package-oraclelinux-7:
+	mkdir -p /output/oraclelinux-7/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/oraclelinux-7/SPECS/$(PACKAGE_NAME).spec
+	rpmbuild --define '_topdir /output/oraclelinux-7' \
+	         --define 'version $(RPM_VERSION)' \
+	         -bb /output/oraclelinux-7/SPECS/$(PACKAGE_NAME).spec
+	cp /output/oraclelinux-7/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).el7.noarch.rpm /output/
 actually-package-oraclelinux-%:
 	mkdir -p /output/oraclelinux-$*/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
-	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
+	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME).spec > /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
 	rpmbuild --define '_topdir /output/oraclelinux-$*' \
 	         --define 'version $(RPM_VERSION)' \
 	         -bb /output/oraclelinux-$*/SPECS/$(PACKAGE_NAME).spec
 	cp /output/oraclelinux-$*/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).el$*.noarch.rpm /output/

 # Amazon Linux package creation
+# Note: This needs to work inside AL2, so we can't use intcmp
+actually-package-amazonlinux-2:
+	mkdir -p /output/amazonlinux-2/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
+	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME)-el7.spec > /output/amazonlinux-2/SPECS/$(PACKAGE_NAME).spec
+	rpmbuild --define '_topdir /output/amazonlinux-2' \
+	         --define 'version $(RPM_VERSION)' \
+	         -bb /output/amazonlinux-2/SPECS/$(PACKAGE_NAME).spec
+	cp /output/amazonlinux-2/RPMS/noarch/$(PACKAGE_NAME)-$(RPM_VERSION).amzn2.noarch.rpm /output/
 actually-package-amazonlinux-%:
 	mkdir -p /output/amazonlinux-$*/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
 	sed -e "s/@@VERSION@@/$(VERSION)/g" -e "s/@@RELEASE@@/$(RPM_RELEASE)/g" RPM/$(PACKAGE_NAME).spec > /output/amazonlinux-$*/SPECS/$(PACKAGE_NAME).spec
--- a/docker/Dockerfile-amazonlinux
+++ b/docker/Dockerfile-amazonlinux
@@ -8,10 +8,11 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE

-RUN dnf install -y \
+RUN if [ ${RELEASE} -le 2 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+    ${MGR} install -y \
    rpm-build \
    make \
-    && dnf clean all
+    && ${MGR} clean all

 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
    && chmod 755 /init.sh
--- a/docker/Dockerfile-oraclelinux
+++ b/docker/Dockerfile-oraclelinux
@@ -8,11 +8,12 @@ FROM ${DISTRO}:${RELEASE}
 ARG DISTRO
 ARG RELEASE

-RUN yum install -y \
+RUN if [ ${RELEASE} -le 7 ] ; then MGR=yum ; else MGR=dnf ; fi && \
+    ${MGR} install -y \
    rpm-build \
    make \
-    oracle-epel-release-el7 \
-    && yum clean all
+    oracle-epel-release-el${RELEASE} \
+    && ${MGR} clean all

 RUN echo -e "#!/bin/bash\nmake actually-package-${DISTRO}-${RELEASE}" > /init.sh \
    && chmod 755 /init.sh
--- a/sample-config/pgmon-metrics.yml
+++ b/sample-config/pgmon-metrics.yml
@@ -116,6 +116,63 @@ metrics:
        FROM pg_stat_io
        GROUP BY backend_type

+  temp_files:
+    type: row
+    query:
+      120000: >
+        SELECT count(*) AS count,
+               coalesce(sum(size), 0) AS size
+        FROM pg_ls_tmpdir()
+        WHERE name LIKE 'pgsql_tmp%%'
+      90500: >
+        SELECT count(*) AS count,
+               coalesce(sum((pg_stat_file(name)).size), 0) AS size
+        FROM pg_ls_dir('base/pgsql_tmp/', true, false) AS name
+        WHERE name LIKE 'pgsql_tmp%%'
+      0: >
+          SELECT count(*) AS count,
+                 coalesce(sum((pg_stat_file(files.name)).size), 0) AS size
+          FROM (
+            SELECT name
+            FROM pg_ls_dir('base') AS name
+            WHERE name = 'pgsql_tmp') AS dir
+          LEFT JOIN (
+            SELECT name
+            FROM pg_ls_dir('base/pgsql_tmp/') AS name
+            WHERE name LIKE 'pgsql_tmp%%') AS files
+          ON dir.name IS NOT NULL
+
+
+  ready_archive_files:
+    type: value
+    query:
+      120000: >
+        SELECT count(*) AS count
+        FROM pg_ls_archive_statusdir()
+        WHERE name LIKE '%%.ready'
+      100000: >
+        SELECT count(*) AS count
+        FROM pg_ls_dir('pg_wal/archive_status/', true, false) AS name
+        WHERE name LIKE '%%.ready'
+      90500: >
+        SELECT count(*) AS count
+        FROM pg_ls_dir('pg_xlog/archive_status/', true, false) AS name
+        WHERE name LIKE '%%.ready'
+      0: >
+        SELECT
+          CASE WHEN (
+            SELECT count(*)
+            FROM pg_ls_dir('pg_xlog/') AS f
+            WHERE f = 'archive_status') = 0
+          THEN (
+            SELECT 0 AS count
+          )
+          ELSE (
+            SELECT count(*) AS count
+            FROM pg_ls_dir('pg_xlog/archive_status/') AS name
+            WHERE name LIKE '%%.ready')
+          END
+

  ##
  # Per-database metrics
@@ -196,12 +253,28 @@ metrics:
    type: set
    query:
      0: >
+        SELECT
+          states.state,
+          COALESCE(a.backend_count, 0) AS backend_count,
+          COALESCE(a.max_state_time, 0) AS max_state_time
+        FROM (
          SELECT state,
                 count(*) AS backend_count,
-               COALESCE(EXTRACT(EPOCH FROM max(now() - state_change)), 0) AS max_state_time
+                 COALESCE(EXTRACT(EPOCH FROM now() - min(state_change)), 0) AS max_state_time
          FROM pg_stat_activity
          WHERE datname = %(dbname)s
          GROUP BY state
+        ) AS a
+        RIGHT JOIN
+          unnest(ARRAY[
+            'active',
+            'idle',
+            'idle in transaction',
+            'idle in transaction (aborted)',
+            'fastpath function call',
+            'disabled'
+          ]) AS states(state)
+        USING (state);
    test_args:
      dbname: postgres

@@ -235,7 +308,7 @@ metrics:
  locks:
    type: row
    query:
-      0:
+      0: >
        SELECT COUNT(*) AS total,
               SUM(CASE WHEN granted THEN 1 ELSE 0 END) AS granted
        FROM pg_locks
--- a/tests/docker-compose.yml
+++ b/tests/docker-compose.yml
@@ -20,7 +20,7 @@ services:
      POSTGRES_PASSWORD: secret
    healthcheck:
      #test: [ "CMD", "pg_isready", "-U", "postgres" ]
-      test: [ "CMD-SHELL", "pg_controldata /var/lib/postgresql/data/ | grep -q 'in production'" ]
+      test: [ "CMD-SHELL", "pg_controldata $(psql -At -U postgres -c 'show data_directory') | grep -q 'in production'" ]
      interval: 5s
      timeout: 2s
      retries: 40
--- a/tests/run-tests.sh
+++ b/tests/run-tests.sh
@@ -24,6 +24,7 @@ images["14"]='14-bookworm'
 images["15"]='15-bookworm'
 images["16"]='16-bookworm'
 images["17"]='17-bookworm'
+images["18"]='18-trixie'

 declare -A results=()

--- a/zabbix_templates/pgmon_templates.yaml
+++ b/zabbix_templates/pgmon_templates.yaml
@@ -282,6 +282,39 @@ zabbix_export:
              expression: 'last(/PostgreSQL by pgmon/pgmon.release.supported)<>1'
              name: 'PostgreSQL major release is lo longer supported'
              priority: INFO
+        - uuid: d0651ffc203949e3a24b1e1a2beb3dd7
+          name: 'Temp file size'
+          type: DEPENDENT
+          key: 'pgmon.temp_files[bytes]'
+          delay: '0'
+          history: 90d
+          units: b
+          description: 'Total size of all temp files'
+          preprocessing:
+            - type: JSONPATH
+              parameters:
+                - $.size
+          master_item:
+            key: 'pgmon[temp_files]'
+          tags:
+            - tag: Application
+              value: PostgreSQL
+        - uuid: deb355b26c37441189c85ac82465f21e
+          name: 'Temp file count'
+          type: DEPENDENT
+          key: 'pgmon.temp_files[count]'
+          delay: '0'
+          history: 90d
+          description: 'Total number of temp flies'
+          preprocessing:
+            - type: JSONPATH
+              parameters:
+                - $.count
+          master_item:
+            key: 'pgmon[temp_files]'
+          tags:
+            - tag: Application
+              value: PostgreSQL
        - uuid: 763920af8da84db8a9a2667d9653cb21
          name: 'PostgreSQL Agent Version'
          type: HTTP_AGENT
@@ -295,6 +328,17 @@ zabbix_export:
          tags:
            - tag: Application
              value: PostgreSQL
+        - uuid: a0bd4a987b7643c5a86e160dd9f9afcb
+          name: 'PostgreSQL Archive ready count'
+          type: HTTP_AGENT
+          key: 'pgmon[archive_ready]'
+          history: 90d
+          trends: '0'
+          description: 'Number of WAL files ready and waiting to be archived'
+          url: 'http://localhost:{$AGENT_PORT}/ready_archive_files'
+          tags:
+            - tag: Application
+              value: PostgreSQL
        - uuid: 91baea76ebb240b19c5a5d3913d0b989
          name: 'PostgreSQL BGWriter Info'
          type: HTTP_AGENT
@@ -369,6 +413,20 @@ zabbix_export:
              value: PostgreSQL
            - tag: Type
              value: Raw
+        - uuid: bd3026ef3b82419d8a004e2d4684554a
+          name: 'PostgreSQL Temp Ffle info'
+          type: HTTP_AGENT
+          key: 'pgmon[temp_files]'
+          history: '0'
+          value_type: TEXT
+          trends: '0'
+          description: 'PostgreSQL temp file stats'
+          url: 'http://localhost:{$AGENT_PORT}/temp_files'
+          tags:
+            - tag: Application
+              value: PostgreSQL
+            - tag: Type
+              value: Raw
        - uuid: ee88f5f4d2384f97946d049af5af4502
          name: 'PostgreSQL version'
          type: HTTP_AGENT
@@ -411,7 +469,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "active")].max_state_time'
+                    - '$[?(@.state == "active")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -429,7 +487,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "active")].backend_count'
+                    - '$[?(@.state == "active")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -448,7 +506,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "disabled")].max_state_time'
+                    - '$[?(@.state == "disabled")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -466,7 +524,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "disabled")].backend_count'
+                    - '$[?(@.state == "disabled")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -485,7 +543,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "fastpath function call")].max_state_time'
+                    - '$[?(@.state == "fastpath function call")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -503,7 +561,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "fastpath function call")].backend_count'
+                    - '$[?(@.state == "fastpath function call")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -522,7 +580,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle")].max_state_time'
+                    - '$[?(@.state == "idle")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -540,7 +598,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle")].backend_count'
+                    - '$[?(@.state == "idle")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -559,7 +617,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle in transaction (aborted)")].max_state_time'
+                    - '$[?(@.state == "idle in transaction (aborted)")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -577,7 +635,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle in transaction (aborted)")].backend_count'
+                    - '$[?(@.state == "idle in transaction (aborted)")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -596,7 +654,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle in transaction")].max_state_time'
+                    - '$[?(@.state == "idle in transaction")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -614,7 +672,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "idle in transaction")].backend_count'
+                    - '$[?(@.state == "idle in transaction")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -633,7 +691,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "starting")].max_state_time'
+                    - '$[?(@.state == "starting")].max_state_time.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
@@ -651,7 +709,7 @@ zabbix_export:
              preprocessing:
                - type: JSONPATH
                  parameters:
-                    - '$[?(@.state == "starting")].backend_count'
+                    - '$[?(@.state == "starting")].backend_count.first()'
              master_item:
                key: 'pgmon_connection_states[{#DBNAME}]'
              tags:
Author	SHA1	Message	Date
James Campbell	17b55d3c46	Merge branch 'dev/tmpfiles' into develop	2025-12-03 01:45:50 -05:00
James Campbell	9b48535a09	Add archive ready and temp file items to template - Add the initital item definitions to the template for archive ready files and temp files. - Fix the temp file query to be able to return both columns in all cases.	2025-12-02 01:43:24 -05:00
James Campbell	590425fae7	Handle situations where directories don't exist - The pgsql_tmp and archive_ready directories don't always exist. Since PG <=9.4 doesn't have the "missing_ok" parameter, we have to work around the missing directories explicitly.	2025-12-02 01:05:16 -05:00
James Campbell	174cac4ca6	Add queries for tmp and ready files	2025-11-29 02:42:04 -05:00
James Campbell	f740c4012d	Merge branch 'main' into develop	2025-11-29 00:35:05 -05:00
James Campbell	c1dcc6c87b	Merge branch 'rel/1.1.0' into develop	2025-11-29 00:34:17 -05:00
James Campbell	4fa3a7b669	Merge branch 'rel/1.1.0'	2025-11-29 00:30:33 -05:00
James Campbell	8182ad75b9	Fix activity query * Modify the activity query to ensure each state is always reported. * Fix the activity preprocessor to unwrap the value from the array containing it.	2025-10-18 12:49:09 -04:00
James Campbell	175fd85f9f	Remove Debian 10 * The Debain 10 Docker image may have been removed. Remove it from the list of supported distros until a source can be found.	2025-10-18 02:47:50 -04:00
James Campbell	e9c97d65cb	Fix OEL7 and AL2 targets	2025-10-18 02:42:02 -04:00
James Campbell	af5d9cf186	Add Amazon Linux 2 support, prepare for PG18 * Add Amazon Linux 2 as a supported OS. * Dynamically select the package manager for Amazon and Oracle Linux. * Prepare for supporting PostgreSQL 18. Specifically, the Docker image seems to have moved the data directory, so get that dynamically.	2025-10-18 02:11:08 -04:00