Skip to content

Commit f07b125

Browse files
authored
Update plugin.json, build file (#115)
1 parent 29c73e2 commit f07b125

File tree

9 files changed

+29
-70
lines changed

9 files changed

+29
-70
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ _testmain.go
2929
*.swp
3030

3131
node_modules
32+
oci-metrics-datasource
3233
dist/oci-plugin_*
3334
coverage/
3435
dist/

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If you want to debug golang backend plugin code, follow the steps below:
6363

6464

6565

66-
Please refer to the [docs folder in this repo](./docs)
66+
Please refer to the [docs folder in this repo](https://github.com/oracle/oci-grafana-metrics/tree/master/docs)
6767

6868

6969

@@ -81,15 +81,15 @@ Issues and questions about this plugin can be posted [as an issue in this GitHub
8181

8282
This project welcomes contributions from the community. Before submitting a pull
8383

84-
request, please [review our contribution guide](./CONTRIBUTING.md).
84+
request, please [review our contribution guide](https://github.com/oracle/oci-grafana-metrics/blob/master/CONTRIBUTING.md).
8585

8686

8787

8888
## Security
8989

9090

9191

92-
Please consult the [security guide](./SECURITY.md) for our responsible security
92+
Please consult the [security guide](https://github.com/oracle/oci-grafana-metrics/blob/master/SECURITY.md) for our responsible security
9393

9494
vulnerability disclosure process.
9595

build.sh

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ if [[ ! -d ./node_modules ]]; then
1313
echo "dependencies not installed try running: yarn"
1414
exit 1
1515
fi
16-
16+
rm -rf ./oci-metrics-datasource
17+
rm ./oci-metrics-datasource.zip
18+
rm ./plugin.tar
1719
./node_modules/.bin/grunt
1820

1921
# build go
@@ -43,20 +45,20 @@ if [[ ! -d ./vendor ]]; then
4345
fi
4446

4547
echo "building go binary"
46-
GOOS=$GOOS go build -o ./dist/oci-plugin$POST
48+
GOOS=$GOOS go build -o ./dist/oci-metrics-plugin$POST
4749

4850
# For debugger
49-
# GOOS=$GOOS go build -o ./dist/oci-plugin$POST -gcflags="all=-N -l"
51+
# GOOS=$GOOS go build -o ./dist/oci-metrics-plugin$POST -gcflags="all=-N -l"
5052

5153
# For release
52-
GOOS=linux go build -o ./dist/oci-plugin_linux_amd64
53-
GOOS=windows GOARCH=amd64 go build -o ./dist/oci-plugin_windows_amd64.exe
54+
GOOS=linux go build -o ./dist/oci-metrics-plugin_linux_amd64
55+
GOOS=windows GOARCH=amd64 go build -o ./dist/oci-metrics-plugin_windows_amd64.exe
5456

5557
grafana-toolkit plugin:sign
5658

57-
tar cvf plugin.tar ./dist
58-
59-
zip -r oci-metrics-datasource-g8 ./dist
59+
mv ./dist ./oci-metrics-datasource
60+
tar cvf plugin.tar ./oci-metrics-datasource
61+
zip -r oci-metrics-datasource ./oci-metrics-datasource
6062

6163
# Instructions for signing
6264
# Please make sure

build_oci_go_plugin.sh

Lines changed: 0 additions & 46 deletions
This file was deleted.
-157 KB
Binary file not shown.
-110 KB
Binary file not shown.
-705 KB
Binary file not shown.

package.json

Lines changed: 1 addition & 1 deletion
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.3",
4+
"version": "3.0.4",
55
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
66
"main": "index.js",
77
"scripts": {

src/plugin.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,11 @@
22
"name": "Oracle Cloud Infrastructure Metrics",
33
"id": "oci-metrics-datasource",
44
"type": "datasource",
5-
6-
"partials": {
7-
"config": "public/app/plugins/datasource/oracle-oci-datasource/partials/config.html"
8-
},
9-
105
"metrics": true,
116
"annotations": false,
127
"alerting": false,
138
"backend": true,
14-
"executable": "oci-plugin",
15-
9+
"executable": "oci-metrics-plugin",
1610
"info": {
1711
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
1812
"author": {
@@ -25,16 +19,24 @@
2519
"links": [
2620
{
2721
"name": "GitHub",
28-
"url": "https://github.com/oracle/oci-grafana-plugin"
22+
"url": "https://github.com/oracle/oci-grafana-metrics"
2923
},
3024
{ "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
3125
],
32-
"version": "3.0.3",
33-
"updated": "2022-02-10"
26+
"version": "3.0.4",
27+
"updated": "2022-03-16",
28+
"screenshots":[
29+
{
30+
"name":"OCI Metrics Dashboard",
31+
"path":"docs/images/Screen_Shot_2019-02-15_at_3.06.49_PM.png"
32+
}
33+
],
34+
"keywords": [
35+
"oci", "oracle", "metrics"
36+
]
3437
},
35-
3638
"dependencies": {
37-
"grafanaDependency": "8.x.x",
39+
"grafanaDependency": ">=8.0.0",
3840
"plugins": [ ]
3941
}
4042
}

0 commit comments

Comments
 (0)