From 48d6d7454766fc58f4476ef791b7f099e4967067 Mon Sep 17 00:00:00 2001 From: bergquist Date: Thu, 3 Dec 2020 22:38:28 +0100 Subject: [PATCH 1/2] make status code label overrideable Signed-off-by: bergquist --- grafana-builder/grafana.libsonnet | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/grafana-builder/grafana.libsonnet b/grafana-builder/grafana.libsonnet index cf3a116fc..d973e5d8c 100644 --- a/grafana-builder/grafana.libsonnet +++ b/grafana-builder/grafana.libsonnet @@ -367,7 +367,7 @@ }, ], - qpsPanel(selector):: { + qpsPanel(selector, statusLabelName='status_code'):: { aliasColors: { '1xx': '#EAB839', '2xx': '#7EB26D', @@ -380,8 +380,8 @@ targets: [ { expr: 'sum by (status) (label_replace(label_replace(rate(' + selector + '[$__interval]),' - + ' "status", "${1}xx", "status_code", "([0-9]).."),' - + ' "status", "${1}", "status_code", "([a-z]+)"))', + + ' "status", "${1}xx", "' + statusLabelName + '", "([0-9]).."),' + + ' "status", "${1}", "' + statusLabelName + '", "([a-z]+)"))', format: 'time_series', intervalFactor: 2, legendFormat: '{{status}}', From beff80ee4897b4fd5adff51df3f8ec86346c3be4 Mon Sep 17 00:00:00 2001 From: bergquist Date: Mon, 7 Dec 2020 08:44:48 +0100 Subject: [PATCH 2/2] use stringformater Signed-off-by: bergquist --- grafana-builder/grafana.libsonnet | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/grafana-builder/grafana.libsonnet b/grafana-builder/grafana.libsonnet index d973e5d8c..d499c6298 100644 --- a/grafana-builder/grafana.libsonnet +++ b/grafana-builder/grafana.libsonnet @@ -379,9 +379,13 @@ }, targets: [ { - expr: 'sum by (status) (label_replace(label_replace(rate(' + selector + '[$__interval]),' - + ' "status", "${1}xx", "' + statusLabelName + '", "([0-9]).."),' - + ' "status", "${1}", "' + statusLabelName + '", "([a-z]+)"))', + expr: + ||| + sum by (status) ( + label_replace(label_replace(rate(%s[$__interval]), + "status", "${1}xx", "%s", "([0-9]).."), + "status", "${1}", "%s", "([a-z]+)")) + ||| % [selector, statusLabelName, statusLabelName], format: 'time_series', intervalFactor: 2, legendFormat: '{{status}}',