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

fixes for metrics tab when data source was not found

Browse Source
This commit is contained in:
Torkel Ödegaard 2017-09-13 09:48:50 +02:00
parent dd67c9d420
commit 73248d6687
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/panel/metrics_tab.ts
View File

@ -9,7 +9,7 @@ export class MetricsTabCtrl {
panel: any; panel: any;
panelCtrl: any; panelCtrl: any;
datasources: any[]; datasources: any[];
current: any; datasourceInstance: any;
nextRefId: string; nextRefId: string;
dashboard: DashboardModel; dashboard: DashboardModel;
panelDsValue: any; panelDsValue: any;
@ -29,23 +29,26 @@ export class MetricsTabCtrl {
this.panel = this.panelCtrl.panel; this.panel = this.panelCtrl.panel;
this.dashboard = this.panelCtrl.dashboard; this.dashboard = this.panelCtrl.dashboard;
this.datasources = datasourceSrv.getMetricSources(); this.datasources = datasourceSrv.getMetricSources();
this.panelDsValue = this.panelCtrl.panel.datasource || null; this.panelDsValue = this.panelCtrl.panel.datasource;
for (let ds of this.datasources) { for (let ds of this.datasources) {
if (ds.value === this.panelDsValue) { if (ds.value === this.panelDsValue) {
this.current = ds; this.datasourceInstance = ds;
} }
} }
this.addQueryDropdown = {text: 'Add Query', value: null, fake: true}; this.addQueryDropdown = {text: 'Add Query', value: null, fake: true};
// update next ref id // update next ref id
this.panelCtrl.nextRefId = this.dashboard.getNextQueryLetter(this.panel); this.panelCtrl.nextRefId = this.dashboard.getNextQueryLetter(this.panel);
this.updateDatasourceOptions(); this.updateDatasourceOptions();
} }
updateDatasourceOptions() { updateDatasourceOptions() {
this.hasQueryHelp = this.current.meta.hasQueryHelp; if (this.datasourceInstance) {
this.queryOptions = this.current.meta.queryOptions; this.hasQueryHelp = this.datasourceInstance.meta.hasQueryHelp;
this.queryOptions = this.datasourceInstance.meta.queryOptions;
}
} }
getOptions(includeBuiltin) { getOptions(includeBuiltin) {
@ -61,7 +64,7 @@ export class MetricsTabCtrl {
return; return;
} }
this.current = option.datasource; this.datasourceInstance = option.datasource;
this.panelCtrl.setDatasource(option.datasource); this.panelCtrl.setDatasource(option.datasource);
this.updateDatasourceOptions(); this.updateDatasourceOptions();
} }
@ -85,7 +88,7 @@ export class MetricsTabCtrl {
this.queryTroubleshooterOpen = false; this.queryTroubleshooterOpen = false;
this.helpOpen = !this.helpOpen; this.helpOpen = !this.helpOpen;
this.backendSrv.get(`/api/plugins/${this.current.meta.id}/markdown/query_help`).then(res => { this.backendSrv.get(`/api/plugins/${this.datasourceInstance.meta.id}/markdown/query_help`).then(res => {
var md = new Remarkable(); var md = new Remarkable();
this.helpHtml = this.$sce.trustAsHtml(md.render(res)); this.helpHtml = this.$sce.trustAsHtml(md.render(res));
}); });

6
public/app/features/panel/partials/metrics_tab.html
View File

@ -73,7 +73,7 @@
</div> </div>
</div> </div>
<div class="query-editor-rows gf-form-group"> <div class="query-editor-rows gf-form-group" ng-if="ctrl.datasourceInstance">
<div ng-repeat="target in ctrl.panel.targets" ng-class="{'gf-form-disabled': target.hide}"> <div ng-repeat="target in ctrl.panel.targets" ng-class="{'gf-form-disabled': target.hide}">
<rebuild-on-change property="ctrl.panel.datasource || target.datasource" show-null="true"> <rebuild-on-change property="ctrl.panel.datasource || target.datasource" show-null="true">
<plugin-component type="query-ctrl"> <plugin-component type="query-ctrl">
@ -89,11 +89,11 @@
</span> </span>
<span class="gf-form-query-letter-cell-letter">{{ctrl.panelCtrl.nextRefId}}</span> <span class="gf-form-query-letter-cell-letter">{{ctrl.panelCtrl.nextRefId}}</span>
</label> </label>
<button class="btn btn-secondary gf-form-btn" ng-click="ctrl.addQuery()" ng-hide="ctrl.current.meta.mixed"> <button class="btn btn-secondary gf-form-btn" ng-click="ctrl.addQuery()" ng-hide="ctrl.datasourceInstance.meta.mixed">
Add Query Add Query
</button> </button>
<div class="dropdown" ng-if="ctrl.current.meta.mixed"> <div class="dropdown" ng-if="ctrl.datasourceInstance.meta.mixed">
<gf-form-dropdown model="ctrl.addQueryDropdown" get-options="ctrl.getOptions(false)" on-change="ctrl.addMixedQuery($option)"> <gf-form-dropdown model="ctrl.addQueryDropdown" get-options="ctrl.getOptions(false)" on-change="ctrl.addMixedQuery($option)">
</gf-form-dropdown> </gf-form-dropdown>
</div> </div>

4
public/sass/components/_alerts.scss
View File

@ -44,8 +44,8 @@
min-width: 400px; min-width: 400px;
max-width: 600px; max-width: 600px;
position: fixed; position: fixed;
right: 20px; right: 10px;
top: 56px; top: 60px;
} }
.alert-close { .alert-close {