CloudWatch: Annotations query editor loading fix (#20687)

* Re-adding lost import

* Make sure wildcard is not in annotations editor

public/app/plugins/datasource/cloudwatch/components/QueryEditor.tsx

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

public/app/plugins/datasource/cloudwatch/datasource.ts

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

public/app/plugins/datasource/cloudwatch/module.tsx

+import './query_parameter_ctrl';
 import { DataSourcePlugin } from '@grafana/data';
 import { DataSourcePlugin } from '@grafana/data';
 import { ConfigEditor } from './components/ConfigEditor';
 import { ConfigEditor } from './components/ConfigEditor';
 import { QueryEditor } from './components/QueryEditor';
 import { QueryEditor } from './components/QueryEditor';