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

public/app/core/services/backend_srv.ts

@@ -235,42 +235,54 @@ export class BackendSrv {
 
 
   createDashboardFolder(name) {
   createDashboardFolder(name) {
     const dash = {
     const dash = {
+      schemaVersion: 16,
       title: name,
       title: name,
       editable: true,
       editable: true,
       hideControls: true,
       hideControls: true,
-      rows: [
+      panels: [
         {
         {
-          panels: [
-            {
-              folderId: 0,
-              headings: false,
-              limit: 1000,
-              links: [],
-              query: '',
-              recent: false,
-              search: true,
-              span: 4,
-              starred: false,
-              tags: [],
-              title: 'Dashboards in this folder',
-              type: 'dashlist'
-            },
-            {
-              onlyAlertsOnDashboard: true,
-              span: 4,
-              title: 'Alerts in this folder',
-              type: 'alertlist'
-            },
-            {
-              span: 4,
-              title: 'Permissions for this folder',
-              type: 'permissionlist',
-              folderId: 0
-            }
-          ],
-          showTitle: true,
-          title: name,
-          titleSize: 'h1'
+          id: 1,
+          folderId: 0,
+          headings: false,
+          limit: 1000,
+          links: [],
+          query: '',
+          recent: false,
+          search: true,
+          starred: false,
+          tags: [],
+          title: 'Dashboards in this folder',
+          type: 'dashlist',
+          gridPos: {
+            x: 0,
+            y: 0,
+            w: 4,
+            h: 10
+          }
+        },
+        {
+          id: 2,
+          onlyAlertsOnDashboard: true,
+          title: 'Alerts in this folder',
+          type: 'alertlist',
+          gridPos: {
+            x: 4,
+            y: 0,
+            w: 4,
+            h: 10
+          }
+        },
+        {
+          id: 3,
+          title: 'Permissions for this folder',
+          type: 'permissionlist',
+          folderId: 0,
+          gridPos: {
+            x: 8,
+            y: 0,
+            w: 4,
+            h: 10
+          }
         }
         }
       ]
       ]
     };
     };
@@ -280,8 +292,8 @@ export class BackendSrv {
       return this.getDashboard('db', res.slug);
       return this.getDashboard('db', res.slug);
     })
     })
     .then(res => {
     .then(res => {
-      res.dashboard.rows[0].panels[0].folderId = res.dashboard.id;
-      res.dashboard.rows[0].panels[2].folderId = res.dashboard.id;
+      res.dashboard.panels[0].folderId = res.dashboard.id;
+      res.dashboard.panels[2].folderId = res.dashboard.id;
       return this.saveDashboard(res.dashboard, {overwrite: false});
       return this.saveDashboard(res.dashboard, {overwrite: false});
     });
     });
   }
   }

public/app/features/dashboard/PanelModel.ts

@@ -18,6 +18,7 @@ export class PanelModel {
   gridPos:  GridPos;
   gridPos:  GridPos;
   type: string;
   type: string;
   title: string;
   title: string;
+  alert?: any;
 
 
   // non persisted
   // non persisted
   fullscreen: boolean;
   fullscreen: boolean;

public/app/features/dashboard/dashnav/dashnav.ts

@@ -92,16 +92,16 @@ export class DashNavCtrl {
     }
     }
 
 
     deleteDashboard() {
     deleteDashboard() {
-      var confirmText = "";
+      var confirmText = '';
       var text2 = this.dashboard.title;
       var text2 = this.dashboard.title;
-      var alerts = this.dashboard.rows.reduce((memo, row) => {
-        memo += row.panels.filter(panel => panel.alert).length;
-        return memo;
-      }, 0);
+
+      const alerts = _.sumBy(this.dashboard.panels, panel => {
+         return panel.alert ? 1 : 0;
+      });
 
 
       if (alerts > 0) {
       if (alerts > 0) {
         confirmText = 'DELETE';
         confirmText = 'DELETE';
-        text2 = `This dashboard contains ${alerts} alerts. Deleting this dashboad will also delete those alerts`;
+        text2 = `This dashboard contains ${alerts} alerts. Deleting this dashboard will also delete those alerts`;
       }
       }
 
 
       appEvents.emit('confirm-modal', {
       appEvents.emit('confirm-modal', {

scripts/webpack/webpack.dev.js

@@ -10,7 +10,7 @@ const WebpackCleanupPlugin = require('webpack-cleanup-plugin');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 
 
 module.exports = merge(common, {
 module.exports = merge(common, {
-  devtool: "eval-source-map",
+  devtool: "cheap-module-source-map",
 
 
   entry: {
   entry: {
     dark: './public/sass/grafana.dark.scss',
     dark: './public/sass/grafana.dark.scss',