From 7cb4e3d8aa228e3437cf57e33d1ce2b39de9c230 Mon Sep 17 00:00:00 2001 From: ItsDrike Date: Mon, 5 Jul 2021 16:03:52 +0200 Subject: [PATCH] Minor fixes --- blackbox/config/blackbox.yml | 1 - docker-compose.yml | 1 - grafana/config.monitoring | 2 +- grafana/provisioning/datasources/datasource.yml | 1 - prometheus/pinghosts.yaml | 4 ++-- prometheus/prometheus.yml | 8 ++++++-- 6 files changed, 9 insertions(+), 8 deletions(-) diff --git a/blackbox/config/blackbox.yml b/blackbox/config/blackbox.yml index 44ac177..4e94827 100644 --- a/blackbox/config/blackbox.yml +++ b/blackbox/config/blackbox.yml @@ -1,4 +1,3 @@ ---- modules: http_2xx: prober: http diff --git a/docker-compose.yml b/docker-compose.yml index 3b9b278..d04f722 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,3 @@ ---- version: "3.1" volumes: diff --git a/grafana/config.monitoring b/grafana/config.monitoring index 03d1f33..2f2c8a8 100644 --- a/grafana/config.monitoring +++ b/grafana/config.monitoring @@ -1,3 +1,3 @@ -GF_SECURITY_ADMIN_PASSWORD=rNwyUT8u*J8Wd$dRLh +GF_SECURITY_ADMIN_PASSWORD=admin GF_USERS_ALLOW_SIGN_UP=false GF_INSTALL_PLUGINS=flant-statusmap-panel,ae3e-plotly-panel diff --git a/grafana/provisioning/datasources/datasource.yml b/grafana/provisioning/datasources/datasource.yml index 79de57a..dd763c6 100644 --- a/grafana/provisioning/datasources/datasource.yml +++ b/grafana/provisioning/datasources/datasource.yml @@ -1,4 +1,3 @@ ---- apiVersion: 1 # list of datasources that should be deleted from the database diff --git a/prometheus/pinghosts.yaml b/prometheus/pinghosts.yaml index 971bbf3..c4ff59b 100644 --- a/prometheus/pinghosts.yaml +++ b/prometheus/pinghosts.yaml @@ -1,3 +1,3 @@ - targets: # url;humanname;routing;switch - - http://google.com/;google.com - - https://github.com/;github.com + - http://google.com/;Google;external + - https://github.com/;GitHub;external diff --git a/prometheus/prometheus.yml b/prometheus/prometheus.yml index 186c144..a76bcb3 100644 --- a/prometheus/prometheus.yml +++ b/prometheus/prometheus.yml @@ -31,13 +31,17 @@ scrape_configs: - pinghosts.yaml relabel_configs: - source_labels: [__address__] - regex: '(.*);(.*)' # first is the url, thus unique for instance + regex: '(.*);(.*);(.*)' # first is the url, thus unique for instance target_label: instance replacement: $1 - source_labels: [__address__] - regex: '(.*);(.*)' # second is humanname to use in charts + regex: '(.*);(.*);(.*)' # second is humanname to use in charts target_label: humanname replacement: $2 + - source_labels: [__address__] + regex: '(.*);(.*);(.*)' # third specifies external or internal network + target_label: routing + replacement: $3 - source_labels: [instance] target_label: __param_target - target_label: __address__