Skip to content

Commit 3ae8de0

Browse files
authored
Added more GA regions, update linux docs, update default debugger process (#126)
Update Grunt per security bot.
1 parent a9b4dab commit 3ae8de0

File tree

6 files changed

+185
-47
lines changed

6 files changed

+185
-47
lines changed

.vscode/launch.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"type": "go",
1010
"request": "attach",
1111
"mode": "local",
12-
"processId": 10458
12+
"processId": "${command:pickGoProcess}"
1313
}
1414
]
1515
}

docs/linux.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ The [Oracle Cloud Infrastructure CLI](https://docs.cloud.oracle.com/iaas/Content
1414

1515
Begin by [installing the Oracle Cloud Infrastructure CLI](https://docs.cloud.oracle.com/iaas/Content/API/SDKDocs/cliinstall.htm). Follow the installation prompts to install the CLI on your local environment. After the installation is complete, use the `oci setup config` command to have the CLI walk you through the first-time setup process. If you haven't already uploaded your public API signing key through the console, follow the instructions [here](https://docs.us-phoenix-1.oraclecloud.com/Content/API/Concepts/apisigningkey.htm#How2) to do so.
1616

17-
After the CLI has been configured, move the `~/.oci` folder to `/usr/share/grafana` and then change ownership of the `/usr/share/grafana/.oci folder` to the “grafana” user: `sudo chown -R grafana:grafana /usr/share/grafana/.oci`.
18-
17+
After the CLI has been configured, move the `~/.oci` folder to `/usr/share/grafana` and then change ownership of the `/usr/share/grafana/.oci folder` to the “grafana” user: `sudo chown -R grafana:grafana /usr/share/grafana/.oci`. Update the `key_file` location in `/usr/share/grafana/.oci/config` to the current folder `/usr/share/grafana/.oci/your_key.pem`.
1918
## Configure OCI Identity Policies
2019

2120
In the OCI console under **Identity > Groups** click **Create Group** and create a new group called **grafana**. Add the user configured in the OCI CLI to the newly-created group.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "oci-metrics-datasource",
33
"private": true,
4-
"version": "3.0.4",
4+
"version": "3.0.5",
55
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
66
"main": "index.js",
77
"scripts": {
@@ -26,7 +26,7 @@
2626
"eslint-plugin-node": "^8.0.1",
2727
"eslint-plugin-promise": "^4.0.1",
2828
"eslint-plugin-standard": "^4.0.0",
29-
"grunt": "^1.0.4",
29+
"grunt": "^1.5.3",
3030
"grunt-babel": "~6.0.0",
3131
"grunt-bump": "^0.8.0",
3232
"grunt-cli": "^1.2.0",

src/constants.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
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',
7-
'ap-sydney-1','ap-tokyo-1','ca-montreal-1','ca-toronto-1','eu-amsterdam-1','eu-frankfurt-1',
8-
'eu-zurich-1','me-jeddah-1','sa-saopaulo-1','uk-london-1','us-ashburn-1','eu-milan-1','il-jerusalem-1',
9-
'us-phoenix-1','ap-chiyoda-1', 'me-dubai-1', 'sa-santiago-1', 'sa-vinhedo-1','me-abudhabi-1',
10-
'uk-cardiff-1', 'uk-gov-london-1','uk-gov-cardiff-1','eu-stockholm-1','eu-marseille-1','af-johannesburg-1',
11-
'us-langley-1','us-luke-1','us-gov-ashburn-1', 'us-gov-chicago-1','us-gov-phoenix-1']
6+
export const regions = ['af-johannesburg-1', 'ap-chiyoda-1', 'ap-chuncheon-1', 'ap-dcc-canberra-1', 'ap-hyderabad-1', 'ap-ibaraki-1', 'ap-melbourne-1',
7+
'ap-mumbai-1', 'ap-osaka-1', 'ap-seoul-1', 'ap-singapore-1', 'ap-sydney-1', 'ap-tokyo-1', 'ca-montreal-1', 'ca-toronto-1',
8+
'eu-amsterdam-1', 'eu-frankfurt-1', 'eu-madrid-1', 'eu-marseille-1', 'eu-milan-1', 'eu-paris-1', 'eu-stockholm-1', 'eu-zurich-1',
9+
'il-jerusalem-1', 'me-abudhabi-1', 'me-dubai-1', 'me-jeddah-1', 'me-dcc-muscat-1', 'mx-queretaro-1', 'sa-santiago-1', 'sa-saopaulo-1', 'sa-vinhedo-1',
10+
'uk-cardiff-1', 'uk-gov-cardiff-1', 'uk-gov-london-1', 'uk-london-1', 'us-ashburn-1', 'us-chicago-1', 'us-gov-ashburn-1',
11+
'us-gov-chicago-1', 'us-gov-phoenix-1', 'us-langley-1', 'us-luke-1', 'us-phoenix-1']
1212

1313
export const namespaces = ['oci_computeagent', 'oci_blockstore', 'oci_lbaas', 'oci_telemetry']
1414
export const aggregations = ['count()', 'max()', 'mean()', 'min()', 'rate()', 'sum()', 'percentile(.90)', 'percentile(.95)', 'percentile(.99)', 'last()']

src/plugin.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
},
2424
{ "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
2525
],
26-
"version": "3.0.4",
27-
"updated": "2022-03-31",
26+
"version": "3.0.5",
27+
"updated": "2022-06-15",
2828
"screenshots":[
2929
{
3030
"name":"OCI Metrics Dashboard",

0 commit comments

Comments
 (0)