Updated versions and upgraded grafana

- Updated version with same numbers in src/plugin.json and package.json

- Upgraded grafana to the latest release | From 3.x to 7.3.x

- Added gBuild script for grafana build and made some changes in package.json

- Build file changes

Author: athulmurali

.gitignore

@@ -36,3 +36,7 @@ coverage/
 dist/
 *_orig
 .idea
+
+#Ignore the built tar and zip files
+*.tar
+*.zip

Gopkg.lock

@@ -44,3 +44,5 @@ GOOS=$GOOS go build -o ./dist/oci-plugin$POST
  GOOS=windows GOARCH=amd64 go build -o ./dist/oci-plugin_windows_amd64.exe
  tar cvf plugin.tar ./dist
 
+#For grafana publishing
+#yarn install --pure-lockfile && yarn build

build.sh

@@ -42,7 +42,7 @@ grafana-cli plugins install oci-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).
 
 ### Manual installation 
-Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.0.1/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
+Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.2.0/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
 
 >  **Additional step for Grafana 7**. Open the grafana configuration  *grafana.ini* file and add the `allow_loading_unsigned_plugins = "oci-datasource"`in the *plugins* section.
 

docs/linux.md

@@ -35,7 +35,7 @@ grafana-cli plugins install oci-metrics-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).
 
 ### Manually installation 
-Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.0.1/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
+Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.2.0/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`. 
 
 >  **Additional step for Grafana 7**. Open the grafana configuration  *grafana.ini* file and add the `allow_loading_unsigned_plugins = "oci-datasource"`in the *plugins* section.
 

docs/linuxoci.md

@@ -40,7 +40,7 @@ grafana-cli plugins install oci-metrics-datasource
 The plugin will be installed into your Grafana plugins directory, which by default is located at /var/lib/grafana/plugins. [Here is more information on the CLI tool](http://docs.grafana.org/plugins/installation/).
 
 ### Manually installation 
- Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.0.1/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`
+ Alternatively, you can manually download the .tar file and unpack it into your /grafana/plugins directory. To do so, change to the Grafana plugins directory: `cd /usr/local/var/lib/grafana/plugins`. Download the OCI Grafana Plugin: wget `https://github.com/oracle/oci-grafana-plugin/releases/download/v2.2.0/plugin.tar`. Create a directory and install the plugin: `mkdir oci && tar -C oci -xvf plugin.tar` and then remove the tarball: `rm plugin.tar`
 
 >  **Additional step for Grafana 7**. Open the grafana configuration  *grafana.ini* file and add the `allow_loading_unsigned_plugins = "oci-datasource"`in the *plugins* section.
 

docs/macos.md

@@ -1,15 +1,16 @@
 {
-  "name": "oci-grafana-plugin",
+  "name": "oci-metrics-datasource",
   "private": true,
-  "version": "2.0.1",
-  "description": "",
+  "version": "2.2.0",
+  "description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
   "main": "index.js",
   "scripts": {
     "buildjs": "./node_modules/.bin/grunt",
     "lint": "./node_modules/.bin/eslint src/",
     "fix": "./node_modules/.bin/eslint --fix src/",
     "bump": "./node_modules/.bin/grunt bump",
-    "test": "jest src/ --coverage"
+    "test": "jest src/ --coverage",
+    "gBuild" :  "yarn install --pure-lockfile && yarn buildjs  && zip ${npm_package_name}-${npm_package_version}.zip ./dist -r"
   },
   "author": "",
   "license": "UPL",

package.json

@@ -26,12 +26,12 @@
       {"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-plugin"},
       {"name": "UPL", "url": "https://oss.oracle.com/licenses/upl"}
     ],
-    "version": "1.1.4",
+    "version": "2.2.0",
     "updated": "2020-12-08"
   },
 
   "dependencies": {
-    "grafanaVersion": "3.x.x",
+    "grafanaVersion": "7.3.x",
     "plugins": [ ]
   }
 }