Fix typo in install-openrc

* Add requests as a dependency on all OSs

* Split the install target into a common target and separate
  install-systemd and install-openrc targets to support installing on
  Alpine

DEBIAN/control

@@ -3,7 +3,7 @@ Version: 1.0
 Section: utils
 Priority: optional
 Architecture: all
-Depends: logrotate, python3 (>= 3.6), python3-psycopg2, python3-yaml, systemd
+Depends: logrotate, python3 (>= 3.6), python3-psycopg2, python3-requests, python3-yaml, systemd
 Maintainer: James Campbell <james@commandprompt.com>
 Homepage: https://www.commandprompt.com
 Description: A bridge to sit between monitoring tools and PostgreSQL

GENTOO/pgmon-1.0.3.ebuild

@@ -0,0 +1,74 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{6..13} )
+
+inherit python-r1 systemd
+
+DESCRIPTION="PostgreSQL monitoring bridge"
+HOMEPAGE="None"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64"
+
+SRC_URI="https://code2.shh-dot-com.org/james/${PN}/releases/download/v${PV}/${P}.tar.bz2"
+
+IUSE="-systemd"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-python/psycopg:2
+	dev-python/pyyaml
+	dev-python/requests
+	app-admin/logrotate
+	"
+RDEPEND="${DEPEND}"
+BDEPEND=""
+
+#RESTRICT="fetch"
+
+#S="${WORKDIR}/${PN}"
+
+#pkg_nofetch() {
+#	einfo "Please download"
+#	einfo "  - ${P}.tar.bz2"
+#	einfo "from ${HOMEPAGE} and place it in your DISTDIR directory."
+#	einfo "The file should be owned by portage:portage."
+#}
+
+src_compile() {
+	true
+}
+
+src_install() {
+	# Install init script
+	if ! use systemd ; then
+		newinitd "openrc/pgmon.initd" pgmon
+		newconfd "openrc/pgmon.confd" pgmon
+	fi
+
+	# Install systemd unit
+	if use systemd ; then
+		systemd_dounit "systemd/pgmon.service"
+	fi
+
+	# Install script
+	exeinto /usr/bin
+	newexe "src/pgmon.py" pgmon
+
+	# Install default config
+	diropts -o root -g root -m 0755
+	insinto /etc/pgmon
+	doins "sample-config/pgmon.yml"
+	doins "sample-config/pgmon-metrics.yml"
+
+	# Install logrotate config
+	insinto /etc/logrotate.d
+	newins "logrotate/pgmon.logrotate" pgmon
+
+	# Install man page
+	doman manpages/pgmon.1
+}

Makefile

@@ -23,7 +23,7 @@ SUPPORTED := ubuntu-20.04 \
 # These targets are the main ones to use for most things.
 ##
 
-.PHONY: all clean tgz test query-tests install
+.PHONY: all clean tgz test query-tests install-common install-openrc install-systemd
 
 
 # Build all packages
@@ -34,7 +34,7 @@ all: $(foreach distro_release, $(SUPPORTED), package-$(distro_release))
 .PHONY: package-gentoo
 package-gentoo:
 	mkdir -p $(BUILD_DIR)/gentoo
-	tar --transform "s,^\.,$(PACKAGE_NAME)-$(VERSION)," -acjf $(BUILD_DIR)/gentoo/$(PACKAGE_NAME)-$(VERSION).tar.bz2 --exclude $(BUILD_DIR) .
+	tar --transform "s,^,$(PACKAGE_NAME)-$(VERSION)/," -acjf $(BUILD_DIR)/gentoo/$(PACKAGE_NAME)-$(VERSION).tar.bz2 --exclude .gitignore $(shell git ls-tree --full-tree --name-only -r HEAD)
 
 
 # Create a deb package
@@ -54,7 +54,7 @@ package-%:
 tgz:
 	rm -rf $(BUILD_DIR)/tgz/root
 	mkdir -p $(BUILD_DIR)/tgz/root
