Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Trigger panel: handle time with moment.js

Browse Source
This commit is contained in:
Alexander Zobnin
2016-02-03 19:03:37 +03:00
parent ebc1355bea
commit 4c73f74159
2 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/panel-triggers/module.html
View File

@@ -17,7 +17,7 @@
<th> <th>
<div class="table-panel-table-header-inner pointer">Issue</div> <div class="table-panel-table-header-inner pointer">Issue</div>
</th> </th>
<th ng-if="panel.lastChangeField" style="width: 180px"> <th ng-if="panel.lastChangeField" style="width: 220px">
<div class="table-panel-table-header-inner pointer">Last change</div> <div class="table-panel-table-header-inner pointer">Last change</div>
</th> </th>
<th ng-if="panel.ageField" style="width: 180px"> <th ng-if="panel.ageField" style="width: 180px">

19
plugins/panel-triggers/module.js
View File

@@ -16,10 +16,11 @@ define([
'app/app', 'app/app',
'lodash', 'lodash',
'jquery', 'jquery',
'moment',
'app/core/config', 'app/core/config',
'app/features/panel/panel_meta' 'app/features/panel/panel_meta'
], ],
function (angular, app, _, $, config, PanelMeta) { function (angular, app, _, $, moment, config, PanelMeta) {
'use strict'; 'use strict';
var module = angular.module('grafana.panels.triggers', []); var module = angular.module('grafana.panels.triggers', []);
@@ -135,17 +136,13 @@ function (angular, app, _, $, config, PanelMeta) {
showEvents) showEvents)
.then(function(triggers) { .then(function(triggers) {
return _.map(triggers, function (trigger) { return _.map(triggers, function (trigger) {
var lastchange = new Date(trigger.lastchange * 1000);
var lastchangeUnix = trigger.lastchange;
var now = new Date();
// Consider local time offset
var ageUnix = now - lastchange + now.getTimezoneOffset() * 60000;
var age = toZabbixAgeFormat(ageUnix);
var triggerObj = trigger; var triggerObj = trigger;
triggerObj.lastchangeUnix = lastchangeUnix;
triggerObj.lastchange = lastchange.toLocaleString(); // Format last change and age
triggerObj.age = age.toLocaleString(); trigger.lastchangeUnix = Number(trigger.lastchange);
var timestamp = moment.unix(trigger.lastchangeUnix);
triggerObj.lastchange = timestamp.format("DD MMM YYYY, HH:mm:ss");
triggerObj.age = timestamp.fromNow(true);
// Set color // Set color
if (trigger.value === '1') { if (trigger.value === '1') {