Update dashboard variable with a wildcard for host

RafhaanShah · Apr 5, 2020 · ad30528 · ad30528
1 parent 28390c7
commit ad30528
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -97,6 +97,7 @@
 - The number of graphs and the refresh rate will affect the amount of CPU usage by the Graphite docker container.
 - SD cards used in Raspberry Pi's are not really meant to be [constantly written](https://domoticproject.com/extending-life-raspberry-pi-sd-card/) to, and even though Graphite is very efficient with it's storage, you may want to look into booting off an SSD or setting the Graphite storage [volume](https://docs.docker.com/compose/compose-file/#volumes) (line 12 of _docker-compose.yaml_) to be on an external drive.
 - If you are using a small screen (like a 3.5" Raspberry Pi Screen), you may need to adjust the zoom level of the dashboard in your browser to be able to fit more graphs at once.
+- For monitoring more than 1 PC, you need to copy the _Plugin curl_xml_ section in _collectd.conf_ (line 20 to 34) and change the _Host_ line in both places to be different. This will cause the panels in the dashboard to show data for all of the PC's together, so you may want to edit the [query variable](https://grafana.com/docs/grafana/latest/reference/templating/#adding-a-variable) to be for a specific host, and create a new variable for each PC.
 
 ### Troubleshooting
 
@@ -106,6 +107,7 @@
 - Check if collectd is storing anything in Graphite: un-comment lines 8 and 9 of _docker-compose.yaml_ (delete the # and ONE space, double check your indentation [here](http://www.yamllint.com/)) and run _docker-compose up -d_ again. Visit _http://192.168.1.20:8026_ (where 192.168.1.20 is the local IP address of the PC you are running the monitoring services on). You should see the web interface for Graphite, on the left menu click metrics, you should see _collectd._ Clicking through it should show _pc_ -> _curl-xml-afterburner_ -> and the monitors you enabled.
 - If there is no data, double check your configuration in _collectd.conf_, you can also try changing the _'udp'_ on line 40 to _'tcp'_.
 - Verify the data source in Grafana: click the cog on the left for settings. On the data sources page there should be an entry for _grAfterburner-Graphite_. Click on this and click save and test. It should say '_Data source is working_'. If not, then it is having a problem connecting to Graphite, check that the Graphite container is running and the URL is _http://grafterburner-graphite:80_.
+- Try adding a panel to the Grafana dashboard and seeing if manually entering a query works. Open the dashboard, click 'add panel' on the top right, click 'add query', choose 'grAfterburner-Graphite' as the data source (or the one you set up if you added a new one), click 'select metric' under query 'A', next to 'series', and 'collectd' should show up there. Click on that and keep adding bits to the query, these should show up in the same order as they did in the Graphite web interface: _collectd_ -> _pc_ -> _curl-xml-afterburner_ -> and the monitors. Select any monitor and see if it shows some data in the query.
 - Check the monitored metrics you set up in MSI Afterburner during step 1, the default provided dashboard uses: GPU temperature, GPU usage, Memory usage, Core clock, Memory clock, GPU voltage, Fan speed, Fan speed 2, Fan tachometer, Fan tachometer 2, Temp limit, Power limit, Voltage limit, No load limit. CPU temperature, CPU usage, CPU clock, CPU power, RAM usage, Framerate, Frametime. You do not need to have all these, and you can make your own dashboards, but the one that is already set up uses these metrics.
 - Check the [logs](https://docs.docker.com/config/containers/logging/) of the docker containers to see if there are any log messages that may help.
 

diff --git a/dashboard-rpi.json b/dashboard-rpi.json
@@ -12,7 +12,7 @@
       "name": "VAR_AFTERBURNER",
       "type": "constant",
       "label": "CollectD Metric Prefix",
-      "value": "collectd.pc.curl-xml-afterburner",
+      "value": "collectd.*.curl-xml-afterburner",
       "description": ""
     }
   ],
@@ -543,5 +543,5 @@
   "variables": {
     "list": []
   },
-  "version": 1
+  "version": 2
 }
diff --git a/dashboard.json b/dashboard.json
@@ -12,7 +12,7 @@
       "name": "VAR_AFTERBURNER",
       "type": "constant",
       "label": "CollectD Metric Prefix",
-      "value": "collectd.pc.curl-xml-afterburner",
+      "value": "collectd.*.curl-xml-afterburner",
       "description": ""
     }
   ],