-	$(MAKE) install DESTDIR=$(BUILD_DIR)/tgz/root
+	$(MAKE) install-openrc DESTDIR=$(BUILD_DIR)/tgz/root
 	tar -cz -f $(BUILD_DIR)/tgz/$(PACKAGE_NAME)-$(VERSION).tgz -C $(BUILD_DIR)/tgz/root .
 
 # Clean up the build directory
@@ -69,12 +69,11 @@ test:
 query-tests:
 	cd tests ; ./run-tests.sh
 
-# Install the script at the specified base directory
+# Install the script at the specified base directory (common components)
-install:
+install-common:
 	# Set up directories
 	mkdir -p $(DESTDIR)/etc/$(PACKAGE_NAME)
 	mkdir -p ${DESTDIR}/etc/logrotate.d
-	mkdir -p $(DESTDIR)/lib/systemd/system
 	mkdir -p $(DESTDIR)/usr/local/bin
 	mkdir -p $(DESTDIR)/usr/share/man/man1
 	
@@ -89,11 +88,34 @@ install:
 	# Install sample config
 	cp sample-config/* $(DESTDIR)/etc/$(PACKAGE_NAME)/
 	
+	# Install logrotate config
+	cp logrotate/${PACKAGE_NAME}.logrotate ${DESTDIR}/etc/logrotate.d/${PACKAGE_NAME}
+
+# Install for systemd
+install-systemd:
+	# Install the common stuff
+	$(MAKE) install-common
+	
+	# Set up directories
+	mkdir -p $(DESTDIR)/lib/systemd/system
+	
 	# Install systemd unit files
 	cp systemd/* $(DESTDIR)/lib/systemd/system/
 
-	# Install logrotate config
+# Install for open-rc
-	cp logrotate/${PACKAGE_NAME}.logrotate ${DESTDIR}/etc/logrotate.d/${PACKAGE_NAME}
+install-openrc:
+	# Install the common stuff
+	$(MAKE) install-common
+	
+	# Set up directories
+	mkdir -p $(DESTDIR)/etc/init.d
+	mkdir -p $(DESTDIR)/etc/conf.d
+	
+	# Install init script
+	cp openrc/pgmon.initd $(DESTDIR)/etc/init.d/pgmon
+	
+	# Install init script config file
+	cp openrc/pgmon.confd $(DESTDIR)/etc/conf.d/pgmon
 
 
 # Run all of the install tests
@@ -167,7 +189,7 @@ package-image-%:
 
 # Debian package creation
 actually-package-debian-%:
-	$(MAKE) install DESTDIR=/output/debian-$*
+	$(MAKE) install-systemd DESTDIR=/output/debian-$*
 	cp -r --preserve=mode DEBIAN /output/debian-$*/
 	dpkg-deb -Zgzip --build /output/debian-$* "/output/$(PACKAGE_NAME)-$(VERSION)-debian-$*.deb"
 
@@ -182,7 +204,7 @@ actually-package-rockylinux-%:
 
 # Ubuntu package creation
 actually-package-ubuntu-%:
-	$(MAKE) install DESTDIR=/output/ubuntu-$*
+	$(MAKE) install-systemd DESTDIR=/output/ubuntu-$*
 	cp -r --preserve=mode DEBIAN /output/ubuntu-$*/
 	dpkg-deb -Zgzip --build /output/ubuntu-$* "/output/$(PACKAGE_NAME)-$(VERSION)-ubuntu-$*.deb"
 

RPM/pgmon-el7.spec

@@ -7,7 +7,7 @@ License: MIT
 URL: https://www.commandprompt.com
 
 BuildArch: noarch
-Requires: logrotate, python, python-psycopg2, PyYAML, systemd
+Requires: logrotate, python, python-psycopg2, PyYAML, python-requests, systemd
 
 %description
 A bridge to sit between monitoring tools and PostgreSQL
@@ -19,7 +19,7 @@ A bridge to sit between monitoring tools and PostgreSQL
 # Do nothing since we have nothing to build
 
 %install
-make -C /src install DESTDIR=%{buildroot}
+make -C /src install-systemd DESTDIR=%{buildroot}
 
 %files
 /etc/logrotate.d/pgmon

