Bumping pgMonitor to v4.8.0.

[SC-16701]

Author: dsessler7

bin/crunchy-postgres-exporter/start.sh

@@ -204,7 +204,7 @@ else
         else
           echo_warn "Query file queries_pg_stat_statements_reset_info.yml not loaded."
         fi
-    elif (( ${VERSION?} >= 140000 ))
+    elif (( ${VERSION?} >= 140000 )) && (( ${VERSION?} < 150000 ))
     then
         if [[ -f ${CONFIG_DIR?}/pg14/queries_general.yml ]]
         then
@@ -226,6 +226,28 @@ else
         else
           echo_warn "Query file queries_pg_stat_statements_reset_info.yml not loaded."
         fi
+    elif (( ${VERSION?} >= 150000 ))
+    then
+        if [[ -f ${CONFIG_DIR?}/pg15/queries_general.yml ]]
+        then
+            cat ${CONFIG_DIR?}/pg15/queries_general.yml >> /tmp/queries.yml
+        else
+            echo_err "Query file queries_general.yml does not exist (it should).."
+        fi
+        if [[ -f ${CONFIG_DIR?}/pg15/queries_pg_stat_statements.yml ]]
+        then
+          cat ${CONFIG_DIR?}/pg15/queries_pg_stat_statements.yml >> /tmp/queries.yml
+        else
+          echo_warn "Query file queries_pg_stat_statements.yml not loaded."
+        fi
+        # queries_pg_stat_statements_reset is only available in PG12+. This may
+        # need to be updated based on a new path
+        if [[ -f ${CONFIG_DIR?}/pg15/queries_pg_stat_statements_reset_info.yml ]];
+        then
+          cat ${CONFIG_DIR?}/pg15/queries_pg_stat_statements_reset_info.yml >> /tmp/queries.yml
+        else
+          echo_warn "Query file queries_pg_stat_statements_reset_info.yml not loaded."
+        fi
     else
         echo_err "Unknown or unsupported version of PostgreSQL.  Exiting.."
         exit 1

bin/get-pgmonitor.sh

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 echo "Getting pgMonitor..."
-PGMONITOR_COMMIT='v4.7'
+PGMONITOR_COMMIT='v4.8.0'
 
 # pgMonitor Setup
 if [[ -d ${PGOROOT?}/tools/pgmonitor ]]

build/pgo-base/Dockerfile

@@ -35,6 +35,6 @@ RUN if [ "$BASEOS" = "ubi8" ] ; then \
 fi
 
 # Crunchy PostgreSQL repository
-ADD conf/RPM-GPG-KEY-crunchydata* /
+ADD conf/*KEY* /
 ADD conf/crunchypg${PGVERSION}.repo /etc/yum.repos.d/
-RUN rpm --import RPM-GPG-KEY-crunchydata*
+RUN rpm --import *GPG-KEY-crunchydata*

conf/.gitignore

@@ -1,4 +1,4 @@
 *.repo
 *.public
 *.private
-RPM-GPG-KEY-*
+*KEY*

hack/update-pgmonitor-installer.sh

@@ -19,7 +19,7 @@
 directory=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 
 # The pgMonitor tag to use to refresh the current monitoring installer
-pgmonitor_tag=v4.7
+pgmonitor_tag=v4.8.0
 
 # Set the directory for the monitoring Kustomize installer
 pgo_examples_monitoring_dir="${directory}/../../postgres-operator-examples/kustomize/monitoring"