From 353de89913544b1b6dc125d3553de57c559517ee Mon Sep 17 00:00:00 2001 From: Vadim Komar Date: Thu, 20 Feb 2020 16:55:45 -0800 Subject: [PATCH] Fix metrics dependency on default region #patch --- docs/linux.md | 2 +- docs/linuxoci.md | 2 +- docs/macos.md | 2 +- package.json | 2 +- plugin.json | 4 ++-- src/datasource.js | 2 +- src/plugin.json | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/linux.md b/docs/linux.md index 4540e6df0..85c4fba50 100644 --- 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/). ### 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/V1.0.5/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/V1.0.7/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`. To start the Grafana server, run: `sudo systemctl start grafana-server`. diff --git a/docs/linuxoci.md b/docs/linuxoci.md index 126ced72a..875a71b8a 100644 --- a/docs/linuxoci.md +++ b/docs/linuxoci.md @@ -35,7 +35,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/). ### 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/V1.0.5/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/V1.0.7/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`. To start the Grafana server, run: `sudo systemctl start grafana-server`. diff --git a/docs/macos.md b/docs/macos.md index acc421166..0d5e0a73b 100644 --- a/docs/macos.md +++ b/docs/macos.md @@ -40,7 +40,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/). ### 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/V1.0.5/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/V1.0.7/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` To start the Grafana server, run: `brew services start grafana` diff --git a/package.json b/package.json index d40b4628e..9fdb0cbe4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "oci-grafana-plugin", "private": true, - "version": "1.0.5", + "version": "1.0.7", "description": "", "main": "index.js", "scripts": { diff --git a/plugin.json b/plugin.json index d94270cce..425cb7c27 100644 --- a/plugin.json +++ b/plugin.json @@ -26,8 +26,8 @@ {"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-plugin"}, {"name": "MIT License", "url": "https://github.com/oracle/oci-grafana-plugin"} ], - "version": "1.0.6", - "updated": "2020-01-23" + "version": "1.0.7", + "updated": "2020-02-20" }, "dependencies": { diff --git a/src/datasource.js b/src/datasource.js index b4d310f56..fb8b22052 100644 --- a/src/datasource.js +++ b/src/datasource.js @@ -100,7 +100,7 @@ export default class OCIDatasource { return this.templateMetricQuery(target); } - const region = target.region === SELECT_PLACEHOLDERS.REGION ? '' : this.getVariableValue(region); + const region = target.region === SELECT_PLACEHOLDERS.REGION ? '' : this.getVariableValue(target.region); const compartment = target.compartment === SELECT_PLACEHOLDERS.COMPARTMENT ? '' : this.getVariableValue(target.compartment); const namespace = target.namespace === SELECT_PLACEHOLDERS.NAMESPACE ? '' : this.getVariableValue(target.namespace); diff --git a/src/plugin.json b/src/plugin.json index 827db8a3f..672cb3767 100644 --- 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": "1.0.6", - "updated": "2020-01-23" + "version": "1.0.7", + "updated": "2020-02-20" }, "dependencies": {