Merge pull request #139 from postgres-ai/dmius-g003-improve

G003 reset age added

Author: dmius

pghrep/templates/G003.tpl

@@ -15,9 +15,9 @@ Setting name | Value | Unit
 {{ range $key, $value := (index (index (index .results .hosts.master) "data") "locks") }}{{$key}}|{{ $value.setting}}|{{ $value.unit }}
 {{ end }}
 #### Databases data ####
-Database | Conflicts | Deadlocks | Stats_reset
--------------|-------|-----------|-------------
-{{ range $key, $value := (index (index (index .results .hosts.master) "data") "dbsdata") }}{{$key}}|{{ $value.conflicts}}|{{ $value.deadlocks }}|{{ $value.stats_reset }}
+Database | Conflicts | Deadlocks | Stats reset at | Stat reset
+-------------|-------|-----------|----------------|------------
+{{ range $key, $value := (index (index (index .results .hosts.master) "data") "databases_stat") }}{{$key}}|{{ $value.conflicts}}|{{ $value.deadlocks }}|{{ $value.stats_reset }}|{{ $value.stats_reset_age }}
 {{ end }}
 {{ if gt (len .hosts.replicas) 0 }}
 ### Slave DB servers: ###
@@ -35,9 +35,9 @@ Setting name | Value | Unit
 {{ range $key, $value := (index (index (index $.results $host) "data") "locks") }}{{$key}}|{{ $value.setting}}|{{ $value.unit }}
 {{ end }}
 #### Databases data ####
-Database | Conflicts | Deadlocks | Stats_reset
--------------|-------|-----------|-------------
-{{ range $key, $value := (index (index (index $.results $host) "data") "dbsdata") }}{{$key}}|{{ $value.conflicts}}|{{ $value.deadlocks }}|{{ $value.stats_reset }}
+Database | Conflicts | Deadlocks | Stats reset at | Stat reset
+-------------|-------|-----------|----------------|------------
+{{ range $key, $value := (index (index (index $.results $host) "data") "databases_stat") }}{{$key}}|{{ $value.conflicts}}|{{ $value.deadlocks }}|{{ $value.stats_reset }}|{{ $value.stats_reset_age }}
 {{ end }}
 {{ else }}
 No data

resources/checks/G003_timeouts_locks.sh

@@ -4,8 +4,10 @@ with timeouts as (
   select json_object_agg(s.name,s ) from pg_settings s where name in ('statement_timeout', 'idle_in_transaction_session_timeout', 'authentication_timeout')
 ), locks as (
   select json_object_agg(s.name,s ) from pg_settings s where name in ('deadlock_timeout', 'lock_timeout', 'max_locks_per_transaction', 'max_pred_locks_per_page', 'max_pred_locks_per_relation', 'max_pred_locks_per_transaction')
+), databases_stat as (
+  select *, ((now() - sd.stats_reset)::interval(0)::text) as stats_reset_age from pg_stat_database sd where datname in (SELECT datname FROM pg_database WHERE datistemplate = false)
 ), dbs_data as (
-  select json_object_agg(sd.datname, sd) from pg_stat_database sd where datname in (SELECT datname FROM pg_database WHERE datistemplate = false)
+  select json_object_agg(sd.datname, sd) from databases_stat sd
 )
-select json_build_object('timeouts', (select * from timeouts), 'locks', (select * from locks), 'dbsdata', (select * from dbs_data));
-SQL
+select json_build_object('timeouts', (select * from timeouts), 'locks', (select * from locks), 'databases_stat', (select * from dbs_data));
+SQL