A004 databases sizes added

Author: dmius

pghrep/src/main.go

@@ -25,6 +25,7 @@ import (
     "sort"
     "strconv"
     "./orderedmap"
+    "./fmtutils"
 )
 
 var DEBUG bool = false
@@ -152,6 +153,7 @@ func loadTemplates() *template.Template {
     tplFuncMap["Trim"] = Trim
     tplFuncMap["Code"] = Code
     tplFuncMap["Nobr"] = Nobr
+    tplFuncMap["ByteFormat"] = fmtutils.ByteFormat
     templates, err = template.New("").Funcs(tplFuncMap).ParseFiles(allFiles...)
     if err != nil {
         log.Fatal("Can't load templates", err)

pghrep/templates/A004.tpl

@@ -3,13 +3,24 @@
 ## Observations ##
 {{ if .hosts.master }}
 ### Master (`{{.hosts.master}}`) ###
+{{ if (index (index (index .results .hosts.master) "data") "general_info") }}
  Indicator | Value
 -----------|-------
-{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }}
-{{- $value := (index (index (index $.results $.hosts.master) "data") $key) -}}
+{{ range $i, $key := (index (index (index (index .results .hosts.master) "data") "general_info") "_keys") }}
+{{- $value := (index (index (index (index $.results $.hosts.master) "data") "general_info") $key) -}}
 {{ $key }} | {{ Nobr (index $value "value") }}
 {{ end }}
+{{- end -}}
+{{ if (index (index (index .results .hosts.master) "data") "database_sizes") }}
+#### Databases sizes ####
+Database | Size
+---------|------
+{{ range $i, $key := (index (index (index (index .results .hosts.master) "data") "database_sizes") "_keys") }}
+{{- $value := (index (index (index (index $.results $.hosts.master) "data") "database_sizes") $key) -}}
+{{ $key }} | {{ ByteFormat $value 0 }}
 {{ end }}
+{{- end -}}
+{{- end -}}
 {{ if gt (len .hosts.replicas) 0 }}
 ### Replica servers: ###
   {{ range $skey, $host := .hosts.replicas }}

resources/checks/A004_cluster_info.sh

@@ -26,8 +26,11 @@ fi
 ${CHECK_HOST_CMD} "${_PSQL} -f - " <<SQL
 $prepare_sql
 with data as (
-$main_sql
+  $main_sql
+), general_info as (
+  select json_object_agg(data.metric, data) as json from data where data.metric not like '------%'
+), database_sizes as (
+  select json_object_agg(datname, (SELECT pg_database_size(pd.datname))) from pg_database pd
 )
-select json_object_agg(data.metric, data) as json from data where data.metric not like '------%'
+select json_build_object('general_info', (select * from general_info), 'database_sizes', (select * from database_sizes));
 SQL
-