Merge branch 'alert_ui_take2' of github.com:grafana/grafana into alert_ui_take2

Conflicts: public/app/plugins/panel/graph/alert_tab_ctrl.ts
2025-02-25 18:55:37 -06:00 · 2016-06-10 14:52:17 +02:00
parent 48cbeb96bf ea8fb66f73
commit c18017381b
20 changed files with 295 additions and 463 deletions
--- a/public/app/plugins/panel/graph/alert_tab_ctrl.ts
+++ b/public/app/plugins/panel/graph/alert_tab_ctrl.ts
@@ -60,8 +60,8 @@ export class AlertTabCtrl {
    },
    transform: {
      type: 'aggregation',
-      method: 'avg',
-    },
+      method: 'avg'
+    }
  };

  /** @ngInject */