IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Slight refactoring in annotationSrv

Browse Source
This commit is contained in:
Torkel Ödegaard 2015-05-27 10:42:52 +02:00
parent 99556057d1
commit 4a71a79cb8
1 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
public/app/features/annotations/annotationsSrv.js
View File

@ -1,9 +1,8 @@
define([ define([
'angular', 'angular',
'lodash', 'lodash',
'moment',
'./editorCtrl' './editorCtrl'
], function (angular, _, moment) { ], function (angular, _) {
'use strict'; 'use strict';
var module = angular.module('grafana.services'); var module = angular.module('grafana.services');
@ -11,7 +10,6 @@ define([
module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope, $sanitize) { module.service('annotationsSrv', function(datasourceSrv, $q, alertSrv, $rootScope, $sanitize) {
var promiseCached; var promiseCached;
var list = []; var list = [];
var timezone;
var self = this; var self = this;
this.init = function() { this.init = function() {
@ -33,7 +31,7 @@ define([
return promiseCached; return promiseCached;
} }
timezone = dashboard.timezone; self.dashboard = dashboard;
var annotations = _.where(dashboard.annotations.list, {enable: true}); var annotations = _.where(dashboard.annotations.list, {enable: true});
var promises = _.map(annotations, function(annotation) { var promises = _.map(annotations, function(annotation) {
@ -54,31 +52,21 @@ define([
this.receiveAnnotationResults = function(results) { this.receiveAnnotationResults = function(results) {
for (var i = 0; i < results.length; i++) { for (var i = 0; i < results.length; i++) {
addAnnotation(results[i]); self.addAnnotation(results[i]);
} }
}; };
function errorHandler(err) { this.addAnnotation = function(options) {
console.log('Annotation error: ', err);
var message = err.message || "Annotation query failed";
alertSrv.set('Annotations error', message,'error');
}
function addAnnotation(options) {
var title = $sanitize(options.title); var title = $sanitize(options.title);
var tooltip = "<small><b>" + title + "</b><br/>"; var time = '<i>' + self.dashboard.formatDate(options.time) + '</i>';
var tooltip = '<div class="graph-tooltip small"><div class="graph-tooltip-time">'+ title + ' ' + time + '</div> ' ;
if (options.tags) { if (options.tags) {
var tags = $sanitize(options.tags); var tags = $sanitize(options.tags);
tooltip += '<span class="tag label label-tag">' + (tags || '') + '</span><br/>'; tooltip += '<span class="tag label label-tag">' + (tags || '') + '</span><br/>';
} }
if (timezone === 'browser') {
tooltip += '<i>' + moment(options.time).format('YYYY-MM-DD HH:mm:ss') + '</i><br/>';
}
else {
tooltip += '<i>' + moment.utc(options.time).format('YYYY-MM-DD HH:mm:ss') + '</i><br/>';
}
if (options.text) { if (options.text) {
var text = $sanitize(options.text); var text = $sanitize(options.text);
tooltip += text.replace(/\n/g, '<br/>'); tooltip += text.replace(/\n/g, '<br/>');
@ -95,6 +83,12 @@ define([
description: tooltip, description: tooltip,
score: 1 score: 1
}); });
};
function errorHandler(err) {
console.log('Annotation error: ', err);
var message = err.message || "Annotation query failed";
alertSrv.set('Annotations error', message,'error');
} }
// Now init // Now init