From 3b07746e369d4df06643e07eb4c009e629824725 Mon Sep 17 00:00:00 2001 From: Joseph Makar Date: Tue, 12 Sep 2023 11:56:25 -0400 Subject: [PATCH 1/2] Potential fix --- package.json | 2 +- pkg/plugin/client.go | 2 +- src/ConfigEditor.tsx | 3 +-- src/plugin.json | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c266547..528b928 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sentinelone-dataset-datasource", - "version": "3.1.2", + "version": "3.1.2a", "description": "Scalyr Observability Platform", "scripts": { "build": "webpack -c ./.config/webpack/webpack.config.ts --env production", diff --git a/pkg/plugin/client.go b/pkg/plugin/client.go index a3bd901..0d8f24b 100644 --- a/pkg/plugin/client.go +++ b/pkg/plugin/client.go @@ -57,7 +57,7 @@ func NewDataSetClient(dataSetUrl string, apiKey string) DataSetClient { } func (d *dataSetClient) newRequest(method, url string, body io.Reader) (*http.Request, error) { - const VERSION = "3.1.2" + const VERSION = "3.1.2a" if err := d.rateLimiter.Wait(context.Background()); err != nil { log.DefaultLogger.Error("error applying rate limiter", "err", err) diff --git a/src/ConfigEditor.tsx b/src/ConfigEditor.tsx index 5aae74a..77341d8 100644 --- a/src/ConfigEditor.tsx +++ b/src/ConfigEditor.tsx @@ -49,7 +49,6 @@ export class ConfigEditor extends PureComponent { render() { const { options } = this.props; const { jsonData, secureJsonFields } = options; - jsonData.scalyrUrl = jsonData.scalyrUrl || 'https://app.scalyr.com/'; const secureJsonData = (options.secureJsonData || {}) as MySecureJsonData; return ( @@ -76,7 +75,7 @@ export class ConfigEditor extends PureComponent { labelWidth={8} inputWidth={20} onChange={this.onURLChange} - value={jsonData.scalyrUrl} + value={jsonData.scalyrUrl || 'https://app.scalyr.com/'} placeholder="Scalyr server URL" /> diff --git a/src/plugin.json b/src/plugin.json index 13837e7..2c41566 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -43,8 +43,8 @@ "path": "img/DatasetConfig.png" } ], - "version": "3.1.2", - "updated": "2023-03-31" + "version": "3.1.2a", + "updated": "2023-09-12" }, "dependencies": { "grafanaDependency": ">=8.2.0", From 5647b2a296179b7addd28bc9677e9584ed115733 Mon Sep 17 00:00:00 2001 From: Joseph Makar Date: Tue, 12 Sep 2023 13:39:31 -0400 Subject: [PATCH 2/2] Updated version & changelog --- CHANGELOG.md | 4 ++++ package.json | 2 +- pkg/plugin/client.go | 2 +- src/plugin.json | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bdcecd..9c7b1c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 3.1.3 + +- Bugfix around scalyrUrl assignment (Issue #124) + ## 3.1.2 - Cross-team query support. diff --git a/package.json b/package.json index 528b928..0225e70 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "sentinelone-dataset-datasource", - "version": "3.1.2a", + "version": "3.1.3", "description": "Scalyr Observability Platform", "scripts": { "build": "webpack -c ./.config/webpack/webpack.config.ts --env production", diff --git a/pkg/plugin/client.go b/pkg/plugin/client.go index 0d8f24b..7674fc9 100644 --- a/pkg/plugin/client.go +++ b/pkg/plugin/client.go @@ -57,7 +57,7 @@ func NewDataSetClient(dataSetUrl string, apiKey string) DataSetClient { } func (d *dataSetClient) newRequest(method, url string, body io.Reader) (*http.Request, error) { - const VERSION = "3.1.2a" + const VERSION = "3.1.3" if err := d.rateLimiter.Wait(context.Background()); err != nil { log.DefaultLogger.Error("error applying rate limiter", "err", err) diff --git a/src/plugin.json b/src/plugin.json index 2c41566..d943972 100644 --- a/src/plugin.json +++ b/src/plugin.json @@ -43,7 +43,7 @@ "path": "img/DatasetConfig.png" } ], - "version": "3.1.2a", + "version": "3.1.3", "updated": "2023-09-12" }, "dependencies": {