+
+
- Import
- {{dash.name}}
+ {{dash.name}}
+
+
+ import
+
+
-
Height
-
- Editable
-
- Show title
+
diff --git a/src/app/partials/share-panel.html b/src/app/partials/share-panel.html
new file mode 100644
index 00000000000..d2c85e423ce
--- /dev/null
+++ b/src/app/partials/share-panel.html
@@ -0,0 +1,33 @@
+
diff --git a/src/app/partials/submenu.html b/src/app/partials/submenu.html
index 42884a84058..e82e2505afb 100644
--- a/src/app/partials/submenu.html
+++ b/src/app/partials/submenu.html
@@ -17,9 +17,6 @@
-
- VARIABLES
-
${{variable.name}}:
@@ -31,10 +28,6 @@
-
- Refresh on load Check if you want values to be updated on dashboard load, will slow down dashboard load time.
-
+
+
@@ -80,10 +80,7 @@
-
- Include auto interval
-
+
Auto interval steps How many steps, roughly, the interval is rounded and will not always match this count
-
- All option
-
+
All format
diff --git a/src/app/partials/unsaved-changes.html b/src/app/partials/unsaved-changes.html
index b025575e7e7..846a30bbc3b 100644
--- a/src/app/partials/unsaved-changes.html
+++ b/src/app/partials/unsaved-changes.html
@@ -1,19 +1,18 @@
-
-
+
+
{{changes}}
-
Cancel
Save
Ignore
-
+
diff --git a/src/app/routes/dashboard-from-db.js b/src/app/routes/dashboard-from-db.js
index a5a37ece12d..67c25ab4946 100644
--- a/src/app/routes/dashboard-from-db.js
+++ b/src/app/routes/dashboard-from-db.js
@@ -22,7 +22,13 @@ function (angular) {
templateUrl: 'app/partials/dashboard.html',
controller : 'DashFromDBProvider',
reloadOnSearch: false,
+ })
+ .when('/dashboard/import/:id', {
+ templateUrl: 'app/partials/dashboard.html',
+ controller : 'DashFromImportCtrl',
+ reloadOnSearch: false,
});
+
});
module.controller('DashFromDBProvider', function($scope, $rootScope, datasourceSrv, $routeParams, alertSrv) {
@@ -31,12 +37,23 @@ function (angular) {
var isTemp = window.location.href.indexOf('dashboard/temp') !== -1;
db.getDashboard($routeParams.id, isTemp)
- .then(function(dashboard) {
- $scope.emitAppEvent('setup-dashboard', dashboard);
- }).then(null, function(error) {
- $scope.emitAppEvent('setup-dashboard', { title: 'Grafana'});
- alertSrv.set('Error', error, 'error');
- });
+ .then(function(dashboard) {
+ $scope.initDashboard(dashboard, $scope);
+ }).then(null, function(error) {
+ $scope.initDashboard({ title: 'Grafana'}, $scope);
+ alertSrv.set('Error', error, 'error');
+ });
+ });
+
+ module.controller('DashFromImportCtrl', function($scope, $location, alertSrv) {
+
+ if (!window.grafanaImportDashboard) {
+ alertSrv.set('Not found', 'Cannot reload page with unsaved imported dashboard', 'warning', 7000);
+ $location.path('');
+ return;
+ }
+
+ $scope.initDashboard(window.grafanaImportDashboard, $scope);
});
});
diff --git a/src/app/routes/dashboard-from-file.js b/src/app/routes/dashboard-from-file.js
index dc54eaddaf6..82db05480b4 100644
--- a/src/app/routes/dashboard-from-file.js
+++ b/src/app/routes/dashboard-from-file.js
@@ -52,7 +52,7 @@ function (angular, $, config, _) {
};
file_load($routeParams.jsonFile).then(function(result) {
- $scope.emitAppEvent('setup-dashboard', result);
+ $scope.initDashboard(result, $scope);
});
});
diff --git a/src/app/routes/dashboard-from-script.js b/src/app/routes/dashboard-from-script.js
index cacdf9939b6..fa3abd36e81 100644
--- a/src/app/routes/dashboard-from-script.js
+++ b/src/app/routes/dashboard-from-script.js
@@ -53,7 +53,7 @@ function (angular, $, config, _, kbn, moment) {
};
script_load($routeParams.jsFile).then(function(result) {
- $scope.emitAppEvent('setup-dashboard', result.data);
+ $scope.initDashboard(result.data, $scope);
});
});
diff --git a/src/app/services/alertSrv.js b/src/app/services/alertSrv.js
index 781539bf1cc..f41e490f374 100644
--- a/src/app/services/alertSrv.js
+++ b/src/app/services/alertSrv.js
@@ -7,9 +7,21 @@ function (angular, _) {
var module = angular.module('grafana.services');
- module.service('alertSrv', function($timeout, $sce) {
+ module.service('alertSrv', function($timeout, $sce, $rootScope) {
var self = this;
+ this.init = function() {
+ $rootScope.onAppEvent('alert-error', function(e, alert) {
+ self.set(alert[0], alert[1], 'error');
+ });
+ $rootScope.onAppEvent('alert-warning', function(e, alert) {
+ self.set(alert[0], alert[1], 'warning', 5000);
+ });
+ $rootScope.onAppEvent('alert-success', function(e, alert) {
+ self.set(alert[0], alert[1], 'success', 3000);
+ });
+ };
+
// List of all alert objects
this.list = [];
diff --git a/src/app/services/all.js b/src/app/services/all.js
index 81fe4603277..f715361b4cd 100644
--- a/src/app/services/all.js
+++ b/src/app/services/all.js
@@ -1,5 +1,6 @@
define([
'./alertSrv',
+ './utilSrv',
'./datasourceSrv',
'./timeSrv',
'./templateSrv',
diff --git a/src/app/services/annotationsSrv.js b/src/app/services/annotationsSrv.js
index 04fb4224cc6..25c76caeb77 100644
--- a/src/app/services/annotationsSrv.js
+++ b/src/app/services/annotationsSrv.js
@@ -13,7 +13,8 @@ define([
var timezone;
this.init = function() {
- $rootScope.$on('refresh', this.clearCache);
+ $rootScope.onAppEvent('refresh', this.clearCache);
+ $rootScope.onAppEvent('setup-dashboard', this.clearCache);
};
this.clearCache = function() {
diff --git a/src/app/services/dashboard/dashboardKeyBindings.js b/src/app/services/dashboard/dashboardKeyBindings.js
index ba8dcaf0f23..11d5e2d4787 100644
--- a/src/app/services/dashboard/dashboardKeyBindings.js
+++ b/src/app/services/dashboard/dashboardKeyBindings.js
@@ -22,7 +22,7 @@ function(angular, $) {
});
keyboardManager.bind('ctrl+f', function() {
- scope.emitAppEvent('show-dash-editor', { src: 'app/partials/search.html' });
+ scope.appEvent('show-dash-editor', { src: 'app/partials/search.html' });
}, { inputDisabled: true });
keyboardManager.bind('ctrl+h', function() {
@@ -31,7 +31,7 @@ function(angular, $) {
}, { inputDisabled: true });
keyboardManager.bind('ctrl+s', function(evt) {
- scope.emitAppEvent('save-dashboard', evt);
+ scope.appEvent('save-dashboard', evt);
}, { inputDisabled: true });
keyboardManager.bind('ctrl+r', function() {
@@ -39,7 +39,7 @@ function(angular, $) {
}, { inputDisabled: true });
keyboardManager.bind('ctrl+z', function(evt) {
- scope.emitAppEvent('zoom-out', evt);
+ scope.appEvent('zoom-out', evt);
}, { inputDisabled: true });
keyboardManager.bind('esc', function() {
@@ -53,7 +53,7 @@ function(angular, $) {
modalData.$scope.dismiss();
}
- scope.emitAppEvent('hide-dash-editor');
+ scope.appEvent('hide-dash-editor');
scope.exitFullscreen();
}, { inputDisabled: true });
diff --git a/src/app/services/dashboard/dashboardSrv.js b/src/app/services/dashboard/dashboardSrv.js
index c6b386917ba..17313a207d5 100644
--- a/src/app/services/dashboard/dashboardSrv.js
+++ b/src/app/services/dashboard/dashboardSrv.js
@@ -25,7 +25,7 @@ function (angular, $, kbn, _, moment) {
this.tags = data.tags || [];
this.style = data.style || "dark";
this.timezone = data.timezone || 'browser';
- this.editable = data.editable || true;
+ this.editable = data.editable === false ? false : true;
this.hideControls = data.hideControls || false;
this.rows = data.rows || [];
this.nav = data.nav || [];
diff --git a/src/app/services/elasticsearch/es-datasource.js b/src/app/services/elasticsearch/es-datasource.js
index 04d1e62ce04..f9ec01dbd4c 100644
--- a/src/app/services/elasticsearch/es-datasource.js
+++ b/src/app/services/elasticsearch/es-datasource.js
@@ -94,6 +94,10 @@ function (angular, _, config, kbn, moment) {
for (var i = 0; i < fieldNames.length; i++) {
fieldValue = fieldValue[fieldNames[i]];
+ if (!fieldValue) {
+ console.log('could not find field in annotatation: ', fieldName);
+ return '';
+ }
}
if (_.isArray(fieldValue)) {
diff --git a/src/app/services/influxdb/influxdbDatasource.js b/src/app/services/influxdb/influxdbDatasource.js
index c076fb2c5e1..757c2ef0d32 100644
--- a/src/app/services/influxdb/influxdbDatasource.js
+++ b/src/app/services/influxdb/influxdbDatasource.js
@@ -203,7 +203,7 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
else {
var self = this;
return this._influxRequest('POST', '/series', data).then(function() {
- self._removeUnslugifiedDashboard(title, false);
+ self._removeUnslugifiedDashboard(id, title, false);
return { title: title, url: '/dashboard/db/' + id };
}, function(err) {
throw 'Failed to save dashboard to InfluxDB: ' + err.data;
@@ -211,11 +211,13 @@ function (angular, _, kbn, InfluxSeries, InfluxQueryBuilder) {
}
};
- InfluxDatasource.prototype._removeUnslugifiedDashboard = function(id, isTemp) {
+ InfluxDatasource.prototype._removeUnslugifiedDashboard = function(id, title, isTemp) {
+ if (id === title) { return; }
+
var self = this;
- self._getDashboardInternal(id, isTemp).then(function(dashboard) {
+ self._getDashboardInternal(title, isTemp).then(function(dashboard) {
if (dashboard !== null) {
- self.deleteDashboard(id);
+ self.deleteDashboard(title);
}
});
};
diff --git a/src/app/services/panelSrv.js b/src/app/services/panelSrv.js
index 7d664d94b6c..4563f3ad6c8 100644
--- a/src/app/services/panelSrv.js
+++ b/src/app/services/panelSrv.js
@@ -10,70 +10,65 @@ function (angular, _) {
this.init = function($scope) {
if (!$scope.panel.span) { $scope.panel.span = 12; }
- if (!$scope.panel.title) { $scope.panel.title = 'No title'; }
var menu = [
{
- text: 'Edit',
- configModal: "app/partials/paneleditor.html",
- condition: !$scope.panelMeta.fullscreenEdit
- },
- {
- text: 'Edit',
- click: "toggleFullscreen(true)",
- condition: $scope.panelMeta.fullscreenEdit
- },
- {
- text: "Fullscreen",
+ text: "view",
+ icon: "icon-eye-open",
click: 'toggleFullscreen(false)',
condition: $scope.panelMeta.fullscreenView
},
{
- text: 'Duplicate',
+ text: 'edit',
+ icon: 'icon-cogs',
+ click: 'editPanel()',
+ condition: true,
+ },
+ {
+ text: 'duplicate',
+ icon: 'icon-copy',
click: 'duplicatePanel(panel)',
condition: true
},
{
- text: 'Span',
- submenu: [
- { text: '1', click: 'updateColumnSpan(1)' },
- { text: '2', click: 'updateColumnSpan(2)' },
- { text: '3', click: 'updateColumnSpan(3)' },
- { text: '4', click: 'updateColumnSpan(4)' },
- { text: '5', click: 'updateColumnSpan(5)' },
- { text: '6', click: 'updateColumnSpan(6)' },
- { text: '7', click: 'updateColumnSpan(7)' },
- { text: '8', click: 'updateColumnSpan(8)' },
- { text: '9', click: 'updateColumnSpan(9)' },
- { text: '10', click: 'updateColumnSpan(10)' },
- { text: '11', click: 'updateColumnSpan(11)' },
- { text: '12', click: 'updateColumnSpan(12)' },
- ],
+ text: 'json',
+ icon: 'icon-code',
+ click: 'editPanelJson()',
condition: true
},
{
- text: 'Advanced',
- submenu: [
- { text: 'Panel JSON', click: 'editPanelJson()' },
- ],
+ text: 'share',
+ icon: 'icon-share',
+ click: 'sharePanel()',
condition: true
},
- {
- text: 'Remove',
- click: 'remove_panel_from_row(row, panel)',
- condition: true
- }
];
$scope.inspector = {};
$scope.panelMeta.menu = _.where(menu, { condition: true });
+ $scope.editPanel = function() {
+ if ($scope.panelMeta.fullscreenEdit) {
+ $scope.toggleFullscreen(true);
+ }
+ else {
+ $scope.appEvent('show-dash-editor', { src: 'app/partials/paneleditor.html', scope: $scope });
+ }
+ };
+
+ $scope.sharePanel = function() {
+ $scope.appEvent('show-modal', {
+ src: './app/partials/share-panel.html',
+ scope: $scope.$new()
+ });
+ };
+
$scope.editPanelJson = function() {
- $scope.emitAppEvent('show-json-editor', { object: $scope.panel, updateHandler: $scope.replacePanel });
+ $scope.appEvent('show-json-editor', { object: $scope.panel, updateHandler: $scope.replacePanel });
};
$scope.updateColumnSpan = function(span) {
- $scope.panel.span = span;
+ $scope.panel.span = Math.min(Math.max($scope.panel.span + span, 1), 12);
$timeout(function() {
$scope.$emit('render');
diff --git a/src/app/services/timeSrv.js b/src/app/services/timeSrv.js
index 1ee9ecdf925..5a28532eb5a 100644
--- a/src/app/services/timeSrv.js
+++ b/src/app/services/timeSrv.js
@@ -91,7 +91,7 @@ define([
this.old_refresh = null;
}
- $rootScope.emitAppEvent('time-range-changed', this.time);
+ $rootScope.appEvent('time-range-changed', this.time);
$timeout(this.refreshDashboard, 0);
};
diff --git a/src/app/services/utilSrv.js b/src/app/services/utilSrv.js
new file mode 100644
index 00000000000..7fca0c0334e
--- /dev/null
+++ b/src/app/services/utilSrv.js
@@ -0,0 +1,31 @@
+define([
+ 'angular',
+],
+function (angular) {
+ 'use strict';
+
+ var module = angular.module('grafana.services');
+
+ module.service('utilSrv', function($rootScope, $modal, $q) {
+
+ this.init = function() {
+ $rootScope.onAppEvent('show-modal', this.showModal);
+ };
+
+ this.showModal = function(e, options) {
+ var modal = $modal({
+ template: options.src,
+ persist: false,
+ show: false,
+ scope: options.scope,
+ keyboard: false
+ });
+
+ $q.when(modal).then(function(modalEl) {
+ modalEl.modal('show');
+ });
+ };
+
+ });
+
+});
diff --git a/src/config.sample.js b/src/config.sample.js
index 740c0d4b8c9..07f29d7be28 100644
--- a/src/config.sample.js
+++ b/src/config.sample.js
@@ -2,108 +2,110 @@
// config.js is where you will find the core Grafana configuration. This file contains parameter that
// must be set before Grafana is run for the first time.
-define(['settings'],
-function (Settings) {
+define(['settings'], function(Settings) {
"use strict";
return new Settings({
- /* Data sources
- * ========================================================
- * Datasources are used to fetch metrics, annotations, and serve as dashboard storage
- * - You can have multiple of the same type.
- * - grafanaDB: true marks it for use for dashboard storage
- * - default: true marks the datasource as the default metric source (if you have multiple)
- * - basic authentication: use url syntax http://username:password@domain:port
- */
+ /* Data sources
+ * ========================================================
+ * Datasources are used to fetch metrics, annotations, and serve as dashboard storage
+ * - You can have multiple of the same type.
+ * - grafanaDB: true marks it for use for dashboard storage
+ * - default: true marks the datasource as the default metric source (if you have multiple)
+ * - basic authentication: use url syntax http://username:password@domain:port
+ */
- // InfluxDB example setup (the InfluxDB databases specified need to exist)
- /*
- datasources: {
- influxdb: {
- type: 'influxdb',
- url: "http://my_influxdb_server:8086/db/database_name",
- username: 'admin',
- password: 'admin',
+ // InfluxDB example setup (the InfluxDB databases specified need to exist)
+ /*
+ datasources: {
+ influxdb: {
+ type: 'influxdb',
+ url: "http://my_influxdb_server:8086/db/database_name",
+ username: 'admin',
+ password: 'admin',
+ },
+ grafana: {
+ type: 'influxdb',
+ url: "http://my_influxdb_server:8086/db/grafana",
+ username: 'admin',
+ password: 'admin',
+ grafanaDB: true
+ },
},
- grafana: {
- type: 'influxdb',
- url: "http://my_influxdb_server:8086/db/grafana",
- username: 'admin',
- password: 'admin',
- grafanaDB: true
- },
- },
- */
+ */
- // Graphite & Elasticsearch example setup
- /*
- datasources: {
- graphite: {
- type: 'graphite',
- url: "http://my.graphite.server.com:8080",
+ // Graphite & Elasticsearch example setup
+ /*
+ datasources: {
+ graphite: {
+ type: 'graphite',
+ url: "http://my.graphite.server.com:8080",
+ },
+ elasticsearch: {
+ type: 'elasticsearch',
+ url: "http://my.elastic.server.com:9200",
+ index: 'grafana-dash',
+ grafanaDB: true,
+ }
},
- elasticsearch: {
- type: 'elasticsearch',
- url: "http://my.elastic.server.com:9200",
- index: 'grafana-dash',
- grafanaDB: true,
+ */
+
+ // OpenTSDB & Elasticsearch example setup
+ /*
+ datasources: {
+ opentsdb: {
+ type: 'opentsdb',
+ url: "http://opentsdb.server:4242",
+ },
+ elasticsearch: {
+ type: 'elasticsearch',
+ url: "http://my.elastic.server.com:9200",
+ index: 'grafana-dash',
+ grafanaDB: true,
+ }
+ },
+ */
+
+ /* Global configuration options
+ * ========================================================
+ */
+
+ // specify the limit for dashboard search results
+ search: {
+ max_results: 20
+ },
+
+ // default home dashboard
+ default_route: '/dashboard/file/default.json',
+
+ // set to false to disable unsaved changes warning
+ unsaved_changes_warning: true,
+
+ // set the default timespan for the playlist feature
+ // Example: "1m", "1h"
+ playlist_timespan: "1m",
+
+ // If you want to specify password before saving, please specify it below
+ // The purpose of this password is not security, but to stop some users from accidentally changing dashboards
+ admin: {
+ password: ''
+ },
+
+ // Change window title prefix from 'Grafana -
'
+ window_title_prefix: 'Grafana - ',
+
+ // Add your own custom panels
+ plugins: {
+ // list of plugin panels
+ panels: [],
+ // requirejs modules in plugins folder that should be loaded
+ // for example custom datasources
+ dependencies: [],
}
- },
- */
- // OpenTSDB & Elasticsearch example setup
- /*
- datasources: {
- opentsdb: {
- type: 'opentsdb',
- url: "http://opentsdb.server:4242",
- },
- elasticsearch: {
- type: 'elasticsearch',
- url: "http://my.elastic.server.com:9200",
- index: 'grafana-dash',
- grafanaDB: true,
- }
- },
- */
-
- /* Global configuration options
- * ========================================================
- */
-
- // specify the limit for dashboard search results
- search: {
- max_results: 20
- },
-
- // default home dashboard
- default_route: '/dashboard/file/default.json',
-
- // set to false to disable unsaved changes warning
- unsaved_changes_warning: true,
-
- // set the default timespan for the playlist feature
- // Example: "1m", "1h"
- playlist_timespan: "1m",
-
- // If you want to specify password before saving, please specify it bellow
- // The purpose of this password is not security, but to stop some users from accidentally changing dashboards
- admin: {
- password: ''
- },
-
- // Change window title prefix from 'Grafana - '
- window_title_prefix: 'Grafana - ',
-
- // Add your own custom panels
- plugins: {
- // list of plugin panels
- panels: [],
- // requirejs modules in plugins folder that should be loaded
- // for example custom datasources
- dependencies: [],
- }
-
- });
+ });
});
+
+
+
diff --git a/src/css/less/bootswatch.dark.less b/src/css/less/bootswatch.dark.less
index ca155a8e18a..0ebb73ca0ea 100644
--- a/src/css/less/bootswatch.dark.less
+++ b/src/css/less/bootswatch.dark.less
@@ -57,7 +57,7 @@ hr {
.brand {
padding: 0px 15px;
- color: @grayLighter;
+ color: @navbarBrandColor;
font-weight: normal;
text-shadow: none;
}
diff --git a/src/css/less/forms.less b/src/css/less/forms.less
new file mode 100644
index 00000000000..e1affd09ae9
--- /dev/null
+++ b/src/css/less/forms.less
@@ -0,0 +1,28 @@
+input[type=text].input-fluid {
+ width: 100%;
+ box-sizing: border-box;
+ padding: 14px;
+ -moz-box-sizing: border-box;
+ height: 100%;
+}
+
+input[type="checkbox"].cr1 {
+ display: none;
+}
+
+input[type="checkbox"]+.cr1 {
+ display: inline-block;
+ height: 19px;
+ clear: none;
+ text-indent: 2px;
+ margin-top: 4px;
+ padding: 0 0 0 20px;
+ vertical-align:middle;
+ background: url(@checkboxImageUrl) left top no-repeat;
+ cursor:pointer;
+}
+
+input[type="checkbox"]:checked+label {
+ background: url(@checkboxImageUrl) 0px -18px no-repeat;
+}
+
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 86bb7c2cdb8..2e852c8a585 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -6,6 +6,7 @@
@import "tables_lists.less";
@import "search.less";
@import "panel.less";
+@import "forms.less";
.hide-controls {
padding: 0;
@@ -54,8 +55,12 @@
}
.modal {
- margin: 5%;
- width: 90%;
+ max-width: 800px;
+ left: 0;
+ right: 0;
+ margin-left: auto;
+ margin-right: auto;
+ top: 200px;
}
.grafana-search-metric-actions {
@@ -118,8 +123,9 @@
}
.dashboard-fullscreen {
- .row-control-inner {
- display: none;
+ .main-view-container {
+ height: 0;
+ overflow: hidden;
}
}
@@ -439,6 +445,18 @@ select.grafana-target-segment-input {
max-width: 800px;
max-height: 600px;
overflow: hidden;
+ line-height: 14px;
+}
+
+
+
+.grafana-tooltip hr {
+ padding: 2px;
+ color: #c8c8c8;
+ margin: 0px;
+ border-bottom:0px solid #c8c8c8;
+ /*height:0px;
+ background-color: rgb(58, 57, 57);*/
}
.tooltip.in {
diff --git a/src/css/less/graph.less b/src/css/less/graph.less
index 1bd424999ca..01a697ddb2e 100644
--- a/src/css/less/graph.less
+++ b/src/css/less/graph.less
@@ -1,5 +1,6 @@
.graph-canvas-wrapper {
position: relative;
+ cursor: crosshair;
}
.graph-legend {
@@ -124,7 +125,7 @@
.graph-legend-series-hidden {
a {
- color: darken(@linkColor, 45%);
+ color: @linkColorDisabled;
}
}
@@ -166,3 +167,18 @@
float: left;
}
}
+
+.graph-tooltip {
+ .graph-tooltip-time {
+ text-align: center;
+ font-weight: bold;
+ position: relative;
+ top: -3px;
+ }
+
+ .graph-tooltip-value {
+ font-weight: bold;
+ float: right;
+ padding-left: 10px;
+ }
+}
diff --git a/src/css/less/overrides.less b/src/css/less/overrides.less
index 957a56147dd..6c8f6c0224f 100644
--- a/src/css/less/overrides.less
+++ b/src/css/less/overrides.less
@@ -252,11 +252,6 @@ form input.ng-invalid {
max-width: 480px;
}
-.modal {
- width: 100%;
- top: 0px !important;
-}
-
.tiny {
font-size: 50%;
}
@@ -567,12 +562,6 @@ div.flot-text {
background-color: darken(@purple, 10%);
}
-.annotation-editor-table {
- td {
- white-space: nowrap;
- }
-}
-
// Top menu
.save-dashboard-dropdown {
padding: 10px;
diff --git a/src/css/less/panel.less b/src/css/less/panel.less
index 19e5a077872..7d24d1752c4 100644
--- a/src/css/less/panel.less
+++ b/src/css/less/panel.less
@@ -15,10 +15,17 @@
padding: 0px 10px 5px 10px;
}
+.panel-title-container {
+ min-height: 5px;
+ cursor: context-menu;
+}
+
.panel-title {
border: 0px;
font-weight: bold;
position: relative;
+ font-size: 0.9em;
+ cursor: context-menu;
}
.panel-loading {
@@ -28,23 +35,10 @@
z-index: 800;
}
-.panel div.panel-extra div.panel-extra-container {
- margin-right: -10px;
- margin-top: 3px;
+.panel-header {
text-align: center;
- ul {
- text-align: left;
- }
}
-.panel div.panel-extra {
- font-size: 0.9em;
- margin-bottom: 0px;
-}
-
-.panel div.panel-extra .extra {
- float:right !important;
-}
.panel-error {
color: @white;
@@ -69,3 +63,38 @@
bottom: 0;
}
+.panel-menu {
+ z-index: 1000;
+ position: absolute;
+ background: @grafanaTargetFuncBackground;
+ border: 1px solid black;
+ top: -62px;
+
+ .panel-menu-row {
+ white-space: nowrap;
+ border-bottom: 1px solid black;
+ &:last-child {
+ border-bottom: none;
+ }
+ }
+
+ .icon-move {
+ cursor: move;
+ }
+
+ .panel-menu-link, .panel-menu-icon {
+ padding: 5px 10px;
+ }
+
+ .panel-menu-link {
+ display: inline-block;
+ border-right: 1px solid black;
+ &:last-child {
+ border: none;
+ }
+ }
+}
+
+.panel-highlight {
+ .box-shadow(~"inset 0 1px 1px rgba(0,0,0,.075), 0 0 5px rgba(82,168,236, 0.8)");
+}
diff --git a/src/css/less/submenu.less b/src/css/less/submenu.less
index 8e5c23f7a29..b762d7acfbd 100644
--- a/src/css/less/submenu.less
+++ b/src/css/less/submenu.less
@@ -5,6 +5,6 @@
}
.annotation-disabled, .annotation-disabled a {
- color: darken(@textColor, 25%);
+ color: @linkColorDisabled;
}
diff --git a/src/css/less/variables.dark.less b/src/css/less/variables.dark.less
index c65a6f99179..42ab0bba861 100644
--- a/src/css/less/variables.dark.less
+++ b/src/css/less/variables.dark.less
@@ -52,6 +52,7 @@
// Links
// -------------------------
@linkColor: darken(@white,11%);
+@linkColorDisabled: darken(@linkColor,45%);
@linkColorHover: @white;
@@ -218,7 +219,7 @@
@navbarLinkBackgroundHover: transparent;
@navbarLinkBackgroundActive: @navbarBackground;
-@navbarBrandColor: @navbarLinkColor;
+@navbarBrandColor: @linkColor;
// Inverted navbar
@navbarInverseBackground: #252A30;
@@ -289,7 +290,8 @@
@popoverArrowOuterWidth: @popoverArrowWidth + 1;
@popoverArrowOuterColor: rgba(0,0,0,.25);
-
+// images
+@checkboxImageUrl: '../img/checkbox.png';
// GRID
// --------------------------------------------------
diff --git a/src/css/less/variables.light.less b/src/css/less/variables.light.less
index c3453fdd92b..063d0148c37 100644
--- a/src/css/less/variables.light.less
+++ b/src/css/less/variables.light.less
@@ -54,12 +54,13 @@
// Scaffolding
// -------------------------
@bodyBackground: @grayLighter;
-@textColor: #555;
+@textColor: #666;
// Links
// -------------------------
@linkColor: @textColor;
+@linkColorDisabled: lighten(@linkColor,35%);
@linkColorHover: @blue;
@@ -298,12 +299,12 @@
@popoverArrowOuterWidth: @popoverArrowWidth + 1;
@popoverArrowOuterColor: rgba(0,0,0,.25);
-
+// images
+@checkboxImageUrl: '../img/checkbox_white.png';
// GRID
// --------------------------------------------------
-
// Default 940px grid
// -------------------------
@gridColumns: 12;
diff --git a/src/img/check_radio_sheet.png b/src/img/check_radio_sheet.png
new file mode 100644
index 00000000000..de6549fa2cc
Binary files /dev/null and b/src/img/check_radio_sheet.png differ
diff --git a/src/img/checkbox.png b/src/img/checkbox.png
new file mode 100644
index 00000000000..86927a0d3cb
Binary files /dev/null and b/src/img/checkbox.png differ
diff --git a/src/img/checkbox_white.png b/src/img/checkbox_white.png
new file mode 100644
index 00000000000..dbff6d5ab64
Binary files /dev/null and b/src/img/checkbox_white.png differ
diff --git a/src/test/specs/dashboardSrv-specs.js b/src/test/specs/dashboardSrv-specs.js
index f916279db98..862c2a6fc41 100644
--- a/src/test/specs/dashboardSrv-specs.js
+++ b/src/test/specs/dashboardSrv-specs.js
@@ -82,6 +82,22 @@ define([
});
+ describe('when creating dashboard with editable false', function() {
+ var model;
+
+ beforeEach(module('grafana.services'));
+ beforeEach(inject(function(dashboardSrv) {
+ model = dashboardSrv.create({
+ editable: false
+ });
+ }));
+
+ it('should set editable false', function() {
+ expect(model.editable).to.be(false);
+ });
+
+ });
+
describe('when creating dashboard with old schema', function() {
var model;
var graph;
diff --git a/src/test/specs/grafanaGraph-specs.js b/src/test/specs/grafanaGraph-specs.js
index 1b86ee9073d..159a923cc7c 100644
--- a/src/test/specs/grafanaGraph-specs.js
+++ b/src/test/specs/grafanaGraph-specs.js
@@ -27,8 +27,12 @@ define([
legend: {},
grid: {},
y_formats: [],
- seriesOverrides: []
+ seriesOverrides: [],
+ tooltip: {
+ shared: true
+ }
};
+ scope.hiddenSeries = {};
scope.dashboard = { timezone: 'browser' };
scope.range = {
from: new Date('2014-08-09 10:00:00'),
@@ -145,6 +149,18 @@ define([
});
});
+ graphScenario('when series is hidden', function(ctx) {
+ ctx.setup(function(scope) {
+ scope.hiddenSeries = {'series2': true};
+ });
+
+ it('should remove datapoints and disable stack', function() {
+ expect(ctx.plotData[0].info.alias).to.be('series1');
+ expect(ctx.plotData[1].data.length).to.be(0);
+ expect(ctx.plotData[1].stack).to.be(false);
+ });
+ });
+
});
});
diff --git a/src/test/specs/graph-tooltip-specs.js b/src/test/specs/graph-tooltip-specs.js
new file mode 100644
index 00000000000..2ca3ec85cac
--- /dev/null
+++ b/src/test/specs/graph-tooltip-specs.js
@@ -0,0 +1,56 @@
+define([
+ 'jquery',
+ 'directives/grafanaGraph.tooltip'
+], function($, tooltip) {
+ 'use strict';
+
+ describe('graph tooltip', function() {
+ var elem = $('
');
+ var dashboard = {
+ formatDate: sinon.stub().returns('date'),
+ };
+ var scope = {
+ panel: {
+ tooltip: {
+ shared: true
+ },
+ y_formats: ['ms', 'none'],
+ }
+ };
+
+ var data = [
+ {
+ data: [[10,10], [12,20]],
+ info: { yaxis: 1 },
+ yaxis: { tickDecimals: 2 },
+ },
+ {
+ data: [[10,10], [12,20]],
+ info: { yaxis: 1 },
+ yaxis: { tickDecimals: 2 },
+ }
+ ];
+
+ var plot = {
+ getData: sinon.stub().returns(data),
+ highlight: sinon.stub(),
+ unhighlight: sinon.stub()
+ };
+
+ elem.data('plot', plot);
+
+ beforeEach(function() {
+ tooltip.register(elem, dashboard, scope);
+ elem.trigger('plothover', [{}, {x: 13}, {}]);
+ });
+
+ it('should add tooltip', function() {
+ var tooltipHtml = $(".graph-tooltip").text();
+ expect(tooltipHtml).to.be('date : 40.00 ms : 20.00 ms');
+ });
+
+ });
+
+});
+
+
diff --git a/src/test/specs/helpers.js b/src/test/specs/helpers.js
index 81f0df7be7e..1859bfc10a1 100644
--- a/src/test/specs/helpers.js
+++ b/src/test/specs/helpers.js
@@ -8,6 +8,7 @@ define([
var self = this;
this.datasource = {};
+ this.$element = {};
this.annotationsSrv = {};
this.timeSrv = new TimeSrvStub();
this.templateSrv = new TemplateSrvStub();
@@ -16,18 +17,23 @@ define([
get: function() { return self.datasource; }
};
- this.providePhase = function() {
+ this.providePhase = function(mocks) {
return module(function($provide) {
$provide.value('datasourceSrv', self.datasourceSrv);
$provide.value('annotationsSrv', self.annotationsSrv);
$provide.value('timeSrv', self.timeSrv);
$provide.value('templateSrv', self.templateSrv);
+ $provide.value('$element', self.$element);
+ _.each(mocks, function(key, value) {
+ $provide.value(key, value);
+ });
});
};
this.createControllerPhase = function(controllerName) {
- return inject(function($controller, $rootScope, $q) {
+ return inject(function($controller, $rootScope, $q, $location) {
self.scope = $rootScope.$new();
+ self.$location = $location;
self.scope.panel = {};
self.scope.row = { panels:[] };
self.scope.dashboard = {};
@@ -68,7 +74,7 @@ define([
self.$httpBackend = $httpBackend;
self.$rootScope.onAppEvent = function() {};
- self.$rootScope.emitAppEvent = function() {};
+ self.$rootScope.appEvent = function() {};
self.service = $injector.get(name);
});
diff --git a/src/test/specs/kbn-format-specs.js b/src/test/specs/kbn-format-specs.js
index 85807c277ec..e92e6d0ceec 100644
--- a/src/test/specs/kbn-format-specs.js
+++ b/src/test/specs/kbn-format-specs.js
@@ -3,76 +3,31 @@ define([
], function(kbn) {
'use strict';
- describe('millisecond formating', function() {
+ function describeValueFormat(desc, value, tickSize, tickDecimals, result) {
- it('should translate 4378634603 as 1.67 years', function() {
- var str = kbn.msFormat(4378634603, 2);
- expect(str).to.be('50.68 day');
+ describe('value format: ' + desc, function() {
+ it('should translate ' + value + ' as ' + result, function() {
+ var scaledDecimals = tickDecimals - Math.floor(Math.log(tickSize) / Math.LN10);
+ var str = kbn.valueFormats[desc](value, tickDecimals, scaledDecimals);
+ expect(str).to.be(result);
+ });
});
- it('should translate 3654454 as 1.02 hour', function() {
- var str = kbn.msFormat(3654454, 2);
- 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');
- });
+ describeValueFormat('ms', 0.0024, 0.0005, 4, '0.0024 ms');
+ describeValueFormat('ms', 100, 1, 0, '100 ms');
+ describeValueFormat('ms', 1250, 10, 0, '1.25 s');
+ describeValueFormat('ms', 1250, 300, 0, '1.3 s');
+ describeValueFormat('ms', 65150, 10000, 0, '1.1 min');
+ describeValueFormat('ms', 6515000, 1500000, 0, '1.8 hour');
+ describeValueFormat('ms', 651500000, 150000000, 0, '8 day');
+ describeValueFormat('none', 2.75e-10, 0, 10, '3e-10');
+ describeValueFormat('none', 0, 0, 2, '0');
- it('should translate 365445 as 6.09 min', function() {
- var str = kbn.msFormat(365445, 2);
- expect(str).to.be('6.09 min');
- });
-
- });
-
- describe('high negative exponent, issue #696', function() {
- it('should ignore decimal correction if exponent', function() {
- var str = kbn.getFormatFunction('')(2.75e-10, { tickDecimals: 12 });
- expect(str).to.be('2.75e-10');
- });
- it('should format 0 correctly', function() {
- var str = kbn.getFormatFunction('')(0.0, { tickDecimals: 12 });
- expect(str).to.be('0');
- });
- });
-
- describe('none format tests', function() {
- it('should translate 2 as 2.0000 if axis decimals is 4', function() {
- var str = kbn.getFormatFunction('')(2, { tickDecimals: 4 });
- expect(str).to.be('2.0000');
- });
- });
-
- describe('nanosecond formatting', function () {
- it('should translate 25 to 25 ns', function () {
- var str = kbn.nanosFormat(25, 2);
- expect(str).to.be("25 ns");
- });
-
- it('should translate 2558 to 2.56 µs', function () {
- var str = kbn.nanosFormat(2558, 2);
- expect(str).to.be("2.56 µs");
- });
-
- it('should translate 2558000 to 2.56 ms', function () {
- var str = kbn.nanosFormat(2558000, 2);
- expect(str).to.be("2.56 ms");
- });
-
- it('should translate 2019962000 to 2.02 s', function () {
- var str = kbn.nanosFormat(2049962000, 2);
- expect(str).to.be("2.05 s");
- });
-
- it('should translate 95199620000 to 1.59 m', function () {
- var str = kbn.nanosFormat(95199620000, 2);
- expect(str).to.be("1.59 m");
- });
-
- });
+ describeValueFormat('ns', 25, 1, 0, '25 ns');
+ describeValueFormat('ns', 2558, 50, 0, '2.56 µs');
describe('calculateInterval', function() {
it('1h 100 resultion', function() {
diff --git a/src/test/specs/sharePanelCtrl-specs.js b/src/test/specs/sharePanelCtrl-specs.js
new file mode 100644
index 00000000000..4c36e8fe156
--- /dev/null
+++ b/src/test/specs/sharePanelCtrl-specs.js
@@ -0,0 +1,71 @@
+define([
+ './helpers',
+ 'controllers/sharePanelCtrl'
+], function(helpers) {
+ 'use strict';
+
+ describe('SharePanelCtrl', function() {
+ var ctx = new helpers.ControllerTestContext();
+
+ beforeEach(module('grafana.controllers'));
+
+ beforeEach(ctx.providePhase());
+ beforeEach(ctx.createControllerPhase('SharePanelCtrl'));
+
+ describe('shareUrl with current time range and panel', function() {
+
+ it('should generate share url relative time', function() {
+ ctx.$location.path('/test');
+ ctx.scope.panel = { id: 22 };
+ ctx.timeSrv.time = { from: 'now-1h', to: 'now' };
+
+ ctx.scope.buildUrl();
+ expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&panelId=22&fullscreen');
+ });
+
+ it('should generate share url absolute time', function() {
+ ctx.$location.path('/test');
+ ctx.scope.panel = { id: 22 };
+ ctx.timeSrv.time = { from: new Date(2012,1,1), to: new Date(2014,3,5) };
+
+ ctx.scope.buildUrl();
+ expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1328050800000&to=1396648800000&panelId=22&fullscreen');
+ });
+
+ it('should generate share url with time as JSON strings', function() {
+ ctx.$location.path('/test');
+ ctx.scope.panel = { id: 22 };
+ ctx.timeSrv.time = { from: new Date(2012,1,1).toJSON(), to: new Date(2014,3,5).toJSON() };
+
+ ctx.scope.buildUrl();
+ expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=1328050800000&to=1396648800000&panelId=22&fullscreen');
+ });
+
+ it('should remove panel id when toPanel is false', function() {
+ ctx.$location.path('/test');
+ ctx.scope.panel = { id: 22 };
+ ctx.scope.toPanel = false;
+ ctx.timeSrv.time = { from: 'now-1h', to: 'now' };
+
+ ctx.scope.buildUrl();
+ expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now');
+ });
+
+ it('should include template variables in url', function() {
+ ctx.$location.path('/test');
+ ctx.scope.panel = { id: 22 };
+ ctx.scope.includeTemplateVars = true;
+ ctx.scope.toPanel = false;
+ ctx.templateSrv.variables = [{ name: 'app', current: {text: 'mupp' }}, {name: 'server', current: {text: 'srv-01'}}];
+ ctx.timeSrv.time = { from: 'now-1h', to: 'now' };
+
+ ctx.scope.buildUrl();
+ expect(ctx.scope.shareUrl).to.be('http://server/#/test?from=now-1h&to=now&var-app=mupp&var-server=srv-01');
+ });
+
+ });
+
+ });
+
+});
+
diff --git a/src/test/test-main.js b/src/test/test-main.js
index 5503a358f75..89228f9e04b 100644
--- a/src/test/test-main.js
+++ b/src/test/test-main.js
@@ -43,6 +43,7 @@ require.config({
'jquery.flot.stack': '../vendor/jquery/jquery.flot.stack',
'jquery.flot.stackpercent':'../vendor/jquery/jquery.flot.stackpercent',
'jquery.flot.time': '../vendor/jquery/jquery.flot.time',
+ 'jquery.flot.crosshair': '../vendor/jquery/jquery.flot.crosshair',
modernizr: '../vendor/modernizr-2.6.1',
},
@@ -77,6 +78,7 @@ require.config({
'jquery.flot.stack': ['jquery', 'jquery.flot'],
'jquery.flot.stackpercent':['jquery', 'jquery.flot'],
'jquery.flot.time': ['jquery', 'jquery.flot'],
+ 'jquery.flot.crosshair':['jquery', 'jquery.flot'],
'angular-route': ['angular'],
'angular-cookies': ['angular'],
@@ -128,7 +130,9 @@ require([
'specs/influxdb-datasource-specs',
'specs/graph-ctrl-specs',
'specs/grafanaGraph-specs',
+ 'specs/graph-tooltip-specs',
'specs/seriesOverridesCtrl-specs',
+ 'specs/sharePanelCtrl-specs',
'specs/timeSrv-specs',
'specs/templateSrv-specs',
'specs/templateValuesSrv-specs',
diff --git a/src/vendor/angular/angular-strap.js b/src/vendor/angular/angular-strap.js
index 2da858ded51..22d89a6a3e0 100644
--- a/src/vendor/angular/angular-strap.js
+++ b/src/vendor/angular/angular-strap.js
@@ -435,7 +435,8 @@ angular.module('$strap.directives').factory('$modal', [
return res.data;
})).then(function onSuccess(template) {
var id = templateUrl.replace('.html', '').replace(/[\/|\.|:]/g, '-') + '-' + scope.$id;
- var $modal = $('
').attr('id', id).addClass('fade').html(template);
+ // grafana change, removed fade
+ var $modal = $('
').attr('id', id).html(template);
if (options.modalClass)
$modal.addClass(options.modalClass);
$('body').append($modal);
diff --git a/src/vendor/bootstrap/less/modals.less b/src/vendor/bootstrap/less/modals.less
index b8b0914a400..f5f5ca5eb3d 100644
--- a/src/vendor/bootstrap/less/modals.less
+++ b/src/vendor/bootstrap/less/modals.less
@@ -17,7 +17,7 @@
.modal-backdrop,
.modal-backdrop.fade.in {
- .opacity(80);
+ .opacity(70);
}
// Base modal
diff --git a/src/vendor/jquery/jquery.flot.crosshair.js b/src/vendor/jquery/jquery.flot.crosshair.js
new file mode 100644
index 00000000000..5111695e3d1
--- /dev/null
+++ b/src/vendor/jquery/jquery.flot.crosshair.js
@@ -0,0 +1,176 @@
+/* Flot plugin for showing crosshairs when the mouse hovers over the plot.
+
+Copyright (c) 2007-2014 IOLA and Ole Laursen.
+Licensed under the MIT license.
+
+The plugin supports these options:
+
+ crosshair: {
+ mode: null or "x" or "y" or "xy"
+ color: color
+ lineWidth: number
+ }
+
+Set the mode to one of "x", "y" or "xy". The "x" mode enables a vertical
+crosshair that lets you trace the values on the x axis, "y" enables a
+horizontal crosshair and "xy" enables them both. "color" is the color of the
+crosshair (default is "rgba(170, 0, 0, 0.80)"), "lineWidth" is the width of
+the drawn lines (default is 1).
+
+The plugin also adds four public methods:
+
+ - setCrosshair( pos )
+
+ Set the position of the crosshair. Note that this is cleared if the user
+ moves the mouse. "pos" is in coordinates of the plot and should be on the
+ form { x: xpos, y: ypos } (you can use x2/x3/... if you're using multiple
+ axes), which is coincidentally the same format as what you get from a
+ "plothover" event. If "pos" is null, the crosshair is cleared.
+
+ - clearCrosshair()
+
+ Clear the crosshair.
+
+ - lockCrosshair(pos)
+
+ Cause the crosshair to lock to the current location, no longer updating if
+ the user moves the mouse. Optionally supply a position (passed on to
+ setCrosshair()) to move it to.
+
+ Example usage:
+
+ var myFlot = $.plot( $("#graph"), ..., { crosshair: { mode: "x" } } };
+ $("#graph").bind( "plothover", function ( evt, position, item ) {
+ if ( item ) {
+ // Lock the crosshair to the data point being hovered
+ myFlot.lockCrosshair({
+ x: item.datapoint[ 0 ],
+ y: item.datapoint[ 1 ]
+ });
+ } else {
+ // Return normal crosshair operation
+ myFlot.unlockCrosshair();
+ }
+ });
+
+ - unlockCrosshair()
+
+ Free the crosshair to move again after locking it.
+*/
+
+(function ($) {
+ var options = {
+ crosshair: {
+ mode: null, // one of null, "x", "y" or "xy",
+ color: "rgba(170, 0, 0, 0.80)",
+ lineWidth: 1
+ }
+ };
+
+ function init(plot) {
+ // position of crosshair in pixels
+ var crosshair = { x: -1, y: -1, locked: false };
+
+ plot.setCrosshair = function setCrosshair(pos) {
+ if (!pos)
+ crosshair.x = -1;
+ else {
+ var o = plot.p2c(pos);
+ crosshair.x = Math.max(0, Math.min(o.left, plot.width()));
+ crosshair.y = Math.max(0, Math.min(o.top, plot.height()));
+ }
+
+ plot.triggerRedrawOverlay();
+ };
+
+ plot.clearCrosshair = plot.setCrosshair; // passes null for pos
+
+ plot.lockCrosshair = function lockCrosshair(pos) {
+ if (pos)
+ plot.setCrosshair(pos);
+ crosshair.locked = true;
+ };
+
+ plot.unlockCrosshair = function unlockCrosshair() {
+ crosshair.locked = false;
+ };
+
+ function onMouseOut(e) {
+ if (crosshair.locked)
+ return;
+
+ if (crosshair.x != -1) {
+ crosshair.x = -1;
+ plot.triggerRedrawOverlay();
+ }
+ }
+
+ function onMouseMove(e) {
+ if (crosshair.locked)
+ return;
+
+ if (plot.getSelection && plot.getSelection()) {
+ crosshair.x = -1; // hide the crosshair while selecting
+ return;
+ }
+
+ var offset = plot.offset();
+ crosshair.x = Math.max(0, Math.min(e.pageX - offset.left, plot.width()));
+ crosshair.y = Math.max(0, Math.min(e.pageY - offset.top, plot.height()));
+ plot.triggerRedrawOverlay();
+ }
+
+ plot.hooks.bindEvents.push(function (plot, eventHolder) {
+ if (!plot.getOptions().crosshair.mode)
+ return;
+
+ eventHolder.mouseout(onMouseOut);
+ eventHolder.mousemove(onMouseMove);
+ });
+
+ plot.hooks.drawOverlay.push(function (plot, ctx) {
+ var c = plot.getOptions().crosshair;
+ if (!c.mode)
+ return;
+
+ var plotOffset = plot.getPlotOffset();
+
+ ctx.save();
+ ctx.translate(plotOffset.left, plotOffset.top);
+
+ if (crosshair.x != -1) {
+ var adj = plot.getOptions().crosshair.lineWidth % 2 ? 0.5 : 0;
+
+ ctx.strokeStyle = c.color;
+ ctx.lineWidth = c.lineWidth;
+ ctx.lineJoin = "round";
+
+ ctx.beginPath();
+ if (c.mode.indexOf("x") != -1) {
+ var drawX = Math.floor(crosshair.x) + adj;
+ ctx.moveTo(drawX, 0);
+ ctx.lineTo(drawX, plot.height());
+ }
+ if (c.mode.indexOf("y") != -1) {
+ var drawY = Math.floor(crosshair.y) + adj;
+ ctx.moveTo(0, drawY);
+ ctx.lineTo(plot.width(), drawY);
+ }
+ ctx.stroke();
+ }
+ ctx.restore();
+ });
+
+ plot.hooks.shutdown.push(function (plot, eventHolder) {
+ eventHolder.unbind("mouseout", onMouseOut);
+ eventHolder.unbind("mousemove", onMouseMove);
+ });
+ }
+
+ $.plot.plugins.push({
+ init: init,
+ options: options,
+ name: 'crosshair',
+ version: '1.0'
+ });
+})(jQuery);
diff --git a/src/vendor/jquery/jquery.flot.js b/src/vendor/jquery/jquery.flot.js
index c97ceb1bf44..87a1b17c742 100644
--- a/src/vendor/jquery/jquery.flot.js
+++ b/src/vendor/jquery/jquery.flot.js
@@ -1728,6 +1728,8 @@ Licensed under the MIT license.
axis.delta = delta;
axis.tickDecimals = Math.max(0, maxDec != null ? maxDec : dec);
axis.tickSize = opts.tickSize || size;
+ // grafana addition
+ axis.scaledDecimals = axis.tickDecimals - Math.floor(Math.log(axis.tickSize) / Math.LN10);
// Time mode was moved to a plug-in in 0.8, and since so many people use it
// we'll add an especially friendly reminder to make sure they included it.