From 602b05319c68aacaf3baebaa88b072e1748ff7d1 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 26 Dec 2018 16:58:46 -0700 Subject: cfg/jarmon-winston.js: Add systemd stuff Also, have 'uptime' on every panel --- cfg/jarmon-winston.js | 41 +++++++++++++++++++++++++++++++++-------- 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/cfg/jarmon-winston.js b/cfg/jarmon-winston.js index ff9fcb6..25effbf 100644 --- a/cfg/jarmon-winston.js +++ b/cfg/jarmon-winston.js @@ -8,14 +8,14 @@ define(['jarmon'], function(jarmon) { var srv = 'https://winston.parabola.nu/collectd/winston.parabola.nu/' var tabRecipes = [ - ['Overview', ['load', 'memory', 'swap-use', 'df-vda3', 'df-vda4']], + ['Overview', ['load', 'memory', 'swap-use', 'df-vda3', 'df-vda4', 'systemd-units', 'systemd-jobs', 'uptime']], - ['CPU', ['load', 'cpu-0', 'cpu-1', 'cpu-2', 'cpu-3', 'cpu-4', 'cpu-5', 'cpu-6', 'cpu-7']], - ['Disk', ['df-vda3', 'df-vda4']], - ['Memory', ['memory', 'swap-use', 'swap-io']], - ['Net', ['interface-eth0', 'interface-lo', 'interface-lvpn']], + ['CPU', ['load', 'cpu-0', 'cpu-1', 'cpu-2', 'cpu-3', 'cpu-4', 'cpu-5', 'cpu-6', 'cpu-7', 'uptime']], + ['Disk', ['df-vda3', 'df-vda4', 'uptime']], + ['Memory', ['memory', 'swap-use', 'swap-io', 'uptime']], + ['Net', ['interface-eth0', 'interface-lo', 'interface-lvpn', 'uptime']], - ['Other', ['entropy', 'uptime', 'users']], + ['Other', ['entropy', 'uptime', 'users', 'uptime']], ]; var cpu = function(title, baseUrl) { @@ -146,7 +146,6 @@ define(['jarmon'], function(jarmon) { options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS, jarmon.Chart.STACKED_OPTIONS) }, - 'swap-io': { title: 'Swap IO', data: [ @@ -157,7 +156,33 @@ define(['jarmon'], function(jarmon) { options: jQuery.extend(true, {}, jarmon.Chart.BASE_OPTIONS) }, - // TODO: systemd + 'systemd-units': { + title: 'Systemd units', + data: [ + //[srv+'systemd/sd_units-inactive.rrd', 0, 'Inactive', ''], + [srv+'systemd/sd_units-active.rrd', 0, 'Active', ''], + [srv+'systemd/sd_units-activating.rrd', 0, 'Activating', ''], + [srv+'systemd/sd_units-reloading.rrd', 0, 'Reloading', ''], + [srv+'systemd/sd_units-deactivating.rrd', 0, 'Deactivating', ''], + [srv+'systemd/sd_units-failed.rrd', 0, 'Failed', ''], + ], + options: jQuery.extend(true, {}, + jarmon.Chart.BASE_OPTIONS, + jarmon.Chart.STACKED_OPTIONS, + {series: {lines: {zero: false}}}) + }, + 'systemd-jobs': { + title: 'Systemd jobs', + data: [ + [srv+'systemd/sd_jobs-installed.rrd', 0, 'Installed', ''], + [srv+'systemd/sd_jobs-queued.rrd', 0, 'Queued', ''], + [srv+'systemd/sd_jobs-failed.rrd', 0, 'Failed', ''], + ], + options: jQuery.extend(true, {}, + jarmon.Chart.BASE_OPTIONS, + jarmon.Chart.STACKED_OPTIONS, + {series: {lines: {zero: false}}}) + }, 'uptime': { title: 'Uptime', -- cgit v1.2.3-54-g00ecf