From a9a932357acf7b378992179b6caf113012094c59 Mon Sep 17 00:00:00 2001 From: Vladimir Kobal Date: Thu, 12 Jan 2017 19:12:24 -0500 Subject: [PATCH 1/1] Add uptime badge to macOS plugin --- src/macos_sysctl.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/src/macos_sysctl.c b/src/macos_sysctl.c index 1c680a82..3a8498ef 100644 --- a/src/macos_sysctl.c +++ b/src/macos_sysctl.c @@ -17,6 +17,8 @@ #include // NEEDED BY do_icmp6... #include +// NEEDED BY do_uptime +#include #define GETSYSCTL(name, var) getsysctl(name, &(var), sizeof(var)) @@ -35,7 +37,7 @@ int do_macos_sysctl(int update_every, usec_t dt) { do_ip_packets = -1, do_ip_fragsout = -1, do_ip_fragsin = -1, do_ip_errors = -1, do_ip6_packets = -1, do_ip6_fragsout = -1, do_ip6_fragsin = -1, do_ip6_errors = -1, do_icmp6 = -1, do_icmp6_redir = -1, do_icmp6_errors = -1, do_icmp6_echos = -1, - do_icmp6_router = -1, do_icmp6_neighbor = -1, do_icmp6_types = -1; + do_icmp6_router = -1, do_icmp6_neighbor = -1, do_icmp6_types = -1, do_uptime = -1; if (unlikely(do_loadavg == -1)) { @@ -68,6 +70,7 @@ int do_macos_sysctl(int update_every, usec_t dt) { do_icmp6_router = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp router", CONFIG_ONDEMAND_ONDEMAND); do_icmp6_neighbor = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp neighbor", CONFIG_ONDEMAND_ONDEMAND); do_icmp6_types = config_get_boolean_ondemand("plugin:macos:sysctl", "icmp types", CONFIG_ONDEMAND_ONDEMAND); + do_uptime = config_get_boolean("plugin:macos:sysctl", "system uptime", 1); } RRDSET *st; @@ -206,6 +209,9 @@ int do_macos_sysctl(int update_every, usec_t dt) { u_long msgs_out; } icmp6_total = {0, 0}; + // NEEDED BY: do_uptime + struct timespec boot_time, cur_time; + // -------------------------------------------------------------------- if (last_loadavg_usec <= dt) { @@ -1065,6 +1071,27 @@ int do_macos_sysctl(int update_every, usec_t dt) { } } + // -------------------------------------------------------------------- + + if (likely(do_uptime)) { + if (unlikely(GETSYSCTL("kern.boottime", boot_time))) { + do_uptime = 0; + error("DISABLED: system.uptime"); + } else { + clock_gettime(CLOCK_REALTIME, &cur_time); + st = rrdset_find("system.uptime"); + + if(unlikely(!st)) { + st = rrdset_create("system", "uptime", NULL, "uptime", NULL, "System Uptime", "seconds", 1000, update_every, RRDSET_TYPE_LINE); + rrddim_add(st, "uptime", NULL, 1, 1, RRDDIM_ABSOLUTE); + } + else rrdset_next(st); + + rrddim_set(st, "uptime", cur_time.tv_sec - boot_time.tv_sec); + rrdset_done(st); + } + } + return 0; } -- 2.39.2