Merge pull request #140 from flant/fix_grafana_7_2

fix: Grafana 7.2 compatibility
This commit is contained in:
Ivan Mikheykin
2020-10-12 10:56:46 +03:00
committed by GitHub
3 changed files with 11 additions and 1 deletions
+5
View File
@@ -267,6 +267,11 @@ System.register(["lodash", "./color_legend", "./options_editor", "./tooltip_edit
PanelEvents.fallbackToStringEvents(); PanelEvents.fallbackToStringEvents();
_export("renderComplete", renderComplete = 'statusmap-render-complete'); _export("renderComplete", renderComplete = 'statusmap-render-complete');
} // Grafana 7.2 workaround
if (typeof kbn["intervalToMs"] === "function") {
kbn.interval_to_ms = kbn.intervalToMs;
} }
migratePanelConfig(_this.panel); migratePanelConfig(_this.panel);
+1 -1
View File
File diff suppressed because one or more lines are too long
+5
View File
@@ -153,6 +153,11 @@ class StatusHeatmapCtrl extends MetricsPanelCtrl {
renderComplete = 'statusmap-render-complete'; renderComplete = 'statusmap-render-complete';
} }
// Grafana 7.2 workaround
if (typeof kbn["intervalToMs"] === "function") {
kbn.interval_to_ms = kbn.intervalToMs;
}
migratePanelConfig(this.panel); migratePanelConfig(this.panel);
_.defaultsDeep(this.panel, this.panelDefaults); _.defaultsDeep(this.panel, this.panelDefaults);