A005, F001, F002 templates fixed

Author: dmius

pghrep/templates/A005.tpl

@@ -3,15 +3,20 @@
 ## Observations ##
 
 ### Master (`{{.hosts.master}}`) ###
-Extension name | Installed version | Default version | Is old
----------------|-------------------|-----------------|--------
-{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }}
-{{- $value := (index (index (index $.results $.hosts.master) "data") $key) -}}
-{{ $key }} | {{ $value.installed_version }} | {{ $value.default_version }} | {{ $value.is_old }}
-{{ end }}
+
+Database | Extension name | Installed version | Default version | Is old
+---------|----------------|-------------------|-----------------|--------
+{{ range $d, $db := (index (index (index .results .hosts.master) "data") "_keys") -}}
+{{- $dbData := (index (index (index $.results $.hosts.master) "data") $db) -}}
+{{- range $de, $dbext := (index $dbData "_keys") -}}
+{{- $extData := (index $dbData $dbext) -}}
+{{ $db }} | {{ $dbext }} | {{ $extData.installed_version }} | {{ $extData.default_version }} | {{ $extData.is_old }}
+{{ end -}}
+{{ end -}}
+
+{{/* force empty line */}}
 
 ## Conclusions ##
 
 
 ## Recommendations ##
-

pghrep/templates/F001.tpl

@@ -5,7 +5,9 @@
 ### Master (`{{.hosts.master}}`) ###
  Table | Size | Extra | Bloat | Live | Last vacuum
 -------|------|-------|-------|------|-------------
-{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }}{{ $key }}{{ $value := (index (index (index $.results $.hosts.master) "data") $key) }} | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ if (index $value "Last Vaccuum") }} {{ ( index $value "Last Vaccuum") }} {{ end }}
+{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }}
+{{- $value := (index (index (index $.results $.hosts.master) "data") $key) -}}
+{{ $key }} | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ if (index $value "Last Vaccuum") }} {{ ( index $value "Last Vaccuum") }} {{ end }}
 {{ end }}
 
 {{ if gt (len .hosts.replicas) 0 }}
@@ -15,7 +17,9 @@
     {{ if (index $.results $host) }}
  Table | Size | Extra | Bloat | Live | Last vacuum
 -------|------|-------|-------|------|-------------
-{{ range $i, $key := (index (index (index $.results $host) "data") "_keys") }}{{ $key }}{{ $value := (index (index (index $.results $host) "data") $key) }} | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ if (index $value "Last Vaccuum") }} {{ ( index $value "Last Vaccuum") }} {{ end }}
+{{ range $i, $key := (index (index (index $.results $host) "data") "_keys") }}
+{{- $value := (index (index (index $.results $host) "data") $key) -}}
+{{ $key }} | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ if (index $value "Last Vaccuum") }} {{ ( index $value "Last Vaccuum") }} {{ end }}
 {{ end }}
 {{- else -}}
 No data

pghrep/templates/F002.tpl

@@ -5,7 +5,10 @@
 ### Master (`{{.hosts.master}}`) ###
  Index (Table) | Size | Extra | Bloat | Live | Fill factor
 ---------------|------|-------|-------|------|-------------
-{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }} {{ $tableIndex := Split $key "\n" }} {{ $table := Trim (index $tableIndex 1) " ()"}}{{ (index $tableIndex 0) }} ({{ $table }}){{ $value := (index (index (index $.results $.hosts.master) "data") $key) }} | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ ( index $value "fillfactor") }}
+{{ range $i, $key := (index (index (index .results .hosts.master) "data") "_keys") }}
+{{- $value := (index (index (index $.results $.hosts.master) "data") $key) -}}
+{{- $tableIndex := Split $key "\n" -}}
+{{ $table := Trim (index $tableIndex 1) " ()"}}{{ (index $tableIndex 0) }} ({{ $table }}) | {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ ( index $value "fillfactor") }}
 {{ end }}
 
 {{ if gt (len .hosts.replicas) 0 }}
@@ -15,7 +18,10 @@
     {{ if (index $.results $host) }}
  Index (Table) | Size | Extra | Bloat | Live | Fill factor
 ---------------|------|-------|-------|------|-------------
-{{ range $i, $key := (index (index (index $.results $host) "data") "_keys") }} {{ $tableIndex := Split $key "\n" }} {{ $table := Trim (index $tableIndex 1) " ()"}}{{ (index $tableIndex 0) }} ({{ $table }}) {{ $value := (index (index (index $.results $host) "data") $key) }}| {{ ( index $value "Size") }}{{ $value := (index (index (index $.results $host) "data") $key) }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ ( index $value "fillfactor") }}
+{{ range $i, $key := (index (index (index $.results $host) "data") "_keys") }}
+{{- $value := (index (index (index $.results $host) "data") $key) -}}
+{{- $tableIndex := Split $key "\n" -}}
+{{ $table := Trim (index $tableIndex 1) " ()"}}{{ (index $tableIndex 0) }} ({{ $table }}) {{ $value := (index (index (index $.results $host) "data") $key) }}| {{ ( index $value "Size") }} | {{ ( index $value "Extra") }} | {{ ( index $value "Bloat") }} | {{ ( index $value "Live") }} | {{ ( index $value "fillfactor") }}
 {{ end }}
 {{- else -}}
 No data