From 77f23d775a97c541516d436e4a0c9402ae520f9f Mon Sep 17 00:00:00 2001 From: Mike Lang Date: Wed, 6 Nov 2019 06:56:59 -0800 Subject: [PATCH] overview dashboard: Show offending instance in error log rate graph --- monitoring/dashboards/overview.json | 4 ++-- monitoring/dashboards/overview.jsonnet | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/monitoring/dashboards/overview.json b/monitoring/dashboards/overview.json index dcb6229..3e644f5 100644 --- a/monitoring/dashboards/overview.json +++ b/monitoring/dashboards/overview.json @@ -353,9 +353,9 @@ "targets": [ { "intervalFactor": 1, - "expr": "sum(irate(log_count_total{level!=\"INFO\"}[2m])) by (job, level, module, function) > 0\n", + "expr": "sum(irate(log_count_total{level!=\"INFO\"}[2m])) by (instance, job, level, module, function) > 0\n", "refId": "A", - "legendFormat": "{{job}} {{level}}({{module}}:{{function}})", + "legendFormat": "{{instance}} {{job}} {{level}}({{module}}:{{function}})", "format": "time_series" } ], diff --git a/monitoring/dashboards/overview.jsonnet b/monitoring/dashboards/overview.jsonnet index b38eede..55084cd 100644 --- a/monitoring/dashboards/overview.jsonnet +++ b/monitoring/dashboards/overview.jsonnet @@ -122,8 +122,8 @@ grafana.dashboard({ axis: {min: 0, label: "logs / sec"}, display: "bars", expressions: { - "{{job}} {{level}}({{module}}:{{function}})": ||| - sum(irate(log_count_total{level!="INFO"}[2m])) by (job, level, module, function) > 0 + "{{instance}} {{job}} {{level}}({{module}}:{{function}})": ||| + sum(irate(log_count_total{level!="INFO"}[2m])) by (instance, job, level, module, function) > 0 |||, }, },