Skip to content

Commit

Permalink
Merge pull request #125 from scalyr/dset-4485
Browse files Browse the repository at this point in the history
DSET-4485: Adding configs to DataSet Grafana Cloud returns TypeError
  • Loading branch information
jmakar-s1 authored Sep 12, 2023
2 parents ac19d3e + 5647b2a commit dd247de
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 6 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 3.1.3

- Bugfix around scalyrUrl assignment (Issue #124)

## 3.1.2

- Cross-team query support.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion pkg/plugin/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions src/ConfigEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/plugin.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit dd247de

Please sign in to comment.