Skip to content

Commit 9ec7513

Browse files
authored
Added support for oc8 (#71)
* Added support for oc8 - Added the region ap-chiyoda-1 to constants.js - Updated sdk version of oci-go-sdk to v24.3.0 - Updated version and dates Note : Not all versions are compatible OC8 support was added in oci-go-sdk in v24.2 https://github.com/oracle/oci-go-sdk/blob/v24.2.0/CHANGELOG.md Closes #69
1 parent e554dd4 commit 9ec7513

File tree

10 files changed

+6895
-47
lines changed

10 files changed

+6895
-47
lines changed

Gopkg.lock

Lines changed: 116 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,13 @@
22
branch = "renderer"
33
name = "github.com/grafana/grafana_plugin_model"
44

5-
[[constraint]]
6-
branch = "master"
7-
name = "golang.org/x/net"
8-
95
[[constraint]]
106
name = "github.com/hashicorp/go-plugin"
117
revision = "e8d22c780116115ae5624720c9af0c97afe4f551"
128

139
[[constraint]]
1410
name = "github.com/oracle/oci-go-sdk"
15-
version = "15.7.0"
11+
version = "24.2.0"
1612

1713
[[constraint]]
1814
name = "github.com/pkg/errors"

build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ GOOS=$GOOS go build -o ./dist/oci-plugin$POST
4040
# GOOS=$GOOS go build -o ./dist/oci-plugin$POST -gcflags="all=-N -l"
4141

4242
# For release
43-
# GOOS=linux go build -o ./dist/oci-plugin_linux_amd64
44-
# GOOS=windows GOARCH=amd64 go build -o ./dist/oci-plugin_windows_amd64.exe
45-
# tar cvf plugin.tar ./dist
43+
GOOS=linux go build -o ./dist/oci-plugin_linux_amd64
44+
GOOS=windows GOARCH=amd64 go build -o ./dist/oci-plugin_windows_amd64.exe
45+
tar cvf plugin.tar ./dist
4646

docs/linux.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ grafana-cli plugins install oci-datasource
4242
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/).
4343

4444
### Manual installation
45-
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.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`.
45+
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`.
4646

4747
> **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.
4848

docs/linuxoci.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ grafana-cli plugins install oci-metrics-datasource
3535
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/).
3636

3737
### Manually installation
38-
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.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`.
38+
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`.
3939

4040
> **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.
4141

docs/macos.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ grafana-cli plugins install oci-metrics-datasource
4040
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/).
4141

4242
### Manually installation
43-
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.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`
43+
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`
4444

4545
> **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.
4646

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "oci-grafana-plugin",
33
"private": true,
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"description": "",
66
"main": "index.js",
77
"scripts": {

src/constants.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
** Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
*/
55
export const AUTO = 'auto'
6-
export const regions = ['ap-chuncheon-1','ap-hyderabad-1','ap-melbourne-1','ap-mumbai-1','ap-osaka-1','ap-seoul-1','ap-sydney-1','ap-tokyo-1','ca-montreal-1','ca-toronto-1','eu-amsterdam-1','eu-frankfurt-1','eu-zurich-1','me-jeddah-1','sa-saopaulo-1','uk-london-1','us-ashburn-1','us-phoenix-1']
6+
export const regions = ['ap-chuncheon-1','ap-hyderabad-1','ap-melbourne-1','ap-mumbai-1','ap-osaka-1','ap-seoul-1','ap-sydney-1','ap-tokyo-1','ca-montreal-1','ca-toronto-1','eu-amsterdam-1','eu-frankfurt-1','eu-zurich-1','me-jeddah-1','sa-saopaulo-1','uk-london-1','us-ashburn-1','us-phoenix-1','ap-chiyoda-1']
77
export const namespaces = ['oci_computeagent', 'oci_blockstore', 'oci_lbaas', 'oci_telemetry']
88
export const aggregations = ['count()', 'max()', 'mean()', 'min()', 'rate()', 'sum()', 'percentile(.90)', 'percentile(.95)', 'percentile(.99)']
99
export const windows = [AUTO, '1m', '5m', '1h']

src/plugin.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
{"name": "GitHub", "url": "https://github.com/oracle/oci-grafana-plugin"},
2727
{"name": "UPL", "url": "https://oss.oracle.com/licenses/upl"}
2828
],
29-
"version": "1.1.3",
30-
"updated": "2020-09-28"
29+
"version": "1.1.4",
30+
"updated": "2020-12-08"
3131
},
3232

3333
"dependencies": {

0 commit comments

Comments
 (0)