@@ -848,8 +848,7 @@
     {
       "aliasColors": {
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -951,8 +950,7 @@
         "GPU Power": "blue",
         "RAM": "orange",
         "VRAM": "blue",
-        "Voltage": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "Voltage": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1062,8 +1060,7 @@
         "Fan 2 Speed": "blue",
         "Fan 2 rpm": "orange",
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1185,8 +1182,7 @@
         "GPU": "orange",
         "GPU Power": "blue",
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1351,5 +1347,5 @@
   "variables": {
     "list": []
   },
-  "version": 1
+  "version": 2
 }
diff --git a/grafana/dashboards/msi-afterburner-rpi.json b/grafana/dashboards/msi-afterburner-rpi.json
@@ -444,19 +444,19 @@
       },
       {
         "current": {
-          "text": "collectd.pc.curl-xml-afterburner",
-          "value": "collectd.pc.curl-xml-afterburner"
+          "text": "collectd.*.curl-xml-afterburner",
+          "value": "collectd.*.curl-xml-afterburner"
         },
         "hide": 2,
         "label": "CollectD Metric Prefix",
         "name": "afterburner",
         "options": [
           {
-            "text": "collectd.pc.curl-xml-afterburner",
-            "value": "collectd.pc.curl-xml-afterburner"
+            "text": "collectd.*.curl-xml-afterburner",
+            "value": "collectd.*.curl-xml-afterburner"
           }
         ],
-        "query": "collectd.pc.curl-xml-afterburner",
+        "query": "collectd.*.curl-xml-afterburner",
         "skipUrlSync": false,
         "type": "constant"
       }
@@ -489,5 +489,5 @@
   "variables": {
     "list": []
   },
-  "version": 1
+  "version": 2
 }
diff --git a/grafana/dashboards/msi-afterburner.json b/grafana/dashboards/msi-afterburner.json
@@ -798,8 +798,7 @@
     {
       "aliasColors": {
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -901,8 +900,7 @@
         "GPU Power": "blue",
         "RAM": "orange",
         "VRAM": "blue",
-        "Voltage": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "Voltage": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1012,8 +1010,7 @@
         "Fan 2 Speed": "blue",
         "Fan 2 rpm": "orange",
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1135,8 +1132,7 @@
         "GPU": "orange",
         "GPU Power": "blue",
         "RAM": "orange",
-        "VRAM": "blue",
-        "collectd.pc.curl-xml-afterburner.gauge-RAM_usage": "orange"
+        "VRAM": "blue"
       },
       "bars": false,
       "dashLength": 10,
@@ -1256,19 +1252,19 @@
       },
       {
         "current": {
-          "text": "collectd.pc.curl-xml-afterburner",
-          "value": "collectd.pc.curl-xml-afterburner"
+          "text": "collectd.*.curl-xml-afterburner",
+          "value": "collectd.*pc.curl-xml-afterburner"
         },
         "hide": 2,
         "label": "CollectD Metric Prefix",
         "name": "afterburner",
         "options": [
           {
-            "text": "collectd.pc.curl-xml-afterburner",
-            "value": "collectd.pc.curl-xml-afterburner"
+            "text": "collectd.*.curl-xml-afterburner",
+            "value": "collectd.*.curl-xml-afterburner"
           }
         ],
-        "query": "collectd.pc.curl-xml-afterburner",
+        "query": "collectd.*.curl-xml-afterburner",
         "skipUrlSync": false,
         "type": "constant"
       }
@@ -1301,5 +1297,5 @@
   "variables": {
     "list": []
   },
-  "version": 1
+  "version": 2
 }