Minor updates

Author: Muhammad Shahzeb

postgres_mixin/alerts/postgres.libsonnet

@@ -13,10 +13,10 @@
             expr: |||
               sum by (%(agg)s) (pg_stat_activity_count{%(postgresExporterSelector)s})
               >=
-              sum by (instance) (pg_settings_max_connections{%(postgresExporterSelector)s})
+              sum by (%(agg)s) (pg_settings_max_connections{%(postgresExporterSelector)s})
               -
               sum by (%(agg)s) (pg_settings_superuser_reserved_connections{%(postgresExporterSelector)s})
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '1m',
             labels: {
               severity: 'warning',
@@ -36,7 +36,7 @@
                 -
                 sum by (%(agg)s) (pg_settings_superuser_reserved_connections{%(postgresExporterSelector)s})
               ) * 0.8
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '10m',
             labels: {
               severity: 'warning',
@@ -63,10 +63,10 @@
             expr: |||
               avg by (%(agg)s) (
                 rate (
-                  pg_stat_activity_max_tx_duration{%(dbNameFilter)s,%(postgresExporterSelector)s}[2m]
+                  pg_stat_activity_max_tx_duration{%(dbNameFilter)s, %(postgresExporterSelector)s}[2m]
                 )
               ) > 2 * 60
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '2m',
             labels: {
               severity: 'warning',
@@ -81,14 +81,14 @@
             expr: |||
               avg by (datname, %(agg)s) (
                 irate(
-                  pg_stat_database_xact_commit{%(dbNameFilter)s,%(postgresExporterSelector)s}[5m]
+                  pg_stat_database_xact_commit{%(dbNameFilter)s, %(postgresExporterSelector)s}[5m]
                 )
                 +
                 irate(
-                  pg_stat_database_xact_rollback{%(dbNameFilter)s,%(postgresExporterSelector)s}[5m]
+                  pg_stat_database_xact_rollback{%(dbNameFilter)s, %(postgresExporterSelector)s}[5m]
                 )
               ) > 10000
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '5m',
             labels: {
               severity: 'warning',
@@ -102,19 +102,19 @@
             },
             expr: |||
               avg by (datname, %(agg)s) (
-                rate(pg_stat_database_blks_hit{%(dbNameFilter)s,%(postgresExporterSelector)s}[5m])
+                rate(pg_stat_database_blks_hit{%(dbNameFilter)s, %(postgresExporterSelector)s}[5m])
                 /
                 (
                   rate(
-                    pg_stat_database_blks_hit{%(dbNameFilter)s,%(postgresExporterSelector)s}[5m]
+                    pg_stat_database_blks_hit{%(dbNameFilter)s, %(postgresExporterSelector)s}[5m]
                   )
                   +
                   rate(
-                    pg_stat_database_blks_read{%(dbNameFilter)s,%(postgresExporterSelector)s}[5m]
+                    pg_stat_database_blks_read{%(dbNameFilter)s, %(postgresExporterSelector)s}[5m]
                   )
                 )
               ) < 0.98
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '5m',
             labels: {
               severity: 'warning',
@@ -159,7 +159,7 @@
             expr: |||
               max by(datname, %(agg)s) ((pg_locks_count{%(dbNameFilter)s}) /
               on(%(agg)s) group_left(server) (pg_settings_max_locks_per_transaction{} * pg_settings_max_connections{})) > 0.20
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '5m',
             labels: {
               severity: 'warning',
@@ -173,7 +173,7 @@
             },
             expr: |||
               (pg_replication_lag{} > 3600) and on (%(agg)s) (pg_replication_is_replica{} == 1)
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '5m',
             labels: {
               severity: 'warning',
@@ -230,7 +230,7 @@
                 )
                 < time() - 36000
               )
-            ||| % $._config { agg: std.join(',', $._config.groupLabels + $._config.instanceLabels) },
+            ||| % $._config { agg: std.join(', ', $._config.groupLabels + $._config.instanceLabels) },
             'for': '30m',
             labels: {
               severity: 'critical',

postgres_mixin/config.libsonnet

@@ -1,7 +1,7 @@
 {
   _config+:: {
     dbNameFilter: 'datname!~"template.*"',
-    postgresExporterSelector: '',
+    postgresExporterSelector: 'job="integrations/postgres_exporter"',
     groupLabels: if self.enableMultiCluster then ['job', 'cluster'] else ['job'],
     instanceLabels: ['instance', 'server'],
     enableMultiCluster: false,