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

AzureMonitor: Allow template variables in the subscription field (#44312)

Browse Source
This commit is contained in:
Andres Martinez Gotor 2022-01-21 16:50:13 +01:00 committed by GitHub
parent ce0ef0ef5e
commit addeba7f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.test.ts
View File

@ -1,5 +1,9 @@
import { renderHook } from '@testing-library/react-hooks'; import { renderHook } from '@testing-library/react-hooks';
import { MockedObjectDeep } from 'ts-jest/dist/utils/testing';
import createMockDatasource from '../../__mocks__/datasource';
import Datasource from '../../datasource';
import { AzureMetricQuery, AzureMonitorOption, AzureMonitorQuery, AzureQueryType } from '../../types';
import { import {
DataHook, DataHook,
updateSubscriptions, updateSubscriptions,
@ -11,10 +15,6 @@ import {
useResourceTypes, useResourceTypes,
useSubscriptions, useSubscriptions,
} from './dataHooks'; } from './dataHooks';
import { AzureMetricQuery, AzureMonitorOption, AzureMonitorQuery, AzureQueryType } from '../../types';
import createMockDatasource from '../../__mocks__/datasource';
import { MockedObjectDeep } from 'ts-jest/dist/utils/testing';
import Datasource from '../../datasource';
interface WaitableMock extends jest.Mock<any, any> { interface WaitableMock extends jest.Mock<any, any> {
waitToBeCalled(): Promise<unknown>; waitToBeCalled(): Promise<unknown>;
@ -363,6 +363,11 @@ describe('AzureMonitor: updateSubscriptions', () => {
query: { ...bareQuery, subscription: 'foo' }, query: { ...bareQuery, subscription: 'foo' },
subscriptionOptions: [{ label: 'foo', value: 'foo' }], subscriptionOptions: [{ label: 'foo', value: 'foo' }],
}, },
{
description: 'should not update with a template variable',
query: { ...bareQuery, subscription: '$foo' },
subscriptionOptions: [],
},
{ {
description: 'should update with the first subscription', description: 'should update with the first subscription',
query: { ...bareQuery }, query: { ...bareQuery },

8
public/app/plugins/datasource/grafana-azure-monitor-datasource/components/MetricsQueryEditor/dataHooks.ts
View File

@ -1,4 +1,5 @@
import { useState, useEffect, useMemo } from 'react'; import { useEffect, useMemo, useState } from 'react';
import Datasource from '../../datasource'; import Datasource from '../../datasource';
import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery } from '../../types'; import { AzureMonitorErrorish, AzureMonitorOption, AzureMonitorQuery } from '../../types';
import { hasOption, toOption } from '../../utils/common'; import { hasOption, toOption } from '../../utils/common';
@ -57,7 +58,10 @@ export const updateSubscriptions = (
const { subscription } = query; const { subscription } = query;
// Return early if subscriptions havent loaded, or if the query already has a subscription // Return early if subscriptions havent loaded, or if the query already has a subscription
if (!subscriptionOptions.length || (subscription && hasOption(subscriptionOptions, subscription))) { if (
!subscriptionOptions.length ||
(subscription && (hasOption(subscriptionOptions, subscription) || subscription.includes('$')))
) {
return; return;
} }