Merge pull request #125 from scalyr/dset-4485

DSET-4485: Adding configs to DataSet Grafana Cloud returns TypeError

Author: jmakar-s1

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.1.3
+
+- Bugfix around scalyrUrl assignment (Issue #124)
+
 ## 3.1.2
 
 - Cross-team query support.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sentinelone-dataset-datasource",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Scalyr Observability Platform",
   "scripts": {
     "build": "webpack -c ./.config/webpack/webpack.config.ts --env production",

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.3"
 
 	if err := d.rateLimiter.Wait(context.Background()); err != nil {
 		log.DefaultLogger.Error("error applying rate limiter", "err", err)

src/ConfigEditor.tsx

@@ -49,7 +49,6 @@ export class ConfigEditor extends PureComponent<Props, State> {
   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<Props, State> {
               labelWidth={8}
               inputWidth={20}
               onChange={this.onURLChange}
-              value={jsonData.scalyrUrl}
+              value={jsonData.scalyrUrl || 'https://app.scalyr.com/'}
               placeholder="Scalyr server URL"
             />
           </div>

src/plugin.json

@@ -43,8 +43,8 @@
         "path": "img/DatasetConfig.png"
       }
     ],
-    "version": "3.1.2",
-    "updated": "2023-03-31"
+    "version": "3.1.3",
+    "updated": "2023-09-12"
   },
   "dependencies": {
     "grafanaDependency": ">=8.2.0",