Commit 2929649f by Erik Sundell Committed by GitHub

CloudWatch: Annotations query editor loading fix (#20687)

* Re-adding lost import

* Make sure wildcard is not in annotations editor
parent 21fed8c5
......@@ -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);
}}
/>
......
......@@ -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) {
......
import './query_parameter_ctrl';
import { DataSourcePlugin } from '@grafana/data';
import { ConfigEditor } from './components/ConfigEditor';
import { QueryEditor } from './components/QueryEditor';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment