IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

CloudWatch: Annotations query editor loading fix (#20687)

Browse Source 
* Re-adding lost import

* Make sure wildcard is not in annotations editor
This commit is contained in:
Erik Sundell 2019-11-27 11:48:58 +01:00 committed by GitHub
parent 21fed8c5f1
commit 2929649fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx
View File

@ -159,6 +159,7 @@ export class QueryEditor extends PureComponent<Props, State> {
const { [newKey]: value, ...newDimensions } = query.dimensions;
return datasource
.getDimensionValues(query.region, query.namespace, query.metricName, newKey, newDimensions)
.then(values => (values.length ? [{ value: '*', text: '*', label: '*' }, ...values] : values))
.then(this.appendTemplateVariables);
}}
/>

2
public/app/plugins/datasource/cloudwatch/datasource.ts
View File

@ -375,7 +375,7 @@ export default class CloudWatchDatasource extends DataSourceApi<CloudWatchQuery,
dimensions: this.convertDimensionFormat(filterDimensions, {}),
});
return values.length ? [{ value: '*', text: '*', label: '*' }, ...values] : values;
return values;
}
getEbsVolumeIds(region: string, instanceId: string) {

1
public/app/plugins/datasource/cloudwatch/module.tsx
View File

@ -1,3 +1,4 @@
import './query_parameter_ctrl';
import { DataSourcePlugin } from '@grafana/data';
import { ConfigEditor } from './components/ConfigEditor';
import { QueryEditor } from './components/QueryEditor';