From a046bcdd7c0cbabb5f487586689501a50de38f9e Mon Sep 17 00:00:00 2001 From: yaellec Date: Tue, 2 Aug 2022 16:21:38 +0200 Subject: [PATCH] Renamed query function - added 'Azure' --- .../azuremonitor/template-variables.md | 20 +++++++++---------- .../VariableEditor/VariableEditor.test.tsx | 1 + .../VariableEditor/VariableEditor.tsx | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/docs/sources/datasources/azuremonitor/template-variables.md b/docs/sources/datasources/azuremonitor/template-variables.md index afe5d03c773..79ede27934c 100644 --- a/docs/sources/datasources/azuremonitor/template-variables.md +++ b/docs/sources/datasources/azuremonitor/template-variables.md @@ -25,16 +25,16 @@ types of template variables. The Azure Monitor data source provides the following queries you can specify in the Query field in the Variable edit view -| Name | Description | -| --------------- | -------------------------------------------------------------------------------------------- | -| Subscriptions | Returns subscriptions. | -| Resource Groups | Returns resource groups for a specified subscription. | -| Namespaces | Returns metric namespaces for the specified subscription and resource group. | -| Resource Names | Returns a list of resource names for a specified subscription, resource group and namespace. | -| Metric Names | Returns a list of metric names for a resource. | -| Workspaces | Returns a list of workspaces for the specified subscription. | -| Logs | Use a KQL query to return values. | -| Resource Graph | Use an ARG query to return values. | +| Name | Description | +| -------------------- | -------------------------------------------------------------------------------------------- | +| Subscriptions | Returns subscriptions. | +| Resource Groups | Returns resource groups for a specified subscription. | +| Namespaces | Returns metric namespaces for the specified subscription and resource group. | +| Resource Names | Returns a list of resource names for a specified subscription, resource group and namespace. | +| Metric Names | Returns a list of metric names for a resource. | +| Workspaces | Returns a list of workspaces for the specified subscription. | +| Logs | Use a KQL query to return values. | +| Azure Resource Graph | Use an ARG query to return values. | Any Log Analytics KQL query that returns a single list of values can also be used in the Query field. For example: diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx index c8f153a16d5..962fcbcb21d 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.test.tsx @@ -104,6 +104,7 @@ describe('VariableEditor:', () => { render(); await waitFor(() => screen.queryByTestId('mockeditor')); expect(screen.queryByLabelText('Subscriptions')).toBeInTheDocument(); + expect(screen.queryByText('Azure Resource Graph')).toBeInTheDocument(); expect(screen.queryByLabelText('Select subscription')).not.toBeInTheDocument(); expect(screen.queryByLabelText('Select query type')).not.toBeInTheDocument(); expect(screen.queryByLabelText('Select resource group')).not.toBeInTheDocument(); diff --git a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx index d448dfff65f..f10582a1977 100644 --- a/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx +++ b/public/app/plugins/datasource/grafana-azure-monitor-datasource/components/VariableEditor/VariableEditor.tsx @@ -33,7 +33,7 @@ const VariableEditor = (props: Props) => { { label: 'Metric Names', value: AzureQueryType.MetricNamesQuery }, { label: 'Workspaces', value: AzureQueryType.WorkspacesQuery }, { label: 'Logs', value: AzureQueryType.LogAnalytics }, - { label: 'Resource Graph', value: AzureQueryType.AzureResourceGraph }, + { label: 'Azure Resource Graph', value: AzureQueryType.AzureResourceGraph }, ]; if (typeof props.query === 'object' && props.query.queryType === AzureQueryType.GrafanaTemplateVariableFn) { // Add the option for the GrafanaTemplateVariableFn only if it's already in use