From 6cd14100e53002280286af048a7dca4e7127ebd3 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Thu, 20 Jun 2024 19:35:10 +0200 Subject: rename new blackbox-exporter metric label from svc_name to svc_instance --- .../grafana/files/dashboard-blackbox/https.json | 26 +++++++++++----------- .../grafana/files/dashboard-blackbox/mqtt.json | 18 +++++++-------- .../grafana/files/dashboard-blackbox/ssh.json | 16 ++++++------- .../exporter/register/filter_plugins/prometheus.py | 2 +- .../register/templates/blackbox/probe.yml.j2 | 2 +- 5 files changed, 32 insertions(+), 32 deletions(-) (limited to 'roles') diff --git a/roles/monitoring/grafana/files/dashboard-blackbox/https.json b/roles/monitoring/grafana/files/dashboard-blackbox/https.json index 0d322f3d..061be3ae 100644 --- a/roles/monitoring/grafana/files/dashboard-blackbox/https.json +++ b/roles/monitoring/grafana/files/dashboard-blackbox/https.json @@ -156,11 +156,11 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "{{ svc_name }}", + "legendFormat": "{{ svc_instance }}", "range": true, "refId": "A" } @@ -282,7 +282,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_success{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_success{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -381,7 +381,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_http_duration_seconds{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_http_duration_seconds{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -486,7 +486,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -585,7 +585,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_http_status_code{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_http_status_code{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -666,7 +666,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_http_version{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_http_version{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "intervalFactor": 1, "range": true, @@ -762,7 +762,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_http_ssl{svc_kind=~\"https?\", svc_name=~\"$target\"}", + "expr": "probe_http_ssl{svc_kind=~\"https?\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -860,7 +860,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_ssl_earliest_cert_expiry{svc_kind=~\"https?\", svc_name=~\"$target\"} - time()", + "expr": "probe_ssl_earliest_cert_expiry{svc_kind=~\"https?\", svc_instance=~\"$target\"} - time()", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -941,7 +941,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_duration_seconds{svc_kind=~\"https?\", svc_name=~\"$target\"})", + "expr": "avg(probe_duration_seconds{svc_kind=~\"https?\", svc_instance=~\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -1023,7 +1023,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=~\"https?\", svc_name=~\"$target\"})", + "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=~\"https?\", svc_instance=~\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -1139,7 +1139,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(probe_success{svc_kind=~\"https?\"},svc_name)", + "definition": "label_values(probe_success{svc_kind=~\"https?\"},svc_instance)", "hide": 0, "includeAll": true, "multi": true, @@ -1147,7 +1147,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(probe_success{svc_kind=~\"https?\"},svc_name)", + "query": "label_values(probe_success{svc_kind=~\"https?\"},svc_instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, diff --git a/roles/monitoring/grafana/files/dashboard-blackbox/mqtt.json b/roles/monitoring/grafana/files/dashboard-blackbox/mqtt.json index 40eddf82..f019677f 100644 --- a/roles/monitoring/grafana/files/dashboard-blackbox/mqtt.json +++ b/roles/monitoring/grafana/files/dashboard-blackbox/mqtt.json @@ -156,11 +156,11 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=~\"mqtt\", svc_name=~\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=~\"mqtt\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "{{ svc_name }}", + "legendFormat": "{{ svc_instance }}", "range": true, "refId": "A" } @@ -282,7 +282,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_success{svc_kind=\"mqtt\", svc_name=~\"$target\"}", + "expr": "probe_success{svc_kind=\"mqtt\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -363,7 +363,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_duration_seconds{svc_kind=\"mqtt\", svc_name=~\"$target\"})", + "expr": "avg(probe_duration_seconds{svc_kind=\"mqtt\", svc_instance=~\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -467,7 +467,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=\"mqtt\", svc_name=~\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=\"mqtt\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -565,7 +565,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_ssl_earliest_cert_expiry{svc_kind=\"mqtt\", svc_name=~\"$target\"} - time()", + "expr": "probe_ssl_earliest_cert_expiry{svc_kind=\"mqtt\", svc_instance=~\"$target\"} - time()", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -647,7 +647,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=\"mqtt\", svc_name=~\"$target\"})", + "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=\"mqtt\", svc_instance=~\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -763,7 +763,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(probe_success{svc_kind=~\"mqtt\"},svc_name)", + "definition": "label_values(probe_success{svc_kind=~\"mqtt\"},svc_instance)", "hide": 0, "includeAll": true, "multi": true, @@ -771,7 +771,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(probe_success{svc_kind=~\"mqtt\"},svc_name)", + "query": "label_values(probe_success{svc_kind=~\"mqtt\"},svc_instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, diff --git a/roles/monitoring/grafana/files/dashboard-blackbox/ssh.json b/roles/monitoring/grafana/files/dashboard-blackbox/ssh.json index 93c3206f..af8d31e1 100644 --- a/roles/monitoring/grafana/files/dashboard-blackbox/ssh.json +++ b/roles/monitoring/grafana/files/dashboard-blackbox/ssh.json @@ -156,11 +156,11 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=\"ssh\", svc_name=~\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=\"ssh\", svc_instance=~\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, - "legendFormat": "{{ svc_name }}", + "legendFormat": "{{ svc_instance }}", "range": true, "refId": "A" } @@ -282,7 +282,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_success{svc_kind=\"ssh\", svc_name=\"$target\"}", + "expr": "probe_success{svc_kind=\"ssh\", svc_instance=\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -363,7 +363,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_duration_seconds{svc_kind=\"ssh\", svc_name=\"$target\"})", + "expr": "avg(probe_duration_seconds{svc_kind=\"ssh\", svc_instance=\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -445,7 +445,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=\"ssh\", svc_name=\"$target\"})", + "expr": "avg(probe_dns_lookup_time_seconds{svc_kind=\"ssh\", svc_instance=\"$target\"})", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -549,7 +549,7 @@ "uid": "${DS_PROMETHEUS}" }, "editorMode": "code", - "expr": "probe_duration_seconds{svc_kind=\"ssh\", svc_name=\"$target\"}", + "expr": "probe_duration_seconds{svc_kind=\"ssh\", svc_instance=\"$target\"}", "format": "time_series", "interval": "$interval", "intervalFactor": 1, @@ -665,7 +665,7 @@ "type": "prometheus", "uid": "${DS_PROMETHEUS}" }, - "definition": "label_values(probe_success{svc_kind=\"ssh\"},svc_name)", + "definition": "label_values(probe_success{svc_kind=\"ssh\"},svc_instance)", "hide": 0, "includeAll": true, "multi": true, @@ -673,7 +673,7 @@ "options": [], "query": { "qryType": 1, - "query": "label_values(probe_success{svc_kind=\"ssh\"},svc_name)", + "query": "label_values(probe_success{svc_kind=\"ssh\"},svc_instance)", "refId": "PrometheusVariableQueryEditor-VariableQuery" }, "refresh": 1, diff --git a/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py b/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py index 27ba29e6..9c99113d 100644 --- a/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py +++ b/roles/monitoring/prometheus/exporter/register/filter_plugins/prometheus.py @@ -7,7 +7,7 @@ from ansible import errors _multitarget_id_map_ = { - "blackbox/probe": (lambda vars, config: (vars['inventory_hostname'], "%s-%s" % (config['svc_kind'], config['svc_name']))), + "blackbox/probe": (lambda vars, config: (vars['inventory_hostname'], "%s-%s" % (config['svc_kind'], config['svc_instance']))), } diff --git a/roles/monitoring/prometheus/exporter/register/templates/blackbox/probe.yml.j2 b/roles/monitoring/prometheus/exporter/register/templates/blackbox/probe.yml.j2 index 6319c1c5..fbbce7df 100644 --- a/roles/monitoring/prometheus/exporter/register/templates/blackbox/probe.yml.j2 +++ b/roles/monitoring/prometheus/exporter/register/templates/blackbox/probe.yml.j2 @@ -2,7 +2,7 @@ labels: instance: '{{ target.instance }}' svc_kind: '{{ target.config.svc_kind }}' - svc_name: '{{ target.config.svc_name }}' + svc_instance: '{{ target.config.svc_instance }}' __param_target: '{{ target.config.target }}' __param_module: '{{ target.config.module }}' {% if 'hostname' in target.config %} -- cgit v1.2.3