From ab81dbbbfa4678440336752fb5ed200f7fea0781 Mon Sep 17 00:00:00 2001
From: Gil Hoggarth <gil.hoggarth@bl.uk>
Date: Wed, 10 Jun 2020 14:58:40 +0100
Subject: [PATCH] datasource for fc and solr log graph

---
 .../provisioning/dashboards/wa_servers.json   | 98 +++++++++++++++++--
 .../datasources/frequent_crawl.yaml           | 13 +++
 2 files changed, 104 insertions(+), 7 deletions(-)
 create mode 100644 monitor/grafana/provisioning/datasources/frequent_crawl.yaml

diff --git a/monitor/grafana/provisioning/dashboards/wa_servers.json b/monitor/grafana/provisioning/dashboards/wa_servers.json
index 142559d..6f60c25 100644
--- a/monitor/grafana/provisioning/dashboards/wa_servers.json
+++ b/monitor/grafana/provisioning/dashboards/wa_servers.json
@@ -23,6 +23,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 1,
       "gridPos": {
         "h": 6,
@@ -208,6 +209,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 0,
       "gridPos": {
         "h": 6,
@@ -298,6 +300,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 0,
       "gridPos": {
         "h": 6,
@@ -387,6 +390,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 0,
       "gridPos": {
         "h": 6,
@@ -473,24 +477,100 @@
       }
     },
     {
-      "content": "",
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": null,
+      "fill": 1,
+      "fillGradient": 0,
       "gridPos": {
         "h": 6,
         "w": 12,
         "x": 12,
         "y": 12
       },
+      "hiddenSeries": false,
       "id": 18,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
       "links": [],
-      "mode": "markdown",
-      "title": "",
-      "type": "text"
+      "nullPointMode": "null",
+      "options": {
+        "dataLinks": []
+      },
+      "percentage": false,
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "expr": "mtail_solr_loglevel_count{loglevel=\"WARN\"} OR mtail_solr_loglevel_count{loglevel=\"ERROR\"}",
+          "interval": "",
+          "legendFormat": "",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeFrom": null,
+      "timeRegions": [],
+      "timeShift": null,
+      "title": "Solr node errors & warnings",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "buckets": null,
+        "mode": "time",
+        "name": null,
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": true
+        },
+        {
+          "format": "short",
+          "label": null,
+          "logBase": 1,
+          "max": null,
+          "min": null,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false,
+        "alignLevel": null
+      }
     },
     {
       "aliasColors": {},
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 0,
       "gridPos": {
         "h": 6,
@@ -579,6 +659,7 @@
       "bars": false,
       "dashLength": 10,
       "dashes": false,
+      "datasource": null,
       "fill": 0,
       "gridPos": {
         "h": 6,
@@ -664,14 +745,14 @@
     }
   ],
   "refresh": "1m",
-  "schemaVersion": 16,
+  "schemaVersion": 22,
   "style": "dark",
   "tags": [],
   "templating": {
     "list": []
   },
   "time": {
-    "from": "now-1h",
+    "from": "now-2d",
     "to": "now"
   },
   "timepicker": {
@@ -702,5 +783,8 @@
   "timezone": "",
   "title": "WA Servers",
   "uid": "wase",
-  "version": 1
+  "variables": {
+    "list": []
+  },
+  "version": 10
 }
diff --git a/monitor/grafana/provisioning/datasources/frequent_crawl.yaml b/monitor/grafana/provisioning/datasources/frequent_crawl.yaml
new file mode 100644
index 0000000..82a703c
--- /dev/null
+++ b/monitor/grafana/provisioning/datasources/frequent_crawl.yaml
@@ -0,0 +1,13 @@
+# Instances of grafana will only update datasource configurations
+# for apiVersion numbers of same or lower. Thus, a new lower number
+# will not affect higher number configuration settings.
+# Typically BLUKWA keep this set to 1
+apiVersion: 1
+
+datasources:
+  - name: 'Frequent Crawler 05 Embedded Prometheus'
+    type: prometheus
+    access: proxy
+    orgId: 1
+    url: http://192.168.45.15:9191
+    isDefault: false