From 9286fe55dd9dd19325a14250402455f1655f948b Mon Sep 17 00:00:00 2001 From: Brian Brazil Date: Wed, 22 Jul 2015 17:20:14 +0100 Subject: [PATCH] Update node disk console for new filesystem labels. --- consoles/node-disk.html | 6 +++--- consoles/node-overview.html | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/consoles/node-disk.html b/consoles/node-disk.html index 64fefa9be..9ccdb0de4 100644 --- a/consoles/node-disk.html +++ b/consoles/node-disk.html @@ -27,10 +27,10 @@ {{ define "roughlyNearZero" }} {{ if gt .1 . }}~0{{ else }}{{ printf "%.1f" . }}{{ end }} {{ end }} -{{ range printf "node_filesystem_size{job='node',instance='%s'}" .Params.instance | query | sortByLabel "filesystem" }} +{{ range printf "node_filesystem_size{job='node',instance='%s'}" .Params.instance | query | sortByLabel "mountpoint" }} - {{ .Labels.filesystem }} - {{ template "prom_query_drilldown" (args (printf "100 - node_filesystem_free{job='node',instance='%s',filesystem='%s'} / node_filesystem_size{job='node'} * 100" .Labels.instance .Labels.filesystem) "%" "roughlyNearZero") }} + {{ .Labels.mountpoint }} + {{ template "prom_query_drilldown" (args (printf "100 - node_filesystem_free{job='node',instance='%s',mountpoint='%s'} / node_filesystem_size{job='node'} * 100" .Labels.instance .Labels.mountpoint) "%" "roughlyNearZero") }} {{ end }} diff --git a/consoles/node-overview.html b/consoles/node-overview.html index 87bef018b..0c981e28c 100644 --- a/consoles/node-overview.html +++ b/consoles/node-overview.html @@ -53,10 +53,10 @@ {{ define "roughlyNearZero" }} {{ if gt .1 . }}~0{{ else }}{{ printf "%.1f" . }}{{ end }} {{ end }} -{{ range printf "node_filesystem_size{job='node',instance='%s'}" .Params.instance | query | sortByLabel "filesystem" }} +{{ range printf "node_filesystem_size{job='node',instance='%s'}" .Params.instance | query | sortByLabel "mountpoint" }} - {{ .Labels.filesystem }} - {{ template "prom_query_drilldown" (args (printf "100 - node_filesystem_free{job='node',instance='%s',filesystem='%s'} / node_filesystem_size{job='node'} * 100" .Labels.instance .Labels.filesystem) "%" "roughlyNearZero") }} + {{ .Labels.mountpoint }} + {{ template "prom_query_drilldown" (args (printf "100 - node_filesystem_free{job='node',instance='%s',mountpoint='%s'} / node_filesystem_size{job='node'} * 100" .Labels.instance .Labels.mountpoint) "%" "roughlyNearZero") }} {{ end }}