RPM/pgmon.spec

@@ -7,7 +7,7 @@ License: MIT
 URL: https://www.commandprompt.com
 
 BuildArch: noarch
-Requires: logrotate, python3, python3-psycopg2, python3-pyyaml, systemd
+Requires: logrotate, python3, python3-psycopg2, python3-pyyaml, python3-requests, systemd
 
 %description
 A bridge to sit between monitoring tools and PostgreSQL
@@ -19,7 +19,7 @@ A bridge to sit between monitoring tools and PostgreSQL
 # Do nothing since we have nothing to build
 
 %install
-make -C /src install DESTDIR=%{buildroot}
+make -C /src install-systemd DESTDIR=%{buildroot}
 
 %files
 /etc/logrotate.d/pgmon

src/pgmon.py

@@ -24,7 +24,10 @@ from http.server import BaseHTTPRequestHandler, HTTPServer
 from http.server import ThreadingHTTPServer
 from urllib.parse import urlparse, parse_qs
 
-VERSION = "1.0.2"
+import requests
+import re
+
+VERSION = "1.0.3"
 
 # Configuration
 config = {}
@@ -43,6 +46,12 @@ cluster_version = None
 cluster_version_next_check = None
 cluster_version_lock = Lock()
 
+# PostgreSQL latest version information
+latest_version = None
+latest_version_next_check = None
+latest_version_lock = Lock()
+release_supported = None
+
 # Running state (used to gracefully shut down)
 running = True
 
@@ -83,6 +92,10 @@ class MetricVersionError(Exception):
     pass
 
 
