AzureMonitor: rename labels for query type dropdown (#30143)

* AzureMonitor: rename labels for queryType dropdown

* Reorder to match original order

* Docs: rename query types

* Docs: update KQL url

* Docs: update Azure Monitor / Log Analytics names

* Update documentation to include new name

* Docs formatting

* Rename Azure Monitor config editor names

* update test snapshots

docs/sources/getting-started/timeseries-dimensions.md

@@ -8,7 +8,7 @@ weight = 600
 
 # Time series dimensions
 
-At the end of the ["Time series databases" section of "Introduction to time series"]({{< relref "timeseries.md#time-series-databases" >}}), the concept of _labels_, also called  _tags_, is introduced:
+At the end of the ["Time series databases" section of "Introduction to time series"]({{< relref "timeseries.md#time-series-databases" >}}), the concept of _labels_, also called _tags_, is introduced:
 
 > Another feature of a TSDB is the ability to filter measurements using _tags_. Each data point is labeled with a tag that adds context information, such as where the measurement was taken. ...
 
@@ -74,12 +74,12 @@ If the query is updated to select and group by more than just one string column,
 
 In this case the labels that represent the dimensions will have two keys based on the two string typed columns `Location` and `Sensor`. This data results four series: `Temp {Location=LGA,Sensor=A}`, `Temp {Location=LGA,Sensor=B}`, `Temp {Location=BOS,Sensor=A}`, and `Temp {Location=BOS,Sensor=B}`.
 
-> **Note:** More than one dimension for SQL data sources is currently only supported in the Analytics services with the Azure monitor service as of version 7.1. Support for SQL data sources such as MySQL, Postgres, and MSSQL is planned to be added for 7.2.
+> **Note:** More than one dimension is currently only supported in the Logs queries within the Azure Monitor service as of version 7.1.
 
 > **Note:** Multiple dimensions are not supported in a way that maps to multiple alerts in Grafana, but rather they are treated as multiple conditions to a single alert. See the documentation on [creating alerts with multiple series]({{< relref "../alerting/create-alerts.md#multiple-series" >}}).
 
 ### Multiple values
 
-In the case SQL-like data sources, more than one numeric column can be selected, with or without additional string columns to be used as dimensions. For example, ` AVG(Temperature) AS AvgTemp,  MAX(Temperature) AS MaxTemp`. This, if combined with multiple dimensions can result in a lot of series. Selecting multiple values is currently only designed to be used with visualization.
+In the case SQL-like data sources, more than one numeric column can be selected, with or without additional string columns to be used as dimensions. For example, `AVG(Temperature) AS AvgTemp, MAX(Temperature) AS MaxTemp`. This, if combined with multiple dimensions can result in a lot of series. Selecting multiple values is currently only designed to be used with visualization.
 
 Additional technical information on tabular time series formats and how dimensions are extracted can be found in [the developer documentation on data frames as time series]({{< relref "../developers/plugins/data-frames.md#data-frames-as-time-series" >}}).

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/AnalyticsConfig.tsx

@@ -136,7 +136,7 @@ export class AnalyticsConfig extends PureComponent<Props, State> {
 
     return (
       <>
-        <h3 className="page-heading">Azure Log Analytics API Details</h3>
+        <h3 className="page-heading">Azure Monitor Logs Details</h3>
         <Switch
           label="Same details as Azure Monitor API"
           checked={jsonData.azureLogAnalyticsSameAs ?? false}

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/InsightsConfig.tsx

@@ -22,7 +22,7 @@ export class InsightsConfig extends PureComponent<Props> {
     const { options, onUpdateJsonDataOption, onUpdateSecureJsonDataOption } = this.props;
     return (
       <>
-        <h3 className="page-heading">Application Insights Details</h3>
+        <h3 className="page-heading">Azure Application Insights Details</h3>
         <div className="gf-form-group">
           {options.secureJsonFields.appInsightsApiKey ? (
             <div className="gf-form-inline">

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MonitorConfig.tsx

@@ -55,7 +55,7 @@ export class MonitorConfig extends PureComponent<Props> {
     const { options, subscriptions } = this.props;
     return (
       <>
-        <h3 className="page-heading">Azure Monitor Details</h3>
+        <h3 className="page-heading">Azure Monitor Metrics Details</h3>
         <AzureCredentialsForm
           selectedAzureCloud={options.jsonData.cloudName || 'azuremonitor'}
           azureCloudOptions={azureClouds}

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/AnalyticsConfig.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Render should disable log analytics credentials form 1`] = `
   <h3
     className="page-heading"
   >
-    Azure Log Analytics API Details
+    Azure Monitor Logs Details
   </h3>
   <Switch
     checked={false}
@@ -101,7 +101,7 @@ exports[`Render should enable azure log analytics load workspaces button 1`] = `
   <h3
     className="page-heading"
   >
-    Azure Log Analytics API Details
+    Azure Monitor Logs Details
   </h3>
   <Switch
     checked={false}
@@ -197,7 +197,7 @@ exports[`Render should render component 1`] = `
   <h3
     className="page-heading"
   >
-    Azure Log Analytics API Details
+    Azure Monitor Logs Details
   </h3>
   <Switch
     checked={false}

public/app/plugins/datasource/grafana-azure-monitor-datasource/components/__snapshots__/InsightsConfig.test.tsx.snap

@@ -5,7 +5,7 @@ exports[`Render should disable insights api key input 1`] = `
   <h3
     className="page-heading"
   >
-    Application Insights Details
+    Azure Application Insights Details
   </h3>
   <div
     className="gf-form-group"
@@ -73,7 +73,7 @@ exports[`Render should enable insights api key input 1`] = `
   <h3
     className="page-heading"
   >
-    Application Insights Details
+    Azure Application Insights Details
   </h3>
   <div
     className="gf-form-group"
@@ -130,7 +130,7 @@ exports[`Render should render component 1`] = `
   <h3
     className="page-heading"
   >
-    Application Insights Details
+    Azure Application Insights Details
   </h3>
   <div
     className="gf-form-group"

public/app/plugins/datasource/grafana-azure-monitor-datasource/partials/query.editor.html

@@ -6,7 +6,7 @@
         <select
           class="gf-form-input service-dropdown min-width-12"
           ng-model="ctrl.target.queryType"
-          ng-options="f as f for f in ['Application Insights', 'Azure Monitor', 'Azure Log Analytics', 'Insights Analytics']"
+          ng-options="f.id as f.label for f in ctrl.queryQueryTypeOptions"
           ng-change="ctrl.onQueryTypeChange()"
         ></select>
       </div>

public/app/plugins/datasource/grafana-azure-monitor-datasource/query_ctrl.ts

@@ -21,6 +21,13 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
 
   dummyDiminsionString = '+';
 
+  queryQueryTypeOptions = [
+    { id: AzureQueryType.ApplicationInsights, label: 'Application Insights' },
+    { id: AzureQueryType.AzureMonitor, label: 'Metrics' },
+    { id: AzureQueryType.LogAnalytics, label: 'Logs' },
+    { id: AzureQueryType.InsightsAnalytics, label: 'Insights Analytics' },
+  ];
+
   target: {
     // should be: AzureMonitorQuery
     refId: string;