Merging upstream version 1.43.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 27 insertions, 13 deletions

diff --git a/health/health.d/postgres.conf b/health/health.d/postgres.conf
index 67b25673b..de4c0078e 100644
--- a/health/health.d/postgres.conf
+++ b/health/health.d/postgres.conf
@@ -12,7 +12,8 @@ component: PostgreSQL
      warn: $this > (($status >= $WARNING)  ? (70) : (80))
      crit: $this > (($status == $CRITICAL) ? (80) : (90))
     delay: down 15m multiplier 1.5 max 1h
-     info: average total connection utilization over the last minute
+  summary: PostgreSQL connection utilization
+     info: Average total connection utilization over the last minute
        to: dba
 
  template: postgres_acquired_locks_utilization
@@ -26,7 +27,8 @@ component: PostgreSQL
     every: 1m
      warn: $this > (($status >= $WARNING)  ? (15) : (20))
     delay: down 15m multiplier 1.5 max 1h
-     info: average acquired locks utilization over the last minute
+  summary: PostgreSQL acquired locks utilization
+     info: Average acquired locks utilization over the last minute
        to: dba
 
  template: postgres_txid_exhaustion_perc
@@ -40,7 +42,8 @@ component: PostgreSQL
     every: 1m
      warn: $this > 90
     delay: down 15m multiplier 1.5 max 1h
-     info: percent towards TXID wraparound
+  summary: PostgreSQL TXID exhaustion
+     info: Percent towards TXID wraparound
        to: dba
 
 # Database alarms
@@ -58,7 +61,8 @@ component: PostgreSQL
      warn: $this < (($status >= $WARNING)  ? (70) : (60))
      crit: $this < (($status == $CRITICAL) ? (60) : (50))
     delay: down 15m multiplier 1.5 max 1h
-     info: average cache hit ratio in db ${label:database} over the last minute
+  summary: PostgreSQL DB ${label:database} cache hit ratio
+     info: Average cache hit ratio in db ${label:database} over the last minute
        to: dba
 
  template: postgres_db_transactions_rollback_ratio	
@@ -72,7 +76,8 @@ component: PostgreSQL
     every: 1m
      warn: $this > (($status >= $WARNING)  ? (0) : (2))
     delay: down 15m multiplier 1.5 max 1h
-     info: average aborted transactions percentage in db ${label:database} over the last five minutes
+  summary: PostgreSQL DB ${label:database} aborted transactions
+     info: Average aborted transactions percentage in db ${label:database} over the last five minutes
        to: dba
 
  template: postgres_db_deadlocks_rate
@@ -86,7 +91,8 @@ component: PostgreSQL
     every: 1m
      warn: $this > (($status >= $WARNING)  ? (0) : (10))
     delay: down 15m multiplier 1.5 max 1h
-     info: number of deadlocks detected in db ${label:database} in the last minute
+  summary: PostgreSQL DB ${label:database} deadlocks rate
+     info: Number of deadlocks detected in db ${label:database} in the last minute
        to: dba
 
 # Table alarms
@@ -104,7 +110,8 @@ component: PostgreSQL
      warn: $this < (($status >= $WARNING)  ? (70) : (60))
      crit: $this < (($status == $CRITICAL) ? (60) : (50))
     delay: down 15m multiplier 1.5 max 1h
-     info: average cache hit ratio in db ${label:database} table ${label:table} over the last minute
+  summary: PostgreSQL table ${label:table} db ${label:database} cache hit ratio
+     info: Average cache hit ratio in db ${label:database} table ${label:table} over the last minute
        to: dba
 
  template: postgres_table_index_cache_io_ratio
@@ -120,7 +127,8 @@ component: PostgreSQL
      warn: $this < (($status >= $WARNING)  ? (70) : (60))
      crit: $this < (($status == $CRITICAL) ? (60) : (50))
     delay: down 15m multiplier 1.5 max 1h
-     info: average index cache hit ratio in db ${label:database} table ${label:table} over the last minute
+  summary: PostgreSQL table ${label:table} db ${label:database} index cache hit ratio
+     info: Average index cache hit ratio in db ${label:database} table ${label:table} over the last minute
        to: dba
 
  template: postgres_table_toast_cache_io_ratio
@@ -136,7 +144,8 @@ component: PostgreSQL
      warn: $this < (($status >= $WARNING)  ? (70) : (60))
      crit: $this < (($status == $CRITICAL) ? (60) : (50))
     delay: down 15m multiplier 1.5 max 1h
-     info: average TOAST hit ratio in db ${label:database} table ${label:table} over the last minute
+  summary: PostgreSQL table ${label:table} db ${label:database} toast cache hit ratio
+     info: Average TOAST hit ratio in db ${label:database} table ${label:table} over the last minute
        to: dba
 
  template: postgres_table_toast_index_cache_io_ratio
@@ -152,6 +161,7 @@ component: PostgreSQL
      warn: $this < (($status >= $WARNING)  ? (70) : (60))
      crit: $this < (($status == $CRITICAL) ? (60) : (50))
     delay: down 15m multiplier 1.5 max 1h
+  summary: PostgreSQL table ${label:table} db ${label:database} index toast hit ratio
      info: average index TOAST hit ratio in db ${label:database} table ${label:table} over the last minute
        to: dba
 
@@ -167,7 +177,8 @@ component: PostgreSQL
      warn: $this > (($status >= $WARNING)  ? (60) : (70))
      crit: $this > (($status == $CRITICAL) ? (70) : (80))
     delay: down 15m multiplier 1.5 max 1h
-     info: bloat size percentage in db ${label:database} table ${label:table}
+  summary: PostgreSQL table ${label:table} db ${label:database} bloat size
+     info: Bloat size percentage in db ${label:database} table ${label:table}
        to: dba
 
  template: postgres_table_last_autovacuum_time
@@ -180,7 +191,8 @@ component: PostgreSQL
     units: seconds
     every: 1m
      warn: $this != nan AND $this > (60 * 60 * 24 * 7)
-     info: time elapsed since db ${label:database} table ${label:table} was vacuumed by the autovacuum daemon
+  summary: PostgreSQL table ${label:table} db ${label:database} last autovacuum
+     info: Time elapsed since db ${label:database} table ${label:table} was vacuumed by the autovacuum daemon
        to: dba
 
  template: postgres_table_last_autoanalyze_time
@@ -193,7 +205,8 @@ component: PostgreSQL
     units: seconds
     every: 1m
      warn: $this != nan AND $this > (60 * 60 * 24 * 7)
-     info: time elapsed since db ${label:database} table ${label:table} was analyzed by the autovacuum daemon
+  summary: PostgreSQL table ${label:table} db ${label:database} last autoanalyze
+     info: Time elapsed since db ${label:database} table ${label:table} was analyzed by the autovacuum daemon
        to: dba
 
 # Index alarms
@@ -210,5 +223,6 @@ component: PostgreSQL
      warn: $this > (($status >= $WARNING)  ? (60) : (70))
      crit: $this > (($status == $CRITICAL) ? (70) : (80))
     delay: down 15m multiplier 1.5 max 1h
-     info: bloat size percentage in db ${label:database} table ${label:table} index ${label:index}
+  summary: PostgreSQL table ${label:table} db ${label:database} index bloat size
+     info: Bloat size percentage in db ${label:database} table ${label:table} index ${label:index}
        to: dba