Skip to content
Browse files

Merge branch 'upstream-master'

  • Loading branch information...
2 parents 0601107 + f8d6410 commit 76691d7d043afbd800c73098eabfb2abec4350e0 @eugeneventer eugeneventer committed Feb 7, 2013
View
21 plugins/nagios/static/client.js
@@ -5,8 +5,16 @@ plugins.nagios = {
start: function() {
html = ('<div class="plugin" id="nagios"><h1>Server States</h1><div class="lastchange"></div></div>');
$('div#body').append(html);
- },
+ $.getScript(
+ base_url + '/plugin/nagios/jquery.timeago.js',
+ function() {
+ jQuery(document).ready(function() {
+ jQuery("abbr.timeago").timeago({suffixAgo: ''});
+ });
+ }
+ );
+ },
receiveData: function(data) {
@@ -26,7 +34,6 @@ plugins.nagios = {
if (data['lastchange']) {
var c = new Date();
c.setTime(data['lastchange'] * 1000);
-
lastchange.html('Last change: '+c.toDateString()+' '+c.toTimeString());
}
@@ -37,7 +44,7 @@ plugins.nagios = {
var group = $('div#'+title, container);
if (!group.length) {
- var group = $('<div id="'+title+'"><h2>'+title+'</h2><ul></ul></div>');
+ var group = $('<div id="'+title+'"><h2>'+title+'<abbr class="timeago"></abbr></h2><ul></ul></div>');
$('h1', container).after(group);
}
@@ -49,7 +56,13 @@ plugins.nagios = {
}
// Set state
- $('h2', group).attr('class', data['states'][c]);
+ $('h2', group).attr('class', data['states'][c][0]);
+
+ // Set date state last changed
+ var lc = new Date();
+ lc.setTime(data['states'][c][1] * 1000);
+ $('h2 abbr', group).attr('title', lc.toISOString());
+ jQuery("abbr.timeago").timeago({suffixAgo: ''});
}
}
}
View
162 plugins/nagios/static/jquery.timeago.js
@@ -0,0 +1,162 @@
+/**
+ * Timeago is a jQuery plugin that makes it easy to support automatically
+ * updating fuzzy timestamps (e.g. "4 minutes ago" or "about 1 day ago").
+ *
+ * @name timeago
+ * @version 1.0.2
+ * @requires jQuery v1.2.3+
+ * @author Ryan McGeary
+ * @license MIT License - http://www.opensource.org/licenses/mit-license.php
+ *
+ * For usage and examples, visit:
+ * http://timeago.yarp.com/
+ *
+ * Copyright (c) 2008-2013, Ryan McGeary (ryan -[at]- mcgeary [*dot*] org)
+ */
+
+(function (factory) {
+ if (typeof define === 'function' && define.amd) {
+ // AMD. Register as an anonymous module.
+ define(['jquery'], factory);
+ } else {
+ // Browser globals
+ factory(jQuery);
+ }
+}(function ($) {
+ $.timeago = function(timestamp) {
+ if (timestamp instanceof Date) {
+ return inWords(timestamp);
+ } else if (typeof timestamp === "string") {
+ return inWords($.timeago.parse(timestamp));
+ } else if (typeof timestamp === "number") {
+ return inWords(new Date(timestamp));
+ } else {
+ return inWords($.timeago.datetime(timestamp));
+ }
+ };
+ var $t = $.timeago;
+
+ $.extend($.timeago, {
+ settings: {
+ refreshMillis: 60000,
+ allowFuture: false,
+ strings: {
+ prefixAgo: null,
+ prefixFromNow: null,
+ suffixAgo: "ago",
+ suffixFromNow: "from now",
+ seconds: "less than a minute",
+ minute: "about a minute",
+ minutes: "%d minutes",
+ hour: "about an hour",
+ hours: "about %d hours",
+ day: "a day",
+ days: "%d days",
+ month: "about a month",
+ months: "%d months",
+ year: "about a year",
+ years: "%d years",
+ wordSeparator: " ",
+ numbers: []
+ }
+ },
+ inWords: function(distanceMillis) {
+ var $l = this.settings.strings;
+ var prefix = $l.prefixAgo;
+ var suffix = $l.suffixAgo;
+ if (this.settings.allowFuture) {
+ if (distanceMillis < 0) {
+ prefix = $l.prefixFromNow;
+ suffix = $l.suffixFromNow;
+ }
+ }
+
+ var seconds = Math.abs(distanceMillis) / 1000;
+ var minutes = seconds / 60;
+ var hours = minutes / 60;
+ var days = hours / 24;
+ var years = days / 365;
+
+ function substitute(stringOrFunction, number) {
+ var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, distanceMillis) : stringOrFunction;
+ var value = ($l.numbers && $l.numbers[number]) || number;
+ return string.replace(/%d/i, value);
+ }
+
+ var words = seconds < 45 && substitute($l.seconds, Math.round(seconds)) ||
+ seconds < 90 && substitute($l.minute, 1) ||
+ minutes < 45 && substitute($l.minutes, Math.round(minutes)) ||
+ minutes < 90 && substitute($l.hour, 1) ||
+ hours < 24 && substitute($l.hours, Math.round(hours)) ||
+ hours < 42 && substitute($l.day, 1) ||
+ days < 30 && substitute($l.days, Math.round(days)) ||
+ days < 45 && substitute($l.month, 1) ||
+ days < 365 && substitute($l.months, Math.round(days / 30)) ||
+ years < 1.5 && substitute($l.year, 1) ||
+ substitute($l.years, Math.round(years));
+
+ var separator = $l.wordSeparator || "";
+ if ($l.wordSeparator === undefined) { separator = " "; }
+ return $.trim([prefix, words, suffix].join(separator));
+ },
+ parse: function(iso8601) {
+ var s = $.trim(iso8601);
+ s = s.replace(/\.\d+/,""); // remove milliseconds
+ s = s.replace(/-/,"/").replace(/-/,"/");
+ s = s.replace(/T/," ").replace(/Z/," UTC");
+ s = s.replace(/([\+\-]\d\d)\:?(\d\d)/," $1$2"); // -04:00 -> -0400
+ return new Date(s);
+ },
+ datetime: function(elem) {
+ var iso8601 = $t.isTime(elem) ? $(elem).attr("datetime") : $(elem).attr("title");
+ return $t.parse(iso8601);
+ },
+ isTime: function(elem) {
+ // jQuery's `is()` doesn't play well with HTML5 in IE
+ return $(elem).get(0).tagName.toLowerCase() === "time"; // $(elem).is("time");
+ }
+ });
+
+ $.fn.timeago = function() {
+ var self = this;
+ self.each(refresh);
+
+ var $s = $t.settings;
+ if ($s.refreshMillis > 0) {
+ setInterval(function() { self.each(refresh); }, $s.refreshMillis);
+ }
+ return self;
+ };
+
+ function refresh() {
+ var data = prepareData(this);
+ if (!isNaN(data.datetime)) {
+ $(this).text(inWords(data.datetime));
+ }
+ return this;
+ }
+
+ function prepareData(element) {
+ element = $(element);
+ if (!element.data("timeago")) {
+ element.data("timeago", { datetime: $t.datetime(element) });
+ var text = $.trim(element.text());
+ if (text.length > 0 && !($t.isTime(element) && element.attr("title"))) {
+ element.attr("title", text);
+ }
+ }
+ return element.data("timeago");
+ }
+
+ function inWords(date) {
+ return $t.inWords(distance(date));
+ }
+
+ function distance(date) {
+ return (new Date().getTime() - date.getTime());
+ }
+
+ // fix for IE6 suckage
+ document.createElement("abbr");
+ document.createElement("time");
+}));
View
5 plugins/nagios/static/style.css
@@ -22,6 +22,11 @@ div#nagios h2.Unknown {
background-color: #ff8c00;
}
+div#nagios h2 abbr {
+ float: right;
+ font-size: 85%;
+}
+
div#nagios ul {
padding: 0 0 0 1em;
margin: 0;
View
31 plugins/nagios/update.php
@@ -5,6 +5,13 @@
// Last dataset hash
$lasthash = '';
+$lastcodes = array();
+$laststates = array();
+
+define('STATE_OK', 'OK');
+define('STATE_WARNING', 'Warning');
+define('STATE_UNKNOWN', 'Unknown');
+define('STATE_CRITICAL', 'Critical');
while (1) {
@@ -20,7 +27,7 @@
$group = array();
$state = 0;
- $types = array('OK', 'Warning', 'Unknown', 'Critical');
+ $types = array(STATE_OK, STATE_WARNING, STATE_UNKNOWN, STATE_CRITICAL);
foreach ($data as $i => $row) {
$group[$types[$i]] = $row;
@@ -30,18 +37,34 @@
}
}
+ // If no data supplied, critical
+ if (!count($data)) {
+ $state = STATE_CRITICAL;
+ } else {
+ $state = $types[$state];
+ }
+
+ // Check when state last changed
+ if (!in_array($name, array_keys($laststates)) || $laststates[$name][0] !== $state) {
+ $timechanged = time();
+ } else {
+ $timechanged = $laststates[$name][1];
+ }
+
+ $states[$name] = array($state, $timechanged);
$codes[$name] = $group;
- $states[$name] = $types[$state];
}
- $newhash = serialize($codes);
+ $newhash = md5(serialize($codes) . serialize($states));
if ($newhash != $lasthash) {
print "Update sent\n";
dashboard_push_data('nagios', array('lastchange' => time(), 'groups' => $codes, 'states' => $states));
}
$lasthash = $newhash;
+ $lastcodes = $codes;
+ $laststates = $states;
- sleep(60);
+ sleep(30);
}
View
4 server/templates/index.html
@@ -4,6 +4,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Catalyst Dashboard</title>
<link rel="stylesheet" href="{{ static_url("base.css") }}" type="text/css"/>
+
+ <script type="text/javascript">
+ var base_url = '{{ url }}';
+ </script>
</head>
<body>

0 comments on commit 76691d7

Please sign in to comment.
Something went wrong with that request. Please try again.