update prometheus server

1 files changed, 48 insertions, 18 deletions

diff --git a/roles/monitoring/grafana/files/dashboard-whawty-nginx-sso.json b/roles/monitoring/grafana/files/dashboard-whawty-nginx-sso.json
index 860a87c2..b6f21f92 100644
--- a/roles/monitoring/grafana/files/dashboard-whawty-nginx-sso.json
+++ b/roles/monitoring/grafana/files/dashboard-whawty-nginx-sso.json
@@ -378,7 +378,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 14
+        "y": 32
       },
       "id": 5,
       "panels": [],
@@ -448,7 +448,7 @@
         "h": 7,
         "w": 12,
         "x": 0,
-        "y": 15
+        "y": 33
       },
       "id": 13,
       "options": {
@@ -579,7 +579,7 @@
         "h": 7,
         "w": 12,
         "x": 12,
-        "y": 15
+        "y": 33
       },
       "id": 14,
       "options": {
@@ -710,7 +710,7 @@
         "h": 6,
         "w": 12,
         "x": 0,
-        "y": 22
+        "y": 40
       },
       "id": 21,
       "options": {
@@ -811,7 +811,7 @@
         "h": 6,
         "w": 12,
         "x": 12,
-        "y": 22
+        "y": 40
       },
       "id": 22,
       "options": {
@@ -850,7 +850,7 @@
         "h": 1,
         "w": 24,
         "x": 0,
-        "y": 28
+        "y": 46
       },
       "id": 2,
       "panels": [],
@@ -951,7 +951,7 @@
         "h": 7,
         "w": 19,
         "x": 0,
-        "y": 29
+        "y": 47
       },
       "id": 1,
       "options": {
@@ -1047,7 +1047,7 @@
         "h": 7,
         "w": 5,
         "x": 19,
-        "y": 29
+        "y": 47
       },
       "id": 3,
       "options": {
@@ -1198,7 +1198,7 @@
         "h": 6,
         "w": 12,
         "x": 0,
-        "y": 36
+        "y": 54
       },
       "id": 23,
       "options": {
@@ -1299,7 +1299,7 @@
         "h": 6,
         "w": 12,
         "x": 12,
-        "y": 36
+        "y": 54
       },
       "id": 24,
       "options": {
@@ -1426,7 +1426,7 @@
         "h": 6,
         "w": 12,
         "x": 0,
-        "y": 42
+        "y": 60
       },
       "id": 25,
       "options": {
@@ -1441,6 +1441,8 @@
           "sort": "none"
         }
       },
+      "repeat": "ldapserver",
+      "repeatDirection": "v",
       "targets": [
         {
           "datasource": {
@@ -1449,7 +1451,7 @@
           },
           "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "increase(whawty_nginx_sso_auth_ldap_requests_total{instance=\"$instance\"}[$__rate_interval])",
+          "expr": "increase(whawty_nginx_sso_auth_ldap_requests_total{instance=\"$instance\", server=~\".*$ldapserver\"}[$__rate_interval])",
           "fullMetaSearch": false,
           "includeNullMetadata": true,
           "instant": false,
@@ -1460,7 +1462,7 @@
           "useBackend": false
         }
       ],
-      "title": "LDAP: Requests",
+      "title": "LDAP: Requests $ldapserver",
       "type": "timeseries"
     },
     {
@@ -1527,7 +1529,7 @@
         "h": 6,
         "w": 12,
         "x": 12,
-        "y": 42
+        "y": 60
       },
       "id": 26,
       "options": {
@@ -1542,6 +1544,7 @@
           "sort": "asc"
         }
       },
+      "repeat": "ldapserver",
       "repeatDirection": "v",
       "targets": [
         {
@@ -1549,15 +1552,19 @@
             "type": "prometheus",
             "uid": "${DS_PROMETHEUS}"
           },
+          "disableTextWrap": false,
           "editorMode": "code",
-          "expr": "whawty_nginx_sso_auth_ldap_request_duration_seconds{instance=\"$instance\"}",
+          "expr": "whawty_nginx_sso_auth_ldap_request_duration_seconds{instance=\"$instance\", server=~\".*$ldapserver\"}",
+          "fullMetaSearch": false,
+          "includeNullMetadata": true,
           "instant": false,
           "legendFormat": "{{ quantile }} Quantile",
           "range": true,
-          "refId": "A"
+          "refId": "A",
+          "useBackend": false
         }
       ],
-      "title": "LDAP: Duration",
+      "title": "LDAP: Duration $ldapserver",
       "type": "timeseries"
     }
   ],
@@ -1611,6 +1618,29 @@
         "skipUrlSync": false,
         "sort": 0,
         "type": "query"
+      },
+      {
+        "current": {},
+        "datasource": {
+          "type": "prometheus",
+          "uid": "${DS_PROMETHEUS}"
+        },
+        "definition": "label_values(whawty_nginx_sso_auth_ldap_requests_total{instance=\"$instance\"},server)",
+        "hide": 0,
+        "includeAll": true,
+        "multi": true,
+        "name": "ldapserver",
+        "options": [],
+        "query": {
+          "qryType": 1,
+          "query": "label_values(whawty_nginx_sso_auth_ldap_requests_total{instance=\"$instance\"},server)",
+          "refId": "PrometheusVariableQueryEditor-VariableQuery"
+        },
+        "refresh": 2,
+        "regex": "/ldaps?://(.*)/",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
       }
     ]
   },
@@ -1622,6 +1652,6 @@
   "timezone": "",
   "title": "whawty nginx-sso",
   "uid": "e745f2f9-9115-49a0-b386-9919bcf566de",
-  "version": 13,
+  "version": 2,
   "weekStart": ""
 }
\ No newline at end of file