diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d6c63ee023..b7d233c8237 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ -# 1.8.0 (2014-09-12) +# 1.8.0 (unreleased) **Fixes** - [Issue #802](https://github.com/grafana/grafana/issues/802). Annotations: Fix when using InfluxDB datasource +- [Issue #795](https://github.com/grafana/grafana/issues/795). Chrome: Fix for display issue in chrome beta & chrome canary when entering edit mode +- [Issue #818](https://github.com/grafana/grafana/issues/818). Graph: Added percent y-axis format +- [Issue #828](https://github.com/grafana/grafana/issues/828). Elasticsearch: saving new dashboard with title equal to slugified url would cause it to deleted. # 1.8.0-RC1 (2014-09-12) @@ -244,7 +247,7 @@ Read this for more info: - More graphite function definitions - Make "ms" axis format include hour, day, weeks, month and year ([Issue #149](https://github.com/grafana/grafana/issues/149)) - Microsecond axis format ([Issue #146](https://github.com/grafana/grafana/issues/146)) -- Specify template paramaters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123)) +- Specify template parameters in URL ([Issue #123](https://github.com/grafana/grafana/issues/123)) ### Fixes - Basic Auth fix ([Issue #152](https://github.com/grafana/grafana/issues/152)) diff --git a/src/app/components/kbn.js b/src/app/components/kbn.js index cefcb42d289..7c61b22c83b 100644 --- a/src/app/components/kbn.js +++ b/src/app/components/kbn.js @@ -531,6 +531,10 @@ function($, _, moment) { return function(val) { return kbn.nanosFormat(val, decimals); }; + case 'percent': + return function(val, axis) { + return kbn.noneFormat(val, axis ? axis.tickDecimals : null) + ' %'; + }; default: return function(val, axis) { return kbn.noneFormat(val, axis ? axis.tickDecimals : null); @@ -563,8 +567,8 @@ function($, _, moment) { kbn.msFormat = function(size, decimals) { // Less than 1 milli, downscale to micro - if (Math.abs(size) < 1) { - return kbn.microsFormat(size * 1000,decimals); + if (size !== 0 && Math.abs(size) < 1) { + return kbn.microsFormat(size * 1000, decimals); } else if (Math.abs(size) < 1000) { return size.toFixed(decimals) + " ms"; @@ -591,7 +595,7 @@ function($, _, moment) { kbn.sFormat = function(size, decimals) { // Less than 1 sec, downscale to milli - if (Math.abs(size) < 1) { + if (size !== 0 && Math.abs(size) < 1) { return kbn.msFormat(size * 1000, decimals); } // Less than 10 min, use seconds @@ -620,7 +624,7 @@ function($, _, moment) { kbn.microsFormat = function(size, decimals) { // Less than 1 micro, downscale to nano - if (Math.abs(size) < 1) { + if (size !== 0 && Math.abs(size) < 1) { return kbn.nanosFormat(size * 1000, decimals); } else if (Math.abs(size) < 1000) { diff --git a/src/app/controllers/all.js b/src/app/controllers/all.js index 4ce2a6f5822..f5b943e36c6 100644 --- a/src/app/controllers/all.js +++ b/src/app/controllers/all.js @@ -1,5 +1,5 @@ define([ - './p_grafanaCtrl', + './pro/grafanaCtrl', './dashboardCtrl', './dashboardNavCtrl', './row', diff --git a/src/app/controllers/dashboardNavCtrl.js b/src/app/controllers/dashboardNavCtrl.js index b6813b7ce19..76ef34f8e92 100644 --- a/src/app/controllers/dashboardNavCtrl.js +++ b/src/app/controllers/dashboardNavCtrl.js @@ -78,7 +78,7 @@ function (angular, _, moment, config, store) { var clone = angular.copy($scope.dashboard); $scope.db.saveDashboard(clone) .then(function(result) { - alertSrv.set('Dashboard Saved', 'Dashboard has been saved as "' + result.title + '"','success', 5000); + alertSrv.set('Dashboard Saved', 'Saved as "' + result.title + '"','success', 3000); if (result.url !== $location.path()) { $location.search({}); @@ -88,7 +88,7 @@ function (angular, _, moment, config, store) { $rootScope.$emit('dashboard-saved', $scope.dashboard); }, function(err) { - alertSrv.set('Save failed', err, 'error',5000); + alertSrv.set('Save failed', err, 'error', 5000); }); }; diff --git a/src/app/controllers/p_grafanaCtrl.js b/src/app/controllers/pro/grafanaCtrl.js similarity index 85% rename from src/app/controllers/p_grafanaCtrl.js rename to src/app/controllers/pro/grafanaCtrl.js index 65bb8745195..a32b4998a41 100644 --- a/src/app/controllers/p_grafanaCtrl.js +++ b/src/app/controllers/pro/grafanaCtrl.js @@ -11,10 +11,8 @@ function (angular, config, _, $, store) { var module = angular.module('grafana.controllers'); module.controller('GrafanaCtrl', function($scope, alertSrv, grafanaVersion, $rootScope) { - $scope.grafanaVersion = grafanaVersion[0] === '@' ? 'master' : grafanaVersion; - $scope.consoleEnabled = store.getBool('grafanaConsole'); - //$scope.showProSideMenu = store.getBool('grafanaProSideMenu'); + $scope.grafana = {}; $rootScope.profilingEnabled = store.getBool('profilingEnabled'); $rootScope.performance = { loadStart: new Date().getTime() }; @@ -25,25 +23,27 @@ function (angular, config, _, $, store) { if ($rootScope.profilingEnabled) { $scope.initProfiling(); } $scope.dashAlerts = alertSrv; - $scope.grafana = { style: 'dark' }; + $scope.grafana.style = 'dark'; + $scope.grafana.sidemenu = store.getBool('grafana.sidemenu'); + + if (window.grafanaBootData.user.login) { + $scope.grafana.user = window.grafanaBootData.user; + } $scope.onAppEvent('logged-out', function() { $scope.showProSideMenu = false; + $scope.grafana.user = {}; }); - $scope.onAppEvent('logged-in', function() { - $scope.showProSideMenu = store.getBool('grafanaProSideMenu'); + $scope.onAppEvent('logged-in', function(evt, user) { + $scope.grafana.sidemenu = store.getBool('grafana.sidemenu'); + $scope.grafana.user = user; }); }; $scope.toggleProSideMenu = function() { - $scope.showProSideMenu = !$scope.showProSideMenu; - store.set('grafanaProSideMenu', $scope.showProSideMenu); - }; - - $scope.toggleConsole = function() { - $scope.consoleEnabled = !$scope.consoleEnabled; - store.set('grafanaConsole', $scope.consoleEnabled); + $scope.grafana.sidemenu = !$scope.grafana.sidemenu; + store.set('grafana.sidemenu', $scope.grafana.sidemenu); }; $rootScope.onAppEvent = function(name, callback) { diff --git a/src/app/controllers/p_loginCtrl.js b/src/app/controllers/pro/loginCtrl.js similarity index 84% rename from src/app/controllers/p_loginCtrl.js rename to src/app/controllers/pro/loginCtrl.js index 793cd357844..814b430c032 100644 --- a/src/app/controllers/p_loginCtrl.js +++ b/src/app/controllers/pro/loginCtrl.js @@ -8,6 +8,7 @@ function (angular) { module.controller('LoginCtrl', function($scope, $http, $location, $routeParams, alertSrv) { $scope.loginModel = {}; + $scope.grafana.sidemenu = false; $scope.init = function() { if ($routeParams.logout) { @@ -20,6 +21,7 @@ function (angular) { alertSrv.set('Logged out!', '', 'success', 3000); $scope.emitAppEvent('logged-out'); + $location.search({}); }, function() { alertSrv.set('Logout failed:', 'Unexpected error', 'error', 3000); @@ -33,8 +35,8 @@ function (angular) { return; } - $http.post('/login', $scope.loginModel).then(function() { - $scope.emitAppEvent('logged-in'); + $http.post('/login', $scope.loginModel).then(function(results) { + $scope.emitAppEvent('logged-in', results.data.user); $location.path('/'); }, function(err) { if (err.status === 401) { diff --git a/src/app/controllers/search.js b/src/app/controllers/search.js index 98e6616f0a4..18b860d0ab5 100644 --- a/src/app/controllers/search.js +++ b/src/app/controllers/search.js @@ -119,9 +119,10 @@ function (angular, _, config, $) { $scope.searchDashboards($scope.query.query); }; - $scope.deleteDashboard = function(id, evt) { + $scope.deleteDashboard = function(dash, evt) { evt.stopPropagation(); - $scope.emitAppEvent('delete-dashboard', { id: id }); + $scope.emitAppEvent('delete-dashboard', { id: dash.id }); + $scope.results.dashboards = _.without($scope.results.dashboards, dash); }; $scope.addMetricToCurrentDashboard = function (metricId) { diff --git a/src/app/dashboards/default.json b/src/app/dashboards/default.json index ab22805f99c..70b907e13da 100644 --- a/src/app/dashboards/default.json +++ b/src/app/dashboards/default.json @@ -17,7 +17,7 @@ "editable": true, "type": "text", "mode": "html", - "content": "
\n \n
", + "content": "
\n \n
", "style": {}, "title": "Welcome to" } diff --git a/src/app/directives/grafanaGraph.js b/src/app/directives/grafanaGraph.js index 15f1556aa62..ee6b0fb7dd7 100755 --- a/src/app/directives/grafanaGraph.js +++ b/src/app/directives/grafanaGraph.js @@ -110,6 +110,11 @@ function (angular, $, kbn, moment, _) { // Populate element var options = { + hooks: { + drawSeries: [function() { + console.log('drawSeries', arguments); + }] + }, legend: { show: false }, series: { stackpercent: panel.stack ? panel.percentage : false, diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html index 6800ee832b9..9380cb99327 100644 --- a/src/app/panels/graph/axisEditor.html +++ b/src/app/panels/graph/axisEditor.html @@ -4,7 +4,7 @@
Left Y Axis
- +
@@ -23,7 +23,7 @@
Right Y Axis
- +
diff --git a/src/app/panels/graph/seriesOverridesCtrl.js b/src/app/panels/graph/seriesOverridesCtrl.js index 4f54c6d0e6f..1b6b1dfc144 100644 --- a/src/app/panels/graph/seriesOverridesCtrl.js +++ b/src/app/panels/graph/seriesOverridesCtrl.js @@ -70,7 +70,7 @@ define([ $scope.addOverrideOption('Staircase line', 'steppedLine', [true, false]); $scope.addOverrideOption('Points', 'points', [true, false]); $scope.addOverrideOption('Points Radius', 'pointradius', [1,2,3,4,5]); - $scope.addOverrideOption('Stack', 'stack', [true, false]); + $scope.addOverrideOption('Stack', 'stack', [true, false, 2, 3, 4, 5]); $scope.addOverrideOption('Y-axis', 'yaxis', [1, 2]); $scope.addOverrideOption('Z-index', 'zindex', [-1,-2,-3,0,1,2,3]); $scope.updateCurrentOverrides(); diff --git a/src/app/partials/dashboard_topnav.html b/src/app/partials/dashboard_topnav.html index 15ea694058c..b6db19d33aa 100644 --- a/src/app/partials/dashboard_topnav.html +++ b/src/app/partials/dashboard_topnav.html @@ -1,7 +1,10 @@
- {{dashboard.title}} + + + {{dashboard.title}} +
  • diff --git a/src/app/partials/graphite/editor.html b/src/app/partials/graphite/editor.html index 4d670255bc0..dcbc4306e0f 100755 --- a/src/app/partials/graphite/editor.html +++ b/src/app/partials/graphite/editor.html @@ -108,7 +108,7 @@
  • - series as paramaters + series as parameters
  • diff --git a/src/app/partials/playlist.html b/src/app/partials/playlist.html index 3b3ba7600c4..1517678e730 100644 --- a/src/app/partials/playlist.html +++ b/src/app/partials/playlist.html @@ -38,7 +38,7 @@
    - dashboards available in the playlist are only the once marked as favorites (stored in local browser storage). + dashboards available in the playlist are only the ones marked as favorites (stored in local browser storage). to mark a dashboard as favorite, use save icon in the menu and in the dropdown select mark as favorite

    diff --git a/src/app/partials/pro/account.html b/src/app/partials/pro/account.html new file mode 100644 index 00000000000..177fd611136 --- /dev/null +++ b/src/app/partials/pro/account.html @@ -0,0 +1,73 @@ +
    +
    +
    + + + + + Account Settings + +
    +
    +
    + +
    + +
    +
    + + Personal information +
    +
    + +
    +
    +
    + + +
    +
    + +
    +
    + + +
    +
    + +
    +
    + + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    +
    + + Collaborators +
    +
    + +
    +
    +
    +
    + + + +
    +
    +
    +
    +
    + diff --git a/src/app/partials/pro/dashboard_topnav.html b/src/app/partials/pro/dashboard_topnav.html index f6648e1bcb7..21d7b7704e7 100644 --- a/src/app/partials/pro/dashboard_topnav.html +++ b/src/app/partials/pro/dashboard_topnav.html @@ -3,9 +3,9 @@
    - + - {{dashboard.title}} + {{dashboard.title}}
    diff --git a/src/app/partials/search.html b/src/app/partials/search.html index e5241e9b11e..ccddfb14474 100644 --- a/src/app/partials/search.html +++ b/src/app/partials/search.html @@ -54,7 +54,7 @@ share     - + delete
    diff --git a/src/app/routes/p_admin.js b/src/app/routes/p_admin.js index 75bf5b27223..be55872a437 100644 --- a/src/app/routes/p_admin.js +++ b/src/app/routes/p_admin.js @@ -14,8 +14,40 @@ function (angular) { }); }); + module.config(function($routeProvider) { + $routeProvider + .when('/account', { + templateUrl: 'app/partials/pro/account.html', + controller : 'AccountCtrl', + }); + }); + module.controller('AdminCtrl', function() { }); + module.controller('AccountCtrl', function($scope, $http, alertSrv) { + + $scope.collaborator = {}; + + $scope.addCollaborator = function() { + if (!$scope.addCollaboratorForm.$valid) { + return; + } + + $http.post('/api/account/collaborators/add', $scope.collaborator).then(function() { + alertSrv.set('Collaborator added', '', 'success', 3000); + }, function(err) { + if (err.data && err.data.status) { + alertSrv.set('Could not add collaborator', err.data.status, 'warning', 10000); + } + else if (err.statusText) { + alertSrv.set('Could not add collaborator', err.data.status, 'warning', 10000); + } + console.log("value", err); + }); + }; + + }); + }); diff --git a/src/app/routes/p_dashboard.js b/src/app/routes/p_dashboard.js index 8c4b8d438de..de289de7efd 100644 --- a/src/app/routes/p_dashboard.js +++ b/src/app/routes/p_dashboard.js @@ -1,7 +1,8 @@ define([ 'angular', + 'store', ], -function (angular) { +function (angular, store) { "use strict"; var module = angular.module('grafana.routes'); @@ -25,12 +26,29 @@ function (angular) { }); }); - module.controller('DashFromDBProvider', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv) { + module.controller('DashFromDBProvider', function( + $scope, $rootScope, datasourceSrv, $routeParams, + alertSrv, $http, $location) { var db = datasourceSrv.getGrafanaDB(); var isTemp = window.location.href.indexOf('dashboard/temp') !== -1; + if (!$routeParams.id) { - $routeParams.id = 'default'; + var savedRoute = store.get('grafanaDashboardDefault'); + + if (!savedRoute) { + $http.get("app/dashboards/default.json?" + new Date().getTime()).then(function(result) { + var dashboard = angular.fromJson(result.data); + $scope.emitAppEvent('setup-dashboard', dashboard); + },function() { + alertSrv.set('Error',"Could not load default dashboard", 'error'); + }); + return; + } + else { + $location.path(savedRoute); + return; + } } db.getDashboard($routeParams.id, isTemp) diff --git a/src/app/routes/p_login.js b/src/app/routes/p_login.js index 91f9242a300..6a9512262a2 100644 --- a/src/app/routes/p_login.js +++ b/src/app/routes/p_login.js @@ -1,5 +1,6 @@ define([ 'angular', + '../controllers/pro/loginCtrl', ], function (angular) { "use strict"; @@ -18,14 +19,9 @@ function (angular) { }); }); - module.controller('RegisterCtrl', function($scope, $http, $location, $routeParams) { + module.controller('RegisterCtrl', function($scope, $http, $location) { $scope.loginModel = {}; - - $scope.init = function() { - if ($routeParams.logout) { - $scope.logout(); - } - }; + $scope.grafana.sidemenu = false; $scope.register = function() { delete $scope.registerError; @@ -43,51 +39,6 @@ function (angular) { }); }; - $scope.init(); - - }); - - - module.controller('LoginCtrl', function($scope, $http, $location, $routeParams, alertSrv) { - $scope.loginModel = {}; - - $scope.init = function() { - if ($routeParams.logout) { - $scope.logout(); - } - }; - - $scope.logout = function() { - $http.post('/logout').then(function() { - alertSrv.set('Logged out!', '', 'success', 3000); - $scope.emitAppEvent('logged-out'); - }, function() { - alertSrv.set('Logout failed:', 'Unexpected error', 'error', 3000); - }); - }; - - $scope.login = function() { - delete $scope.loginError; - - if (!$scope.loginForm.$valid) { - return; - } - - $http.post('/login', $scope.loginModel).then(function() { - $scope.emitAppEvent('logged-in'); - $location.path('/'); - }, function(err) { - if (err.status === 401) { - $scope.loginError = "Username or password is incorrect"; - } - else { - $scope.loginError = "Unexpected error"; - } - }); - }; - - $scope.init(); - }); }); diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js index 91587feda38..c6b386917ba 100644 --- a/src/app/services/dashboard/dashboardSrv.js +++ b/src/app/services/dashboard/dashboardSrv.js @@ -131,7 +131,7 @@ function (angular, $, kbn, _, moment) { if (old.services) { if (old.services.filter) { this.time = old.services.filter.time; - this.templating.list = old.services.filter.list; + this.templating.list = old.services.filter.list || []; } delete this.services; } diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js index 80e3c5d0100..ab03c614a83 100644 --- a/src/app/services/elasticsearch/es-datasource.js +++ b/src/app/services/elasticsearch/es-datasource.js @@ -37,6 +37,7 @@ function (angular, _, config, kbn, moment) { }; if (this.basicAuth) { + options.withCredentials = true; options.headers = { "Authorization": "Basic " + this.basicAuth }; @@ -168,7 +169,7 @@ function (angular, _, config, kbn, moment) { return this._request('PUT', '/dashboard/' + id, this.index, data) .then(function(results) { - self._removeUnslugifiedDashboard(results, title); + self._removeUnslugifiedDashboard(results, title, id); return { title: title, url: '/dashboard/db/' + id }; }, function() { throw 'Failed to save to elasticsearch'; @@ -176,8 +177,9 @@ function (angular, _, config, kbn, moment) { } }; - ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title) { + ElasticDatasource.prototype._removeUnslugifiedDashboard = function(saveResult, title, id) { if (saveResult.statusText !== 'Created') { return; } + if (title === id) { return; } var self = this; this._get('/dashboard/' + title).then(function() { diff --git a/src/app/services/grafana/grafanaDatasource.js b/src/app/services/grafana/grafanaDatasource.js index 684d0abe25f..13bfafa8add 100644 --- a/src/app/services/grafana/grafanaDatasource.js +++ b/src/app/services/grafana/grafanaDatasource.js @@ -55,6 +55,15 @@ function (angular) { }); }; + GrafanaDatasource.prototype.deleteDashboard = function(id) { + return $http({ method: 'DELETE', url: '/api/dashboard/' + id }) + .then(function(result) { + return result.data.title; + }, function(err) { + throw err.data; + }); + }; + GrafanaDatasource.prototype.searchDashboards = function(query) { return $http.get('/api/search/', { params: { q: query } }) .then(function(results) { diff --git a/src/app/services/graphite/gfunc.js b/src/app/services/graphite/gfunc.js index 533bb897283..1acfad8739b 100644 --- a/src/app/services/graphite/gfunc.js +++ b/src/app/services/graphite/gfunc.js @@ -86,6 +86,13 @@ function (_) { category: categories.Calculate, }); + addFuncDef({ + name: 'group', + params: optionalSeriesRefArgs, + defaultParams: ['#A', '#B'], + category: categories.Combine, + }); + addFuncDef({ name: 'sumSeries', shortName: 'sum', diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less index 2b13f099abb..ca155a8e18a 100644 --- a/src/css/less/bootswatch.dark.less +++ b/src/css/less/bootswatch.dark.less @@ -56,7 +56,7 @@ hr { } .brand { - padding: 15px 20px 15px; + padding: 0px 15px; color: @grayLighter; font-weight: normal; text-shadow: none; diff --git a/src/css/less/bootswatch.light.less b/src/css/less/bootswatch.light.less index 5675d605cbd..f4f573c58b0 100644 --- a/src/css/less/bootswatch.light.less +++ b/src/css/less/bootswatch.light.less @@ -59,6 +59,7 @@ a.text-success:hover { color: darken(@green, 10%); } } .brand { + padding: 0px 15px; &:hover { color: @navbarLinkColorHover; @@ -461,7 +462,6 @@ legend { // ----------------------------------------------------- .alert { - .border-radius(0); text-shadow: none; &-heading, h1, h2, h3, h4, h5, h6 { diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less index 6284b8e75a1..08608cb0e46 100644 --- a/src/css/less/grafana.less +++ b/src/css/less/grafana.less @@ -3,6 +3,9 @@ @import "graph.less"; @import "console.less"; @import "bootstrap-tagsinput.less"; +@import "tables_lists.less"; +@import "search.less"; +@import "panel.less"; .hide-controls { padding: 0; @@ -33,6 +36,19 @@ } } +.logo-icon { + width: 24px; + padding: 13px 11px 0 0; + display: block; + float: left; +} + +.page-title { + padding: 15px 0; + display: block; + float: left; +} + .row-button { width: 24px; } @@ -85,7 +101,7 @@ .panel-fullscreen { z-index: 100; - display: block !important; + display: block; position: fixed; left: 0px; right: 0px; @@ -101,11 +117,10 @@ } } -.dashboard-fullscreen .main-view-container { - height: 0px; - width: 0px; - position: fixed; - right: -10000px; +.dashboard-fullscreen { + .row-control-inner { + display: none; + } } .histogram-chart { diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less index 58e72ef43fa..957a56147dd 100644 --- a/src/css/less/overrides.less +++ b/src/css/less/overrides.less @@ -317,13 +317,38 @@ div.flot-text { color: @textColor !important; } -.dashboard-notice { +.page-alert-list { z-index:8000; - margin-left:0px; - padding:3px 0px 3px 0px; - width:100%; - padding-left:20px; - color: @white; + min-width: 300px; + max-width: 300px; + position: fixed; + right: 20px; + top: 56px; + + .alert { + color: @white; + padding-bottom: 13px; + position: relative; + } + + .alert-close { + position: absolute; + top: -4px; + right: -2px; + width: 19px; + height: 19px; + padding: 0; + background: @grayLighter; + border-radius: 50%; + border: none; + font-size: 1.1rem; + color: @grayDarker; + } + + .alert-title { + font-weight: bold; + padding-bottom: 2px; + } } diff --git a/src/img/fav16.png b/src/img/fav16.png new file mode 100644 index 00000000000..827cd972e4b Binary files /dev/null and b/src/img/fav16.png differ diff --git a/src/img/fav32.png b/src/img/fav32.png new file mode 100644 index 00000000000..827cd972e4b Binary files /dev/null and b/src/img/fav32.png differ diff --git a/src/img/fav_dark_16.png b/src/img/fav_dark_16.png new file mode 100644 index 00000000000..2f66c42db40 Binary files /dev/null and b/src/img/fav_dark_16.png differ diff --git a/src/img/fav_dark_32.png b/src/img/fav_dark_32.png new file mode 100644 index 00000000000..9248832f671 Binary files /dev/null and b/src/img/fav_dark_32.png differ diff --git a/src/index.html b/src/index.html index 63e837abfcd..84e7787b83d 100644 --- a/src/index.html +++ b/src/index.html @@ -5,9 +5,11 @@ + Grafana + @@ -22,12 +24,17 @@ -
    - - {{alert.title}}
    {{$index + 1}} alert(s)
    -
    +
    +
    + +
    {{alert.title}}
    +
    +
    +
    -
    +
    - + diff --git a/src/test/specs/kbn-format-specs.js b/src/test/specs/kbn-format-specs.js index a44475556b0..85807c277ec 100644 --- a/src/test/specs/kbn-format-specs.js +++ b/src/test/specs/kbn-format-specs.js @@ -15,6 +15,12 @@ define([ expect(str).to.be('1.02 hour'); }); + it('should not downscale when value is zero', function() { + var str = kbn.msFormat(0, 2); + expect(str).to.be('0.00 ms'); + }); + + it('should translate 365445 as 6.09 min', function() { var str = kbn.msFormat(365445, 2); expect(str).to.be('6.09 min'); diff --git a/src/test/test-main.js b/src/test/test-main.js index 4c87e8dcb44..5503a358f75 100644 --- a/src/test/test-main.js +++ b/src/test/test-main.js @@ -135,6 +135,7 @@ require([ 'specs/kbn-format-specs', 'specs/dashboardSrv-specs', 'specs/dashboardViewStateSrv-specs', + 'specs/overview-ctrl-specs', ], function () { window.__karma__.start(); });