Skip to content

Commit

Permalink
version 5.2.0 (#265)
Browse files Browse the repository at this point in the history
* version 5.2.0

* yarn lock

* lock file

* traverse again

* other conf

* removed babel

* no grunt

* upgraded golang libs

* removed grunt

* removed grunt
  • Loading branch information
mamorett authored Apr 16, 2024
1 parent 28722d9 commit e83f318
Show file tree
Hide file tree
Showing 7 changed files with 1,524 additions and 3,044 deletions.
4 changes: 1 addition & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,19 @@ go 1.16
require (
github.com/dgraph-io/ristretto v0.1.1
github.com/google/flatbuffers v22.9.29+incompatible // indirect
github.com/grafana/grafana-plugin-sdk-go v0.140.0
github.com/grafana/grafana-plugin-sdk-go v0.150.0
github.com/hashicorp/go-hclog v1.3.1 // indirect
github.com/hashicorp/go-plugin v1.4.5 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/json-iterator/go v1.1.12
github.com/klauspost/compress v1.15.11 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-runewidth v0.0.14 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.60.0
github.com/pierrec/lz4/v4 v4.1.17 // indirect
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.13.0 // indirect
github.com/rivo/uniseg v0.4.2 // indirect
google.golang.org/grpc v1.56.3 // indirect
)
54 changes: 45 additions & 9 deletions go.sum

Large diffs are not rendered by default.

30 changes: 8 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "oci-metrics-datasource",
"private": true,
"version": "5.1.1",
"version": "5.2.0",
"description": "Oracle Cloud Infrastructure Metrics Data Source for Grafana",
"scripts": {
"build": "webpack -c ./.config/webpack/webpack.config.ts --env production",
Expand All @@ -22,8 +22,8 @@
},
"engineStrict": true,
"devDependencies": {
"@grafana/e2e": "9.3.8",
"@grafana/e2e-selectors": "9.3.8",
"@grafana/e2e": "10.4.2",
"@grafana/e2e-selectors": "10.4.2",
"@grafana/eslint-config": "^5.1.0",
"@grafana/tsconfig": "^1.2.0-rc1",
"@grafana/data": "9.5.15",
Expand All @@ -37,9 +37,8 @@
"@types/glob": "^8.0.0",
"@types/jest": "^29.2.2",
"@types/node": "^18.11.9",
"babel": "^6.23.0",
"@babel/core": "^7.23.2",
"babel-preset-react": "^6.24.1",
"@babel/core": "^7.24.1",
"@babel/preset-react": "7.24.1",
"copy-webpack-plugin": "^11.0.0",
"css-loader": "^6.7.1",
"eslint-plugin-import": "^2.14.0",
Expand All @@ -58,20 +57,10 @@
"eslint-visitor-keys": "^2.1.0",
"fork-ts-checker-webpack-plugin": "^7.2.0",
"glob": "^8.0.3",
"grunt": "^1.5.3",
"grunt-babel": "~6.0.0",
"grunt-bump": "^0.8.0",
"grunt-cli": "^1.2.0",
"grunt-contrib-clean": "^1.1.0",
"grunt-contrib-copy": "^1.0.0",
"grunt-contrib-uglify": "^5.2.2",
"grunt-contrib-watch": "^1.0.0",
"grunt-systemjs-builder": "^1.0.0",
"identity-obj-proxy": "3.0.0",
"jest": "^29.3.1",
"jest-environment-jsdom": "^29.3.1",
"jest": "^29.7.0",
"jest-environment-jsdom": "^29.7.0",
"jsdom": "~16.5.0",
"load-grunt-tasks": "^3.5.2",
"prettier": "^2.5.0",
"prunk": "^1.3.0",
"q": "^1.5.0",
Expand All @@ -96,15 +85,12 @@
},
"dependencies": {
"@apache-arrow/es5-cjs": "^4.0.1",
"@babel/preset-env": "^7.3.4",
"@babel/preset-env": "v7.24.1",
"@emotion/css": "^11.1.3",
"@grafana/data": "9.5.15",
"@grafana/runtime": "9.5.15",
"@grafana/ui": "9.5.15",
"@testing-library/react": "^12.1.4",
"babel-plugin-transform-es2015-for-of": "^6.6.0",
"babel-plugin-transform-es2015-modules-systemjs": "^6.24.1",
"babel-preset-es2015": "^6.24.1",
"eslint": "^8.38.0",
"eslint-config-standard": "^12.0.0",
"js-yaml": "^3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/metrics_functions.go
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ func (o *OCIDatasource) GetMetricDataPoints(ctx context.Context, requestParams m
allRegionsMetricsDataPoint.Range(func(key, value interface{}) bool {
regionInUse := key.(string)

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

// Tags will be used in future releases
// get the selected tags
Expand Down
4 changes: 2 additions & 2 deletions pkg/plugin/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,8 @@ func listMetricsMetadataFromAllRegion(
wg.Wait()

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

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

Expand Down
4 changes: 2 additions & 2 deletions src/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
{ "name": "UPL", "url": "https://oss.oracle.com/licenses/upl" }
],
"version": "5.1.1",
"updated": "2024-03-08",
"version": "5.2.0",
"updated": "2024-04-11",
"screenshots":[
{
"name":"OCI Metrics Dashboard",
Expand Down
Loading

0 comments on commit e83f318

Please sign in to comment.