+class LatestVersionCheckError(Exception):
+    pass
+
+
 # Default config settings
 default_config = {
     # The address the agent binds to
@@ -116,6 +129,8 @@ default_config = {
     "reconnect_cooldown": 30,
     # How often to check the version of PostgreSQL (seconds)
     "version_check_period": 300,
+    # How often to check the latest supported version of PostgreSQL (seconds)
+    "latest_version_check_period": 86400,
     # Metrics
     "metrics": {},
 }
@@ -482,6 +497,127 @@ def get_cluster_version():
     return cluster_version
 
 
+def version_num_to_release(version_num):
+    """
+    Extract the revease from a version_num.
+
+    In other words, this converts things like:
+        90603  => 9.6
+        130010 => 13
+    """
+    if version_num // 10000 < 10:
+        return version_num // 10000 + (version_num % 10000 // 100 / 10)
+    else:
+        return version_num // 10000
+
+
+def parse_version_rss(raw_rss, release):
+    """
+    Parse the raw RSS from the versions.rss feed to extract the latest version of
+    PostgreSQL that's availabe for the cluster being monitored.
+
+    This sets these global variables:
+        latest_version
+        latest_version_next_check
+        release_supported
+
+    It is expected that the caller already holds the latest_version_lock lock.
+
+    params:
+        raw_rss: The raw rss text from versions.rss
+        release: The PostgreSQL release we care about (ex: 9.2, 14)
+    """
+    global latest_version
+    global latest_version_next_check
+    global release_supported
+
+    # Regular expressions for parsing the RSS document
+    version_line = re.compile(
+        r".*?([0-9][0-9.]+) is the latest release in the {} series.*".format(release)
+    )
+    unsupported_line = re.compile(r"^This version is unsupported")
+
+    # Loop through the RSS until we find the current release
+    release_found = False
+    for line in raw_rss.splitlines():
+        m = version_line.match(line)
+        if m:
+            # Note that we found the version we were looking for
+            release_found = True
+
+            # Convert the version to version_num format
+            version = m.group(1)
+            parts = list(map(int, version.split(".")))
+            if parts[0] < 10:
+                latest_version = int(
+                    "{}{:02}{:02}".format(parts[0], parts[1], parts[2])
+                )
+            else:
+                latest_version = int("{}00{:02}".format(parts[0], parts[1]))
+        elif release_found:
+            # The next line after the version tells if the version is supported
+            if unsupported_line.match(line):
+                release_supported = False
+            else:
+                release_supported = True
+            break
+
+    # Make sure we actually found it
+    if not release_found:
+        raise LatestVersionCheckError("Current release ({}) not found".format(release))
+
+    log.info(
+        "Got latest PostgreSQL version: {} supported={}".format(
+            latest_version, release_supported
+        )
+    )
+    log.debug(
+        "Next latest PostgreSQL version check will be after: {}".format(
+            latest_version_next_check
+        )
+    )
+
+
+def get_latest_version():
+    """
+    Get the latest supported version of the major PostgreSQL release running on the server being monitored.
+    """
+
+    # If we don't know the latest version or it's past the recheck time, get the
+    # version from the PostgreSQL RSS feed.  Only one thread needs to do this, so
+    # they all try to grab the lock, and then make sure nobody else beat them to it.
+    if (
+        latest_version is None
+        or latest_version_next_check is None
+        or latest_version_next_check < datetime.now()
+    ):
+        # Note: we get the cluster version here before grabbing the latest_version_lock
+        #       lock so it's not held while trying to talk with the DB.
+        release = version_num_to_release(get_cluster_version())
+
+        with latest_version_lock:
+            # Only check if nobody already got the version before us
+            if (
+                latest_version is None
+                or latest_version_next_check is None
+                or latest_version_next_check < datetime.now()
+            ):
+                log.info("Checking latest PostgreSQL version")
+                latest_version_next_check = datetime.now() + timedelta(
+                    seconds=int(config["latest_version_check_period"])
+                )
+
+                # Grab the RSS feed
+                raw_rss = requests.get("https://www.postgresql.org/versions.rss")
+                if raw_rss.status_code != 200:
+                    raise LatestVersionCheckError("code={}".format(r.status_code))
+
+                # Parse the RSS body and set global variables
+                parse_version_rss(raw_rss.text, release)
+
+    return latest_version
+
+
 def sample_metric(dbname, metric_name, args, retry=True):
     """
     Run the appropriate query for the named metric against the specified database
@@ -563,6 +699,18 @@ class SimpleHTTPRequestHandler(BaseHTTPRequestHandler):
         if metric_name == "agent_version":
             self._reply(200, VERSION)
             return
+        elif metric_name == "latest_version_info":
+            try:
+                get_latest_version()
+                self._reply(
+                    200,
+                    json.dumps(
+                        {"latest": latest_version, "supported": 1 if release_supported else 0}
+                    ),
+                )
+            except LatestVersionCheckError as e:
+                log.error("Failed to retrieve latest version information: {}".format(e))
+                self._reply(503, "Failed to retrieve latest version info")
 
         # Note: parse_qs returns the values as a list.  Since we always expect
         #       single values, just grab the first from each.

src/test_pgmon.py

@@ -10,6 +10,95 @@ import pgmon
 # Silence most logging output
 logging.disable(logging.CRITICAL)
 
+versions_rss = """
+<?xml version="1.0" encoding="utf-8"?>
+<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom"><channel><title>PostgreSQL latest versions</title><link>https://www.postgresql.org/</link><description>PostgreSQL latest versions</description><atom:link href="https://www.postgresql.org/versions.rss" rel="self"/><language>en-us</language><lastBuildDate>Thu, 08 May 2025 00:00:00 +0000</lastBuildDate><item><title>17.5
+</title><link>https://www.postgresql.org/docs/17/release-17-5.html</link><description>17.5 is the latest release in the 17 series.
+
+</description><pubDate>Thu, 08 May 2025 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/17/release-17-5.html</guid></item><item><title>16.9
+</title><link>https://www.postgresql.org/docs/16/release-16-9.html</link><description>16.9 is the latest release in the 16 series.
+
+</description><pubDate>Thu, 08 May 2025 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/16/release-16-9.html</guid></item><item><title>15.13
+</title><link>https://www.postgresql.org/docs/15/release-15-13.html</link><description>15.13 is the latest release in the 15 series.
+
+</description><pubDate>Thu, 08 May 2025 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/15/release-15-13.html</guid></item><item><title>14.18
+</title><link>https://www.postgresql.org/docs/14/release-14-18.html</link><description>14.18 is the latest release in the 14 series.
+
+</description><pubDate>Thu, 08 May 2025 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/14/release-14-18.html</guid></item><item><title>13.21
+</title><link>https://www.postgresql.org/docs/13/release-13-21.html</link><description>13.21 is the latest release in the 13 series.
+
+</description><pubDate>Thu, 08 May 2025 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/13/release-13-21.html</guid></item><item><title>12.22
+</title><link>https://www.postgresql.org/docs/12/release-12-22.html</link><description>12.22 is the latest release in the 12 series.
+This version is unsupported!
+</description><pubDate>Thu, 21 Nov 2024 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/12/release-12-22.html</guid></item><item><title>11.22
+</title><link>https://www.postgresql.org/docs/11/release-11-22.html</link><description>11.22 is the latest release in the 11 series.
+This version is unsupported!
+</description><pubDate>Thu, 09 Nov 2023 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/11/release-11-22.html</guid></item><item><title>10.23
+</title><link>https://www.postgresql.org/docs/10/release-10-23.html</link><description>10.23 is the latest release in the 10 series.
+This version is unsupported!
+</description><pubDate>Thu, 10 Nov 2022 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/10/release-10-23.html</guid></item><item><title>9.6.24
+</title><link>https://www.postgresql.org/docs/9.6/release-9-6-24.html</link><description>9.6.24 is the latest release in the 9.6 series.
+This version is unsupported!
+</description><pubDate>Thu, 11 Nov 2021 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.6/release-9-6-24.html</guid></item><item><title>9.5.25
+</title><link>https://www.postgresql.org/docs/9.5/release-9-5-25.html</link><description>9.5.25 is the latest release in the 9.5 series.
+This version is unsupported!
+</description><pubDate>Thu, 11 Feb 2021 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.5/release-9-5-25.html</guid></item><item><title>9.4.26
+</title><link>https://www.postgresql.org/docs/9.4/release-9-4-26.html</link><description>9.4.26 is the latest release in the 9.4 series.
+This version is unsupported!
+</description><pubDate>Thu, 13 Feb 2020 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.4/release-9-4-26.html</guid></item><item><title>9.3.25
+</title><link>https://www.postgresql.org/docs/9.3/release-9-3-25.html</link><description>9.3.25 is the latest release in the 9.3 series.
+This version is unsupported!
+</description><pubDate>Thu, 08 Nov 2018 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.3/release-9-3-25.html</guid></item><item><title>9.2.24
+</title><link>https://www.postgresql.org/docs/9.2/release-9-2-24.html</link><description>9.2.24 is the latest release in the 9.2 series.
+This version is unsupported!
+</description><pubDate>Thu, 09 Nov 2017 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.2/release-9-2-24.html</guid></item><item><title>9.1.24
+</title><link>https://www.postgresql.org/docs/9.1/release-9-1-24.html</link><description>9.1.24 is the latest release in the 9.1 series.
+This version is unsupported!
+</description><pubDate>Thu, 27 Oct 2016 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.1/release-9-1-24.html</guid></item><item><title>9.0.23
+</title><link>https://www.postgresql.org/docs/9.0/release-9-0-23.html</link><description>9.0.23 is the latest release in the 9.0 series.
+This version is unsupported!
+</description><pubDate>Thu, 08 Oct 2015 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/9.0/release-9-0-23.html</guid></item><item><title>8.4.22
+</title><link>https://www.postgresql.org/docs/8.4/release-8-4-22.html</link><description>8.4.22 is the latest release in the 8.4 series.
+This version is unsupported!
+</description><pubDate>Thu, 24 Jul 2014 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/8.4/release-8-4-22.html</guid></item><item><title>8.3.23
+</title><link>https://www.postgresql.org/docs/8.3/release-8-3-23.html</link><description>8.3.23 is the latest release in the 8.3 series.
+This version is unsupported!
+</description><pubDate>Thu, 07 Feb 2013 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/8.3/release-8-3-23.html</guid></item><item><title>8.2.23
+</title><link>https://www.postgresql.org/docs/8.2/release-8-2-23.html</link><description>8.2.23 is the latest release in the 8.2 series.
+This version is unsupported!
+</description><pubDate>Mon, 05 Dec 2011 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/8.2/release-8-2-23.html</guid></item><item><title>8.1.23
+</title><link>https://www.postgresql.org/docs/8.1/release.html</link><description>8.1.23 is the latest release in the 8.1 series.
+This version is unsupported!
+</description><pubDate>Thu, 16 Dec 2010 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/8.1/release.html</guid></item><item><title>8.0.26
+</title><link>https://www.postgresql.org/docs/8.0/release.html</link><description>8.0.26 is the latest release in the 8.0 series.
+This version is unsupported!
+</description><pubDate>Mon, 04 Oct 2010 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/8.0/release.html</guid></item><item><title>7.4.30
+</title><link>https://www.postgresql.org/docs/7.4/release.html</link><description>7.4.30 is the latest release in the 7.4 series.
+This version is unsupported!
+</description><pubDate>Mon, 04 Oct 2010 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/7.4/release.html</guid></item><item><title>7.3.21
+</title><link>https://www.postgresql.org/docs/7.3/release.html</link><description>7.3.21 is the latest release in the 7.3 series.
+This version is unsupported!
+</description><pubDate>Mon, 07 Jan 2008 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/7.3/release.html</guid></item><item><title>7.2.8
+</title><link>https://www.postgresql.org/docs/7.2/release.html</link><description>7.2.8 is the latest release in the 7.2 series.
+This version is unsupported!
+</description><pubDate>Mon, 09 May 2005 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/7.2/release.html</guid></item><item><title>7.1.3
+</title><link>https://www.postgresql.org/docs/7.1/release.html</link><description>7.1.3 is the latest release in the 7.1 series.
+This version is unsupported!
+</description><pubDate>Fri, 17 Aug 2001 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/7.1/release.html</guid></item><item><title>7.0.3
+</title><link>https://www.postgresql.org/docs/7.0/release.htm</link><description>7.0.3 is the latest release in the 7.0 series.
+This version is unsupported!
+</description><pubDate>Sun, 12 Nov 2000 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/7.0/release.htm</guid></item><item><title>6.5.3
+</title><link>https://www.postgresql.org/docs/6.5/release.htm</link><description>6.5.3 is the latest release in the 6.5 series.
+This version is unsupported!
+</description><pubDate>Thu, 04 Nov 1999 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/6.5/release.htm</guid></item><item><title>6.4.2
+</title><link>https://www.postgresql.org/docs/6.4/release.htm</link><description>6.4.2 is the latest release in the 6.4 series.
+This version is unsupported!
+</description><pubDate>Sun, 03 Jan 1999 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/6.4/release.htm</guid></item><item><title>6.3.2
+</title><link>https://www.postgresql.org/docs/6.3/c2701.htm</link><description>6.3.2 is the latest release in the 6.3 series.
+This version is unsupported!
+</description><pubDate>Mon, 23 Feb 1998 00:00:00 +0000</pubDate><guid>https://www.postgresql.org/docs/6.3/c2701.htm</guid></item></channel></rss>
+"""
+
 
 class TestPgmonMethods(unittest.TestCase):
     ##
@@ -172,13 +261,16 @@ class TestPgmonMethods(unittest.TestCase):
     def test_get_query__versions(self):
         metric = {"type": "value", "query": {0: "DEFAULT", 110000: "NEW"}}
 
-        # Test getting the default version of a query with no lower bound and a newer version
+        # Test getting the default version of a query with no lower bound and a newer
+        # version
         self.assertEqual(pgmon.get_query(metric, 100000), "DEFAULT")
 
-        # Test getting the newer version of a query with no lower bound and a newer version for the newer version
+        # Test getting the newer version of a query with no lower bound and a newer
+        # version for the newer version
         self.assertEqual(pgmon.get_query(metric, 110000), "NEW")
 
-        # Test getting the newer version of a query with no lower bound and a newer version for an even newer version
+        # Test getting the newer version of a query with no lower bound and a newer
+        # version for an even newer version
         self.assertEqual(pgmon.get_query(metric, 160000), "NEW")
 
         # Test getting a version in bwtween two other versions
@@ -272,7 +364,8 @@ metrics:
     def test_read_config__include(self):
         pgmon.config = {}
 
-        # Test reading a config that includes other files (absolute and relative paths, multiple levels)
+        # Test reading a config that includes other files (absolute and relative paths,
+        # multiple levels)
         with tempfile.TemporaryDirectory() as tmpdirname:
             with open(f"{tmpdirname}/config.yml", "w") as f:
                 f.write(
@@ -661,3 +754,38 @@ metrics:
             )
         self.assertEqual(pgmon.config["dbuser"], "postgres")
         self.assertEqual(pgmon.config["metrics"]["test1"]["query"][0], "TEST1")
+
+    def test_version_num_to_release__valid(self):
+        self.assertEqual(pgmon.version_num_to_release(90602), 9.6)
+        self.assertEqual(pgmon.version_num_to_release(130002), 13)
+
+    def test_parse_version_rss__simple(self):
+        pgmon.parse_version_rss(versions_rss, 13)
+        self.assertEqual(pgmon.latest_version, 130021)
+        self.assertTrue(pgmon.release_supported)
+
+        pgmon.parse_version_rss(versions_rss, 9.6)
+        self.assertEqual(pgmon.latest_version, 90624)
+        self.assertFalse(pgmon.release_supported)
+
+    def test_parse_version_rss__missing(self):
+        # Test asking about versions that don't exist
+        self.assertRaises(
+            pgmon.LatestVersionCheckError, pgmon.parse_version_rss, versions_rss, 9.7
+        )
+
+        self.assertRaises(
+            pgmon.LatestVersionCheckError, pgmon.parse_version_rss, versions_rss, 99
+        )
+
+    def test_get_latest_version(self):
+        # Define a cluster version here so the test doesn't need a database
+        pgmon.cluster_version_next_check = datetime.now() + timedelta(hours=1)
+        pgmon.cluster_version = 90623
+
+        # Set up a default config
+        pgmon.update_deep(pgmon.config, pgmon.default_config)
+
+        # Make sure we can pull the RSS file (we assume the 9.6 series won't be getting
+        # any more updates)
+        self.assertEqual(pgmon.get_latest_version(), 90624)

tests/Dockerfile

@@ -2,6 +2,7 @@ FROM alpine:3.21
 
 RUN apk update && \
     apk add py3-psycopg2 \
+            py3-requests \
             py3-yaml \
             tini
 

zabbix_templates/pgmon_templates.yaml

@@ -11,6 +11,39 @@ zabbix_export:
       groups:
         - name: 'My Templates'
       items:
+        - uuid: de1fa757395440118026f4c7a7c4ebbe
+          name: 'PostgreSQL latest supported version'
+          type: DEPENDENT
+          key: pgmon.release.latest
+          delay: '0'
+          preprocessing:
+            - type: JSONPATH
+              parameters:
+                - $.latest
+          master_item:
+            key: 'pgmon[latest_version_info]'
+          tags:
+            - tag: Application
+              value: PostgreSQL
+        - uuid: e1a003317bc043908ee0803704a6e1d0
+          name: 'PostgreSQL release support status'
+          type: DEPENDENT
+          key: pgmon.release.supported
+          delay: '0'
+          preprocessing:
+            - type: JSONPATH
+              parameters:
+                - $.supported
+          master_item:
+            key: 'pgmon[latest_version_info]'
+          tags:
+            - tag: Application
+              value: PostgreSQL
+          triggers:
+            - uuid: 88eac74402d64e7cb853e8cb505b1939
+              expression: 'last(/PostgreSQL by pgmon/pgmon.release.supported)<>1'
+              name: 'PostgreSQL major release is lo longer supported'
+              priority: INFO
         - uuid: 763920af8da84db8a9a2667d9653cb21
           name: 'PostgreSQL Agent Version'
           type: HTTP_AGENT
@@ -24,6 +57,19 @@ zabbix_export:
           tags:
             - tag: Application
               value: PostgreSQL
+        - uuid: d890e395fbbc4f2bacbd50e7321fcb9f
+          name: 'PostgreSQL latest version info'
+          type: HTTP_AGENT
+          key: 'pgmon[latest_version_info]'
+          delay: 12h
+          history: '0'
+          value_type: TEXT
+          trends: '0'
+          description: 'Information about the latest PostgreSQL version in the current series'
+          url: 'http://localhost:{$AGENT_PORT}/version'
+          tags:
+            - tag: Application
+              value: PostgreSQL
         - uuid: 8706eccb7edc4fa394f552fc31f401a9
           name: 'Max Frozen XID Age'
           type: HTTP_AGENT
@@ -911,6 +957,35 @@ zabbix_export:
               path: $.repid
             - lld_macro: '{#STATE}'
               path: $.state
+        - uuid: e22315b0295d4b43aa6b6611ede13e84
+          name: 'Discover Replication Slots'
+          type: HTTP_AGENT
+          key: pgmon_discover_slots
+          delay: 10m
+          item_prototypes:
+            - uuid: a9f53efdce0a4bdc970925f8588e01c5
+              name: 'Replication Slot Stats for {#SLOT_NAME}'
+              type: HTTP_AGENT
+              key: 'pgmon_slot_stats[{#SLOT_NAME}]'
+              history: '0'
+              value_type: TEXT
+              trends: '0'
+              url: 'http://localhost:{$AGENT_PORT}/slot_stats'
+              query_fields:
+                - name: slot
+                  value: '{#SLOT_NAME}'
+          url: 'http://localhost:{$AGENT_PORT}/discover_slots'
+          lld_macro_paths:
+            - lld_macro: '{#ACTIVE}'
+              path: $.active
+            - lld_macro: '{#DATABASE}'
+              path: $.database
+            - lld_macro: '{#PLUGIN}'
+              path: $.plugin
+            - lld_macro: '{#SLOT_NAME}'
+              path: $.slot_name
+            - lld_macro: '{#TEMPORARY}'
+              path: $.temporary
       macros:
         - macro: '{$AGENT_PORT}'
           value: '5400'
@@ -988,3 +1063,22 @@ zabbix_export:
                     - type: STRING
                       name: reference
                       value: XSCMZ
+  triggers:
+    - uuid: 94ce93c828aa46b4bd4f3732fc7090c6
+      expression: 'last(/PostgreSQL by pgmon/pgmon.release.latest) - last(/PostgreSQL by pgmon/pgmon[version]) >= 1'
+      name: 'PostgreSQL is at least 1 version behind'
+      priority: INFO
+      dependencies:
+        - name: 'PostgreSQL is at least 2 version behind'
+          expression: 'last(/PostgreSQL by pgmon/pgmon.release.latest) - last(/PostgreSQL by pgmon/pgmon[version]) >= 2'
+    - uuid: 2701bcd1223c4ee787f3eca30288e6c6
+      expression: 'last(/PostgreSQL by pgmon/pgmon.release.latest) - last(/PostgreSQL by pgmon/pgmon[version]) >= 2'
+      name: 'PostgreSQL is at least 2 version behind'
+      priority: INFO
+      dependencies:
+        - name: 'PostgreSQL is at least 3 version behind'
+          expression: 'last(/PostgreSQL by pgmon/pgmon.release.latest) - last(/PostgreSQL by pgmon/pgmon[version]) >= 3'
+    - uuid: 3c9adbe8b6f84b3788c6a3e513075df5
+      expression: 'last(/PostgreSQL by pgmon/pgmon.release.latest) - last(/PostgreSQL by pgmon/pgmon[version]) >= 3'
+      name: 'PostgreSQL is at least 3 version behind'
+      priority: INFO