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 : Query more than 10 dimensions ( Fixes #17230 ) (#18693)

Browse Source 
* Fixes #17230

* Resovled comments

* Resolved comments

* spell fix
This commit is contained in:
Sriramajeyam
2019-10-03 15:53:11 +01:00
committed by Erik Sundell
parent a62dea47b4
commit 50acb37a17
6 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,6 +75,7 @@ export default class AzureMonitorDatasource {
const metricDefinition = this.templateSrv.replace(item.metricDefinition, options.scopedVars);
const timeGrain = this.templateSrv.replace((item.timeGrain || '').toString(), options.scopedVars);
const aggregation = this.templateSrv.replace(item.aggregation, options.scopedVars);
const top = this.templateSrv.replace(item.top || '', options.scopedVars);
return {
refId: target.refId,
@@ -95,6 +96,7 @@ export default class AzureMonitorDatasource {
metricNamespace && metricNamespace !== this.defaultDropdownValue ? metricNamespace : metricDefinition,
aggregation: aggregation,
dimension: this.templateSrv.replace(item.dimension, options.scopedVars),
top: top || '10',
dimensionFilter: this.templateSrv.replace(item.dimensionFilter, options.scopedVars),
alias: item.alias,
format: target.format,

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

@@ -91,6 +91,11 @@
<input type="text" class="gf-form-input width-17" ng-model="ctrl.target.azureMonitor.dimensionFilter"
spellcheck="false" placeholder="auto" ng-blur="ctrl.refresh()">
</div>
<div class="gf-form">
<label class="gf-form-label query-keyword width-9">Top</label>
<input type="text" class="gf-form-input width-3" ng-model="ctrl.target.azureMonitor.top"
spellcheck="false" placeholder="10" ng-blur="ctrl.refresh()">
</div>
<div class="gf-form gf-form--grow">
<div class="gf-form-label gf-form-label--grow"></div>
</div>

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

@@ -36,6 +36,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
allowedTimeGrainsMs: number[];
dimensions: any[];
dimension: any;
top: string;
aggregation: string;
aggOptions: string[];
};
@@ -71,6 +72,7 @@ export class AzureMonitorQueryCtrl extends QueryCtrl {
metricName: this.defaultDropdownValue,
dimensionFilter: '*',
timeGrain: 'auto',
top: '10',
},
azureLogAnalytics: {
query: [

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

@@ -41,6 +41,7 @@ export interface AzureMetricQuery {
dimension: string;
dimensionFilter: string;
alias: string;
top: string;
}
export interface AzureLogsQuery {