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

fix: graphite issue with metricFind and sending from/until in normal format, fixes #8997

Browse Source
This commit is contained in:
Torkel Ödegaard
2017-08-08 13:51:54 +02:00
parent 83beff300b
commit d3680d290c
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
public/app/features/dashboard/save_as_modal.ts
View File

@@ -44,12 +44,16 @@ export class SaveDashboardAsModalCtrl {
this.clone.editable = true;
this.clone.hideControls = false;
// remove alerts
this.clone.rows.forEach(row => {
row.panels.forEach(panel => {
delete panel.alert;
// remove alerts if source dashboard is already persisted
// do not want to create alert dupes
if (dashboard.id > 0) {
this.clone.rows.forEach(row => {
row.panels.forEach(panel => {
delete panel.thresholds;
delete panel.alert;
});
});
});
}
delete this.clone.autoUpdate;
}

4
public/app/plugins/datasource/graphite/datasource.ts
View File

@@ -176,8 +176,8 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
};
if (options && options.range) {
httpOptions.params.from = this.translateTime(options.range.raw.from, false);
httpOptions.params.until = this.translateTime(options.range.raw.to, true);
httpOptions.params.from = this.translateTime(options.range.from, false);
httpOptions.params.until = this.translateTime(options.range.to, true);
}
return this.doGraphiteRequest(httpOptions).then(results => {