Bug fix and readme expansion

wifiplug · Aug 17, 2018 · 9fca8b2 · 9fca8b2
1 parent dd9b30a
commit 9fca8b2
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 6 deletions.
diff --git a/dist/README.md b/dist/README.md
@@ -7,10 +7,14 @@
 
 This repository provides a Grafana datasource plugin for working with the WIFIPLUG platform.
 
+[![Demonstration](https://s3-eu-west-1.amazonaws.com/assets.wifiplug.co.uk/github/grafana-wifiplug-1.png)](https://s3-eu-west-1.amazonaws.com/assets.wifiplug.co.uk/github/grafana-wifiplug-1.png)
+
 ## Getting Started
 
 To get started you need a personal API Key & API Secret.
 
+Please note that the API is subject to rate limits and excessive usage my be throttled, contact us directly if you believe this may be a problem or if you require a billed API plan.
+
 ## Contributing
 
 We welcome any pull requests or bug reports, please try and keep to the existing style conventions and comment any additions. The issues section is only for problems related to the Grafana datasource, other issues will be closed.
diff --git a/dist/datasource.js b/dist/datasource.js
diff --git a/dist/datasource.js.map b/dist/datasource.js.map
diff --git a/dist/datasource.ts b/dist/datasource.ts
@@ -30,6 +30,9 @@ export default class WifiPlugDatasource {
       let deviceUuid = targetComponents[0];
       let serviceUuid = targetComponents[1];
 
+      if (targetComponents.length == 0 || (target.device_requirement == null || target.device_requirement == ""))
+          continue;
+
       if (target.device_requirement == "consumption") {
         promises[`${target.target}#consumption`] = this.backendSrv.datasourceRequest({
             url: `${url}/wifiplug-v1.0/device/${deviceUuid}/service/${serviceUuid}/energy/consumption/historic?date_from=${dateFrom}Z&date_to=${dateTo}Z&grouping=hour`,

diff --git a/dist/img/dashboard_example.png b/dist/img/dashboard_example.png
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -4,7 +4,7 @@
   "id": "wifiplug-datasource",
 
   "info": {
-    "description": "Provides a datasource for WIFIPLUG energy consumption information",
+    "description": "Provides a datasource for WIFIPLUG energy data",
     "author": {
       "name": "WIFIPLUG",
       "url": "https://wifiplug.co.uk"
@@ -18,10 +18,13 @@
       {"name": "Project site", "url": "https://github.com/wifiplug/grafana-wifiplug"},
       {"name": "Company site", "url": "https://wifiplug.co.uk"}
     ],
-    "version": "0.1.0",
-    "updated": "2018-08-13"
+    "version": "0.1.0"
   },
 
+  "screenshots": [
+    {"name": "Example Dashboard", "path": "img/dashboard_example.png"}
+  ],
+
   "dependencies": {
     "grafanaVersion": "4.5.x",
     "plugins": [ ]
@@ -34,7 +37,7 @@
       "url": "https://api.wifiplug.co.uk/v1.0",
       "headers": [
         {"name": "X-API-Key", "content": "{{.JsonData.apiKey}}"},
-        {"name": "X-API-Secret", "content": "{{.JsonData.apiSecret}}"},
+        {"name": "X-API-Secret", "content": "{{.SecureJsonData.apiSecret}}"},
         {"name": "X-API-Client", "content": "grafana-ds/1.0"}
       ]
     }

diff --git a/src/plugin.json b/src/plugin.json
@@ -37,7 +37,7 @@
       "url": "https://api.wifiplug.co.uk/v1.0",
       "headers": [
         {"name": "X-API-Key", "content": "{{.JsonData.apiKey}}"},
-        {"name": "X-API-Secret", "content": "{{.JsonData.apiSecret}}"},
+        {"name": "X-API-Secret", "content": "{{.SecureJsonData.apiSecret}}"},
         {"name": "X-API-Client", "content": "grafana-ds/1.0"}
       ]
     }