Fix documentation for resourceGroup addition (#79)

athulmurali · web-flow · commit e1d32bff9d8e · 2021-01-11T16:26:35.000-08:00
Fix for:
After the addition of resourceGroups of using.md , the documents got outdated
Occured from v1.0.8 release and commit

* Updated the queries and replaced the screenshot for variables

* Updated versions and  date in markdown documents
diff --git a/docs/images/Screen Shot 2019-01-11 at 3.19.58 PM.png b/docs/images/Screen Shot 2019-01-11 at 3.19.58 PM.png
diff --git a/docs/images/metrics-dashboard-variables-screenshot.png b/docs/images/metrics-dashboard-variables-screenshot.png
diff --git a/docs/linux.md b/docs/linux.md
@@ -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.2.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.2/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.
 
diff --git a/docs/linuxoci.md b/docs/linuxoci.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.2.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.2/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.
 
diff --git a/docs/macos.md b/docs/macos.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.2.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.2/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.
 
diff --git a/docs/using.md b/docs/using.md
@@ -49,13 +49,14 @@ Repeat the process for the following OCI variables:
 | region          | `regions()`                                                               |
 | compartment     | `compartments()`                                                          |
 | namespace       | `namespaces($region,$compartment)`                                        |
-| metric          | `metrics($region,$compartment,$namespace)`                                |
-| dimensionKey    | `dimensions($region,$compartment,$namespace,$metric)`                     |
-| dimensionValue  | `dimensionOptions($region,$compartment,$namespace,$metric,$dimensionKey)` |
+| resourcegroup   | `resourcegroups($region, $compartment, $namespace)`                                        |
+| metric          | `metrics($region,$compartment, $namespace, $resourcegroup)`                                |
+| dimensionKey    | `dimensions($region, $compartment, $namespace, $metric, $resourcegroup)`                     |
+| dimensionValue  | `dimensionOptions($region,$compartment,$namespace,$metric,$dimensionKey,$resourcegroup)` |
 
 The final list of variables should look like this: 
 
-![Screen Shot 2019-01-11 at 3.19.58 PM](images/Screen%20Shot%202019-01-11%20at%203.19.58%20PM.png)
+![Metrics dashboard variables screenshot](images/metrics-dashboard-variables-screenshot.png)
 
 In order for these variables be available to be dynamically changed in your query, edit your existing query, and under **metrics** select the newly created variables for **region**, **compartment**, **namespace**, and **metric** as seen in the image below. 
 
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "oci-metrics-datasource",
   "private": true,
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
   "main": "index.js",
   "scripts": {
diff --git a/src/plugin.json b/src/plugin.json
@@ -26,8 +26,8 @@
       {"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-plugin"},
       {"name": "UPL", "url": "https://oss.oracle.com/licenses/upl"}
     ],
-    "version": "2.2.0",
-    "updated": "2020-12-08"
+    "version": "2.2.2",
+    "updated": "2021-01-11"
   },
 
   "dependencies": {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "oci-metrics-datasource",`
`3`	`3`	`"private": true,`
`4`		`- "version": "2.2.1",`
	`4`	`+ "version": "2.2.2",`
`5`	`5`	`"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"scripts": {`