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: query builder cleanup (#25956)

Browse Source
This commit is contained in:
Ryan McKinley 2020-06-30 22:55:04 -07:00 committed by GitHub
parent 3a9a4f4a49
commit cbb9a63b9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.test.ts
View File

@ -931,11 +931,22 @@ describe('AzureMonitorDatasource', () => {
'Transactions' 'Transactions'
) )
.then((results: any) => { .then((results: any) => {
expect(results.dimensions.length).toEqual(4); expect(results.dimensions).toMatchInlineSnapshot(`
expect(results.dimensions[0].text).toEqual('None'); Array [
expect(results.dimensions[0].value).toEqual('None'); Object {
expect(results.dimensions[1].text).toEqual('Response type'); "text": "Response type",
expect(results.dimensions[1].value).toEqual('ResponseType'); "value": "ResponseType",
},
Object {
"text": "Geo type",
"value": "GeoType",
},
Object {
"text": "API name",
"value": "ApiName",
},
]
`);
}); });
}); });

7
public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/azure_monitor_datasource.ts
View File

@ -74,11 +74,14 @@ export default class AzureMonitorDatasource extends DataSourceWithBackend<AzureM
const aggregation = templateSrv.replace(item.aggregation, scopedVars); const aggregation = templateSrv.replace(item.aggregation, scopedVars);
const top = templateSrv.replace(item.top || '', scopedVars); const top = templateSrv.replace(item.top || '', scopedVars);
const dimensionsFilters = item.dimensionFilters.map(f => { const dimensionsFilters = item.dimensionFilters
.filter(f => f.dimension && f.dimension !== 'None')
.map(f => {
const filter = templateSrv.replace(f.filter, scopedVars);
return { return {
dimension: templateSrv.replace(f.dimension, scopedVars), dimension: templateSrv.replace(f.dimension, scopedVars),
operator: f.operator || 'eq', operator: f.operator || 'eq',
filter: templateSrv.replace(f.filter, scopedVars), filter: filter || '*', // send * when empty
}; };
}); });

4
public/app/plugins/datasource/grafana-azure-monitor-datasource/azure_monitor/response_parser.ts
View File

@ -92,10 +92,6 @@ export default class ResponseParser {
return dimensions; return dimensions;
} }
if (!metricData.isDimensionRequired) {
dimensions.push({ text: 'None', value: 'None' });
}
for (let i = 0; i < metricData.dimensions.length; i++) { for (let i = 0; i < metricData.dimensions.length; i++) {
const text = metricData.dimensions[i].localizedValue; const text = metricData.dimensions[i].localizedValue;
const value = metricData.dimensions[i].value; const value = metricData.dimensions[i].value;

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

@ -100,7 +100,7 @@
> >
</gf-form-dropdown> </gf-form-dropdown>
</div> </div>
<div class="gf-form gf-form--grow aggregation-dropdown-wrapper"> <div class="gf-form">
<label class="gf-form-label query-keyword width-9">Aggregation</label> <label class="gf-form-label query-keyword width-9">Aggregation</label>
<div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent"> <div class="gf-form-select-wrapper gf-form-select-wrapper--caret-indent">
<select <select
@ -111,6 +111,9 @@
></select> ></select>
</div> </div>
</div> </div>
<div class="gf-form gf-form--grow">
<div class="gf-form-label gf-form-label--grow"></div>
</div>
</div> </div>
<div class="gf-form-inline"> <div class="gf-form-inline">
<div class="gf-form"> <div class="gf-form">

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

@ -533,7 +533,6 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
operator: 'eq', operator: 'eq',
filter: '', filter: '',
}); });
this.refresh();
} }
azureMonitorRemoveDimensionFilter(index: number) { azureMonitorRemoveDimensionFilter(index: number) {