Skip to content

Commit e83f318

Browse files
author
Mattia Moretti
authored
version 5.2.0 (#265)
* version 5.2.0 * yarn lock * lock file * traverse again * other conf * removed babel * no grunt * upgraded golang libs * removed grunt * removed grunt
1 parent 28722d9 commit e83f318

File tree

7 files changed

+1524
-3044
lines changed

7 files changed

+1524
-3044
lines changed

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,19 @@ go 1.16
55
require (
66
github.com/dgraph-io/ristretto v0.1.1
77
github.com/google/flatbuffers v22.9.29+incompatible // indirect
8-
github.com/grafana/grafana-plugin-sdk-go v0.140.0
8+
github.com/grafana/grafana-plugin-sdk-go v0.150.0
99
github.com/hashicorp/go-hclog v1.3.1 // indirect
1010
github.com/hashicorp/go-plugin v1.4.5 // indirect
1111
github.com/hashicorp/yamux v0.1.1 // indirect
1212
github.com/json-iterator/go v1.1.12
1313
github.com/klauspost/compress v1.15.11 // indirect
1414
github.com/mattn/go-colorable v0.1.13 // indirect
1515
github.com/mattn/go-runewidth v0.0.14 // indirect
16-
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
1716
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
1817
github.com/oklog/run v1.1.0 // indirect
1918
github.com/oracle/oci-go-sdk/v65 v65.60.0
2019
github.com/pierrec/lz4/v4 v4.1.17 // indirect
2120
github.com/pkg/errors v0.9.1
22-
github.com/prometheus/client_golang v1.13.0 // indirect
2321
github.com/rivo/uniseg v0.4.2 // indirect
2422
google.golang.org/grpc v1.56.3 // indirect
2523
)

go.sum

Lines changed: 45 additions & 9 deletions
Large diffs are not rendered by default.

package.json

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "oci-metrics-datasource",
33
"private": true,
4-
"version": "5.1.1",
4+
"version": "5.2.0",
55
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
66
"scripts": {
77
"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
@@ -22,8 +22,8 @@
2222
},
2323
"engineStrict": true,
2424
"devDependencies": {
25-
"@grafana/e2e": "9.3.8",
26-
"@grafana/e2e-selectors": "9.3.8",
25+
"@grafana/e2e": "10.4.2",
26+
"@grafana/e2e-selectors": "10.4.2",
2727
"@grafana/eslint-config": "^5.1.0",
2828
"@grafana/tsconfig": "^1.2.0-rc1",
2929
"@grafana/data": "9.5.15",
@@ -37,9 +37,8 @@
3737
"@types/glob": "^8.0.0",
3838
"@types/jest": "^29.2.2",
3939
"@types/node": "^18.11.9",
40-
"babel": "^6.23.0",
41-
"@babel/core": "^7.23.2",
42-
"babel-preset-react": "^6.24.1",
40+
"@babel/core": "^7.24.1",
41+
"@babel/preset-react": "7.24.1",
4342
"copy-webpack-plugin": "^11.0.0",
4443
"css-loader": "^6.7.1",
4544
"eslint-plugin-import": "^2.14.0",
@@ -58,20 +57,10 @@
5857
"eslint-visitor-keys": "^2.1.0",
5958
"fork-ts-checker-webpack-plugin": "^7.2.0",
6059
"glob": "^8.0.3",
61-
"grunt": "^1.5.3",
62-
"grunt-babel": "~6.0.0",
63-
"grunt-bump": "^0.8.0",
64-
"grunt-cli": "^1.2.0",
65-
"grunt-contrib-clean": "^1.1.0",
66-
"grunt-contrib-copy": "^1.0.0",
67-
"grunt-contrib-uglify": "^5.2.2",
68-
"grunt-contrib-watch": "^1.0.0",
69-
"grunt-systemjs-builder": "^1.0.0",
7060
"identity-obj-proxy": "3.0.0",
71-
"jest": "^29.3.1",
72-
"jest-environment-jsdom": "^29.3.1",
61+
"jest": "^29.7.0",
62+
"jest-environment-jsdom": "^29.7.0",
7363
"jsdom": "~16.5.0",
74-
"load-grunt-tasks": "^3.5.2",
7564
"prettier": "^2.5.0",
7665
"prunk": "^1.3.0",
7766
"q": "^1.5.0",
@@ -96,15 +85,12 @@
9685
},
9786
"dependencies": {
9887
"@apache-arrow/es5-cjs": "^4.0.1",
99-
"@babel/preset-env": "^7.3.4",
88+
"@babel/preset-env": "v7.24.1",
10089
"@emotion/css": "^11.1.3",
10190
"@grafana/data": "9.5.15",
10291
"@grafana/runtime": "9.5.15",
10392
"@grafana/ui": "9.5.15",
10493
"@testing-library/react": "^12.1.4",
105-
"babel-plugin-transform-es2015-for-of": "^6.6.0",
106-
"babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
107-
"babel-preset-es2015": "^6.24.1",
10894
"eslint": "^8.38.0",
10995
"eslint-config-standard": "^12.0.0",
11096
"js-yaml": "^3.13.1",

pkg/plugin/metrics_functions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ func (o *OCIDatasource) GetMetricDataPoints(ctx context.Context, requestParams m
540540
allRegionsMetricsDataPoint.Range(func(key, value interface{}) bool {
541541
regionInUse := key.(string)
542542

543-
backend.Logger.Info("client", "GetMetricDataPoints", "Metric datapoints got for region-"+regionInUse)
543+
backend.Logger.Debug("client", "GetMetricDataPoints", "Metric datapoints got for region-"+regionInUse)
544544

545545
// Tags will be used in future releases
546546
// get the selected tags

pkg/plugin/utils.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ func listMetricsMetadataFromAllRegion(
9898
wg.Wait()
9999

100100
allRegionsData.Range(func(key, value interface{}) bool {
101-
backend.Logger.Info("client.utils", "listMetricsMetadataPerAllRegion", "Retrieving data for "+fetchFor)
102-
backend.Logger.Info("client.utils", "listMetricsMetadataPerAllRegion", "Data got for region-"+key.(string))
101+
backend.Logger.Debug("client.utils", "listMetricsMetadataPerAllRegion", "Retrieving data for "+fetchFor)
102+
backend.Logger.Debug("client.utils", "listMetricsMetadataPerAllRegion", "Data got for region-"+key.(string))
103103

104104
metadataGot := value.(map[string][]string)
105105

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": "5.1.1",
27-
"updated": "2024-03-08",
26+
"version": "5.2.0",
27+
"updated": "2024-04-11",
2828
"screenshots":[
2929
{
3030
"name":"OCI Metrics Dashboard",

0 commit comments

Comments
 (0)