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

Azure Monitor: Bug Fix for for template variables (#47478)

Browse Source
This commit is contained in:
jcolladokuri 2022-04-11 16:36:51 -07:00 committed by GitHub
parent af9353caec
commit 7a8437020d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.test.ts
View File

@ -471,6 +471,34 @@ describe('VariableSupport', () => {
done();
});
});
it('should return None when there is no data', (done) => {
const variableSupport = new VariableSupport(
createMockDatasource({
azureLogAnalyticsDatasource: {
defaultSubscriptionId: 'defaultSubscriptionId',
},
getMetricNames: jest.fn().mockResolvedValueOnce([]),
})
);
const mockRequest = {
targets: [
{
refId: 'A',
queryType: AzureQueryType.GrafanaTemplateVariableFn,
grafanaTemplateVariableFn: {
kind: 'MetricNamesQuery',
rawQuery: 'metricNames(resourceGroup, metricDefinition, resourceName, metricNamespace)',
},
} as AzureMonitorQuery,
],
} as DataQueryRequest<AzureMonitorQuery>;
const observables = variableSupport.query(mockRequest);
observables.subscribe((result: DataQueryResponseData) => {
expect(result.data.length).toBe(0);
done();
});
});
});
it('passes on the query to the main datasource for all non-grafana template variable fns', (done) => {

2
public/app/plugins/datasource/grafana-azure-monitor-datasource/variables.ts
View File

@ -32,7 +32,7 @@ export class VariableSupport extends CustomVariableSupport<DataSource, AzureMoni
try {
const templateVariablesResults = await this.callGrafanaTemplateVariableFn(queryObj.grafanaTemplateVariableFn);
return {
data: templateVariablesResults ? [toDataFrame(templateVariablesResults)] : [],
data: templateVariablesResults?.length ? [toDataFrame(templateVariablesResults)] : [],
};
} catch (err) {
return { data: [], error: { message: messageFromError(err) } };