Merge pull request #37 from grafana/20190611_fix_plugin_id

fix plugin name

.circleci/config.yml

@@ -17,7 +17,7 @@ aliases:
       only: master
 
 defaults: &defaults
-  working_directory: ~/influxdb-flux-datasource
+  working_directory: ~/grafana-influxdb-flux-datasource
   docker:
     - image: circleci/node:10.15.3-stretch
 
@@ -32,7 +32,7 @@ jobs:
       - run:
           name: Build
           command: |
-            DATASOURCE_NAME=influxdb-flux-datasource
+            DATASOURCE_NAME=grafana-influxdb-flux-datasource
             yarn install --pure-lockfile --no-progress
             yarn build
             sudo apt-get install jq
@@ -90,7 +90,7 @@ jobs:
           path: coverage
 
   publish-github-release:
-    working_directory: ~/influxdb-flux-datasource
+    working_directory: ~/grafana-influxdb-flux-datasource
     docker:
       - image: cibuilds/github:0.12
     steps:
@@ -103,7 +103,7 @@ jobs:
       - run:
           name: "Publish Release on GitHub"
           command: |
-            DATASOURCE_NAME=influxdb-flux-datasource
+            DATASOURCE_NAME=grafana-influxdb-flux-datasource
             apk add --update --no-cache jq
             RELEASE_NOTES=`awk 'BEGIN {FS="##"; RS=""} FNR==3 {print; exit}' CHANGELOG.md`
             VERSION=`cat src/plugin.json|jq '.info.version'| sed s/\"//g`

.release-it.json

@@ -7,7 +7,6 @@
     "publish": false
   },
   "scripts": {
-    "afterBump":
-      "npm run build; cd dist; zip -r influxdb-flux-datasource-${version}.zip *"
+    "afterBump": "npm run build; cd dist; zip -r grafana-influxdb-flux-datasource-${version}.zip *"
   }
 }

README.md

@@ -28,10 +28,10 @@ Until then, please follow these steps:
 
 ## Supported Template Variable Macros:
 
-* List all measurements for a given database: `measurements(database)`
-* List all tags for a given database and measurement: `tags(database, measurement)`
-* List all tag values for a given database, measurement, and tag: `tag_valuess(database, measurement, tag)`
-* List all field keys for a given database and measurement: `field_keys(database, measurement)`
+- List all measurements for a given database: `measurements(database)`
+- List all tags for a given database and measurement: `tags(database, measurement)`
+- List all tag values for a given database, measurement, and tag: `tag_valuess(database, measurement, tag)`
+- List all field keys for a given database and measurement: `field_keys(database, measurement)`
 
 ## Contributing
 
@@ -55,5 +55,5 @@ env GITHUB_TOKEN=your_token yarn release-it patch
 
 ## Roadmap
 
-* Alerting integration
-* Explore UI integration
+- Alerting integration
+- Explore UI integration

docker-compose.yml

@@ -3,7 +3,7 @@ grafana:
   ports:
     - "3000:3000"
   volumes:
-    - ./:/var/lib/grafana/plugins/influxdb-flux-datasource
+    - ./:/var/lib/grafana/plugins/grafana-influxdb-flux-datasource
     - ./provisioning:/etc/grafana/provisioning
   environment:
     - TERM=linux

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "influxdb-flux-datasource",
+  "name": "grafana-influxdb-flux-datasource",
   "version": "5.3.0",
   "description": "Grafana data source for InfluxDB (Flux query support)",
   "private": true,

src/plugin.json

@@ -1,7 +1,7 @@
 {
   "type": "datasource",
   "name": "Flux (InfluxDB) [BETA]",
-  "id": "influxdb-flux-datasource",
+  "id": "grafana-influxdb-flux-datasource",
   "defaultMatchFormat": "regex values",
   "metrics": true,
   "annotations": true,