Minor fixes

blackbox/config/blackbox.yml

@@ -1,4 +1,3 @@
----
 modules:
   http_2xx:
     prober: http

docker-compose.yml

@@ -1,4 +1,3 @@
----
 version: "3.1"
 
 volumes:

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

grafana/provisioning/datasources/datasource.yml

@@ -1,4 +1,3 @@
----
 apiVersion: 1
 
 # list of datasources that should be deleted from the database

prometheus/pinghosts.yaml

@@ -1,3 +1,3 @@
 - targets: # url;humanname;routing;switch
-    - http://google.com/;google.com
+    - http://google.com/;Google;external
-    - https://github.com/;github.com
+    - https://github.com/;GitHub;external

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__