From 86053441b6a0b7d1a15330fdc23f0411356d1269 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 12 Jul 2024 16:49:28 +0200 Subject: check_ups: additional alarm conditions (#1961) * check_ups: * Update copyright * General refactoring * code formatting * Add ALARM state from ups -> Critical * Set some more states to be warnings --- plugins/check_ups.c | 1043 +++++++++++++++++++++++++++------------------------ 1 file changed, 545 insertions(+), 498 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 2fb04eef..380ff3bc 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -1,699 +1,746 @@ /***************************************************************************** -* -* Monitoring check_ups plugin -* -* License: GPL -* Copyright (c) 2000 Tom Shields -* 2004 Alain Richard -* 2004 Arnaud Quette -* Copyright (c) 2002-2007 Monitoring Plugins Development Team -* -* Description: -* -* This file contains Network UPS Tools plugin for Monitoring -* -* This plugin tests the UPS service on the specified host. Network UPS Tools -* from www.networkupstools.org must be running for this plugin to work. -* -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see . -* -* -*****************************************************************************/ + * + * Monitoring check_ups plugin + * + * License: GPL + * Copyright (c) 2000 Tom Shields + * 2004 Alain Richard + * 2004 Arnaud Quette + * Copyright (c) 2002-2023 Monitoring Plugins Development Team + * + * Description: + * + * This file contains Network UPS Tools plugin for Monitoring + * + * This plugin tests the UPS service on the specified host. Network UPS Tools + * from www.networkupstools.org must be running for this plugin to work. + * + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * + *****************************************************************************/ const char *progname = "check_ups"; -const char *copyright = "2000-2007"; +const char *copyright = "2000-2023"; const char *email = "devel@monitoring-plugins.org"; #include "common.h" #include "netutils.h" #include "utils.h" -enum { - PORT = 3493 -}; +enum { PORT = 3493 }; -#define CHECK_NONE 0 - -#define UPS_NONE 0 /* no supported options */ -#define UPS_UTILITY 1 /* supports utility line */ -#define UPS_BATTPCT 2 /* supports percent battery remaining */ -#define UPS_STATUS 4 /* supports UPS status */ -#define UPS_TEMP 8 /* supports UPS temperature */ -#define UPS_LOADPCT 16 /* supports load percent */ +#define UPS_NONE 0 /* no supported options */ +#define UPS_UTILITY 1 /* supports utility line */ +#define UPS_BATTPCT 2 /* supports percent battery remaining */ +#define UPS_STATUS 4 /* supports UPS status */ +#define UPS_TEMP 8 /* supports UPS temperature */ +#define UPS_LOADPCT 16 /* supports load percent */ #define UPS_REALPOWER 32 /* supports real power */ -#define UPSSTATUS_NONE 0 -#define UPSSTATUS_OFF 1 -#define UPSSTATUS_OL 2 -#define UPSSTATUS_OB 4 -#define UPSSTATUS_LB 8 -#define UPSSTATUS_CAL 16 -#define UPSSTATUS_RB 32 /*Replace Battery */ -#define UPSSTATUS_BYPASS 64 -#define UPSSTATUS_OVER 128 -#define UPSSTATUS_TRIM 256 -#define UPSSTATUS_BOOST 512 +#define UPSSTATUS_NONE 0 +#define UPSSTATUS_OFF 1 +#define UPSSTATUS_OL 2 +#define UPSSTATUS_OB 4 +#define UPSSTATUS_LB 8 +#define UPSSTATUS_CAL 16 +#define UPSSTATUS_RB 32 /*Replace Battery */ +#define UPSSTATUS_BYPASS 64 +#define UPSSTATUS_OVER 128 +#define UPSSTATUS_TRIM 256 +#define UPSSTATUS_BOOST 512 #define UPSSTATUS_CHRG 1024 #define UPSSTATUS_DISCHRG 2048 -#define UPSSTATUS_UNKNOWN 4096 - -enum { NOSUCHVAR = ERROR-1 }; - -int server_port = PORT; -char *server_address; -char *ups_name = NULL; -double warning_value = 0.0; -double critical_value = 0.0; -bool check_warn = false; -bool check_crit = false; -int check_variable = UPS_NONE; -int supported_options = UPS_NONE; -int status = UPSSTATUS_NONE; - -double ups_utility_voltage = 0.0; -double ups_battery_percent = 0.0; -double ups_load_percent = 0.0; -double ups_temperature = 0.0; -double ups_realpower = 0.0; -char *ups_status; -bool temp_output_c = false; - -int determine_status (void); -int get_ups_variable (const char *, char *); - -int process_arguments (int, char **); -int validate_arguments (void); -void print_help (void); -void print_usage (void); - -int -main (int argc, char **argv) -{ - int result = STATE_UNKNOWN; - char *message; +#define UPSSTATUS_UNKNOWN 4096 +#define UPSSTATUS_ALARM 8192 + +enum { NOSUCHVAR = ERROR - 1 }; + +typedef struct ups_config { + unsigned int server_port; + char *server_address; + char *ups_name; + double warning_value; + double critical_value; + bool check_warn; + bool check_crit; + int check_variable; + int status; + bool temp_output_c; +} ups_config; + +ups_config ups_config_init(void) { + ups_config tmp = {0}; + tmp.server_port = PORT; + tmp.server_address = NULL; + tmp.ups_name = NULL; + tmp.check_variable = UPS_NONE; + tmp.status = UPSSTATUS_NONE; + + return tmp; +} + +// Forward declarations +int determine_status(ups_config *, int *supported_options); +int get_ups_variable(const char *, char *, const ups_config config); + +int process_arguments(int, char **, ups_config *); +int validate_arguments(ups_config); +void print_help(void); +void print_usage(void); + +int main(int argc, char **argv) { + setlocale(LC_ALL, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + + char *ups_status; + ups_status = strdup("N/A"); + char *data; - char *tunits; - char temp_buffer[MAX_INPUT_BUFFER]; - double ups_utility_deviation = 0.0; - int res; + data = strdup(""); - setlocale (LC_ALL, ""); - bindtextdomain (PACKAGE, LOCALEDIR); - textdomain (PACKAGE); + char *message; + message = strdup(""); - ups_status = strdup ("N/A"); - data = strdup (""); - message = strdup (""); + // Exit result + int result = STATE_UNKNOWN; /* Parse extra opts if any */ - argv=np_extra_opts (&argc, argv, progname); + argv = np_extra_opts(&argc, argv, progname); - if (process_arguments (argc, argv) == ERROR) - usage4 (_("Could not parse arguments")); + // Config from commandline + ups_config config = ups_config_init(); + + if (process_arguments(argc, argv, &config) == ERROR) { + usage4(_("Could not parse arguments")); + } /* initialize alarm signal handling */ - signal (SIGALRM, socket_timeout_alarm_handler); + signal(SIGALRM, socket_timeout_alarm_handler); /* set socket timeout */ - alarm (socket_timeout); + alarm(socket_timeout); + + int supported_options = UPS_NONE; /* get the ups status if possible */ - if (determine_status () != OK) + if (determine_status(&config, &supported_options) != OK) { return STATE_CRITICAL; + } + + if (supported_options & UPS_STATUS) { - ups_status = strdup (""); + ups_status = strdup(""); + result = STATE_OK; - if (status & UPSSTATUS_OFF) { - xasprintf (&ups_status, "Off"); + if (config.status & UPSSTATUS_OFF) { + xasprintf(&ups_status, "Off"); result = STATE_CRITICAL; - } - else if ((status & (UPSSTATUS_OB | UPSSTATUS_LB)) == - (UPSSTATUS_OB | UPSSTATUS_LB)) { - xasprintf (&ups_status, _("On Battery, Low Battery")); + } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) == + (UPSSTATUS_OB | UPSSTATUS_LB)) { + xasprintf(&ups_status, _("On Battery, Low Battery")); result = STATE_CRITICAL; - } - else { - if (status & UPSSTATUS_OL) { - xasprintf (&ups_status, "%s%s", ups_status, _("Online")); + } else { + if (config.status & UPSSTATUS_OL) { + xasprintf(&ups_status, "%s%s", ups_status, _("Online")); } - if (status & UPSSTATUS_OB) { - xasprintf (&ups_status, "%s%s", ups_status, _("On Battery")); - result = STATE_WARNING; + if (config.status & UPSSTATUS_OB) { + xasprintf(&ups_status, "%s%s", ups_status, _("On Battery")); + result = max_state(result, STATE_WARNING); } - if (status & UPSSTATUS_LB) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Low Battery")); - result = STATE_WARNING; + if (config.status & UPSSTATUS_LB) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Low Battery")); + result = max_state(result, STATE_WARNING); } - if (status & UPSSTATUS_CAL) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Calibrating")); + if (config.status & UPSSTATUS_CAL) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Calibrating")); } - if (status & UPSSTATUS_RB) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Replace Battery")); - result = STATE_WARNING; + if (config.status & UPSSTATUS_RB) { + xasprintf(&ups_status, "%s%s", ups_status, + _(", Replace Battery")); + result = max_state(result, STATE_WARNING); } - if (status & UPSSTATUS_BYPASS) { - xasprintf (&ups_status, "%s%s", ups_status, _(", On Bypass")); + if (config.status & UPSSTATUS_BYPASS) { + xasprintf(&ups_status, "%s%s", ups_status, _(", On Bypass")); + // Bypassing the battery is likely a bad thing + result = STATE_CRITICAL; + } + if (config.status & UPSSTATUS_OVER) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Overload")); + result = max_state(result, STATE_WARNING); } - if (status & UPSSTATUS_OVER) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Overload")); + if (config.status & UPSSTATUS_TRIM) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Trimming")); } - if (status & UPSSTATUS_TRIM) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Trimming")); + if (config.status & UPSSTATUS_BOOST) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Boosting")); } - if (status & UPSSTATUS_BOOST) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Boosting")); + if (config.status & UPSSTATUS_CHRG) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Charging")); } - if (status & UPSSTATUS_CHRG) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Charging")); + if (config.status & UPSSTATUS_DISCHRG) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Discharging")); + result = max_state(result, STATE_WARNING); } - if (status & UPSSTATUS_DISCHRG) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Discharging")); + if (config.status & UPSSTATUS_ALARM) { + xasprintf(&ups_status, "%s%s", ups_status, _(", ALARM")); + result = STATE_CRITICAL; } - if (status & UPSSTATUS_UNKNOWN) { - xasprintf (&ups_status, "%s%s", ups_status, _(", Unknown")); + if (config.status & UPSSTATUS_UNKNOWN) { + xasprintf(&ups_status, "%s%s", ups_status, _(", Unknown")); } } - xasprintf (&message, "%sStatus=%s ", message, ups_status); + xasprintf(&message, "%sStatus=%s ", message, ups_status); } + int res; + char temp_buffer[MAX_INPUT_BUFFER]; + /* get the ups utility voltage if possible */ - res=get_ups_variable ("input.voltage", temp_buffer); - if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY; - else if (res != OK) + res = get_ups_variable("input.voltage", temp_buffer, config); + if (res == NOSUCHVAR) { + supported_options &= ~UPS_UTILITY; + } else if (res != OK) { return STATE_CRITICAL; - else { + } else { supported_options |= UPS_UTILITY; - ups_utility_voltage = atof (temp_buffer); - xasprintf (&message, "%sUtility=%3.1fV ", message, ups_utility_voltage); + double ups_utility_voltage = 0.0; + ups_utility_voltage = atof(temp_buffer); + xasprintf(&message, "%sUtility=%3.1fV ", message, ups_utility_voltage); + + double ups_utility_deviation = 0.0; - if (ups_utility_voltage > 120.0) + if (ups_utility_voltage > 120.0) { ups_utility_deviation = 120.0 - ups_utility_voltage; - else + } else { ups_utility_deviation = ups_utility_voltage - 120.0; + } - if (check_variable == UPS_UTILITY) { - if (check_crit && ups_utility_deviation>=critical_value) { + if (config.check_variable == UPS_UTILITY) { + if (config.check_crit && + ups_utility_deviation >= config.critical_value) { result = STATE_CRITICAL; - } - else if (check_warn && ups_utility_deviation>=warning_value) { - result = max_state (result, STATE_WARNING); - } - xasprintf (&data, "%s", - perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV", - check_warn, (long)(1000*warning_value), - check_crit, (long)(1000*critical_value), - true, 0, false, 0)); + } else if (config.check_warn && + ups_utility_deviation >= config.warning_value) { + result = max_state(result, STATE_WARNING); + } + xasprintf(&data, "%s", + perfdata("voltage", (long)(1000 * ups_utility_voltage), + "mV", config.check_warn, + (long)(1000 * config.warning_value), + config.check_crit, + (long)(1000 * config.critical_value), true, 0, + false, 0)); } else { - xasprintf (&data, "%s", - perfdata ("voltage", (long)(1000*ups_utility_voltage), "mV", - false, 0, false, 0, true, 0, false, 0)); + xasprintf(&data, "%s", + perfdata("voltage", (long)(1000 * ups_utility_voltage), + "mV", false, 0, false, 0, true, 0, false, 0)); } } /* get the ups battery percent if possible */ - res=get_ups_variable ("battery.charge", temp_buffer); - if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT; - else if ( res != OK) + res = get_ups_variable("battery.charge", temp_buffer, config); + if (res == NOSUCHVAR) { + supported_options &= ~UPS_BATTPCT; + } else if (res != OK) { return STATE_CRITICAL; - else { + } else { supported_options |= UPS_BATTPCT; - ups_battery_percent = atof (temp_buffer); - xasprintf (&message, "%sBatt=%3.1f%% ", message, ups_battery_percent); - if (check_variable == UPS_BATTPCT) { - if (check_crit && ups_battery_percent <= critical_value) { + double ups_battery_percent = 0.0; + ups_battery_percent = atof(temp_buffer); + xasprintf(&message, "%sBatt=%3.1f%% ", message, ups_battery_percent); + + if (config.check_variable == UPS_BATTPCT) { + if (config.check_crit && + ups_battery_percent <= config.critical_value) { result = STATE_CRITICAL; - } - else if (check_warn && ups_battery_percent<=warning_value) { - result = max_state (result, STATE_WARNING); - } - xasprintf (&data, "%s %s", data, - perfdata ("battery", (long)ups_battery_percent, "%", - check_warn, (long)(warning_value), - check_crit, (long)(critical_value), - true, 0, true, 100)); + } else if (config.check_warn && + ups_battery_percent <= config.warning_value) { + result = max_state(result, STATE_WARNING); + } + xasprintf(&data, "%s %s", data, + perfdata("battery", (long)ups_battery_percent, "%", + config.check_warn, (long)(config.warning_value), + config.check_crit, (long)(config.critical_value), + true, 0, true, 100)); } else { - xasprintf (&data, "%s %s", data, - perfdata ("battery", (long)ups_battery_percent, "%", - false, 0, false, 0, true, 0, true, 100)); + xasprintf(&data, "%s %s", data, + perfdata("battery", (long)ups_battery_percent, "%", false, + 0, false, 0, true, 0, true, 100)); } } /* get the ups load percent if possible */ - res=get_ups_variable ("ups.load", temp_buffer); - if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT; - else if ( res != OK) + res = get_ups_variable("ups.load", temp_buffer, config); + if (res == NOSUCHVAR) { + supported_options &= ~UPS_LOADPCT; + } else if (res != OK) { return STATE_CRITICAL; - else { + } else { supported_options |= UPS_LOADPCT; - ups_load_percent = atof (temp_buffer); - xasprintf (&message, "%sLoad=%3.1f%% ", message, ups_load_percent); - if (check_variable == UPS_LOADPCT) { - if (check_crit && ups_load_percent>=critical_value) { + double ups_load_percent = 0.0; + ups_load_percent = atof(temp_buffer); + xasprintf(&message, "%sLoad=%3.1f%% ", message, ups_load_percent); + + if (config.check_variable == UPS_LOADPCT) { + if (config.check_crit && + ups_load_percent >= config.critical_value) { result = STATE_CRITICAL; - } - else if (check_warn && ups_load_percent>=warning_value) { - result = max_state (result, STATE_WARNING); - } - xasprintf (&data, "%s %s", data, - perfdata ("load", (long)ups_load_percent, "%", - check_warn, (long)(warning_value), - check_crit, (long)(critical_value), - true, 0, true, 100)); + } else if (config.check_warn && + ups_load_percent >= config.warning_value) { + result = max_state(result, STATE_WARNING); + } + xasprintf(&data, "%s %s", data, + perfdata("load", (long)ups_load_percent, "%", + config.check_warn, (long)(config.warning_value), + config.check_crit, (long)(config.critical_value), + true, 0, true, 100)); } else { - xasprintf (&data, "%s %s", data, - perfdata ("load", (long)ups_load_percent, "%", - false, 0, false, 0, true, 0, true, 100)); + xasprintf(&data, "%s %s", data, + perfdata("load", (long)ups_load_percent, "%", false, 0, + false, 0, true, 0, true, 100)); } } /* get the ups temperature if possible */ - res=get_ups_variable ("ups.temperature", temp_buffer); - if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP; - else if ( res != OK) + res = get_ups_variable("ups.temperature", temp_buffer, config); + if (res == NOSUCHVAR) { + supported_options &= ~UPS_TEMP; + } else if (res != OK) { return STATE_CRITICAL; - else { - supported_options |= UPS_TEMP; - if (temp_output_c) { - tunits="degC"; - ups_temperature = atof (temp_buffer); - xasprintf (&message, "%sTemp=%3.1fC", message, ups_temperature); - } - else { - tunits="degF"; - ups_temperature = (atof (temp_buffer) * 1.8) + 32; - xasprintf (&message, "%sTemp=%3.1fF", message, ups_temperature); + } else { + supported_options |= UPS_TEMP; + + double ups_temperature = 0.0; + char *tunits; + + if (config.temp_output_c) { + tunits = "degC"; + ups_temperature = atof(temp_buffer); + xasprintf(&message, "%sTemp=%3.1fC", message, ups_temperature); + } else { + tunits = "degF"; + ups_temperature = (atof(temp_buffer) * 1.8) + 32; + xasprintf(&message, "%sTemp=%3.1fF", message, ups_temperature); } - if (check_variable == UPS_TEMP) { - if (check_crit && ups_temperature>=critical_value) { + if (config.check_variable == UPS_TEMP) { + if (config.check_crit && ups_temperature >= config.critical_value) { result = STATE_CRITICAL; - } - else if (check_warn && ups_temperature>=warning_value) { - result = max_state (result, STATE_WARNING); - } - xasprintf (&data, "%s %s", data, - perfdata ("temp", (long)ups_temperature, tunits, - check_warn, (long)(warning_value), - check_crit, (long)(critical_value), - true, 0, false, 0)); + } else if (config.check_warn && + ups_temperature >= config.warning_value) { + result = max_state(result, STATE_WARNING); + } + xasprintf(&data, "%s %s", data, + perfdata("temp", (long)ups_temperature, tunits, + config.check_warn, (long)(config.warning_value), + config.check_crit, (long)(config.critical_value), + true, 0, false, 0)); } else { - xasprintf (&data, "%s %s", data, - perfdata ("temp", (long)ups_temperature, tunits, - false, 0, false, 0, true, 0, false, 0)); + xasprintf(&data, "%s %s", data, + perfdata("temp", (long)ups_temperature, tunits, false, 0, + false, 0, true, 0, false, 0)); } } /* get the ups real power if possible */ - res=get_ups_variable ("ups.realpower", temp_buffer); - if ( res == NOSUCHVAR ) supported_options &= ~UPS_REALPOWER; - else if ( res != OK) + res = get_ups_variable("ups.realpower", temp_buffer, config); + if (res == NOSUCHVAR) { + supported_options &= ~UPS_REALPOWER; + } else if (res != OK) { return STATE_CRITICAL; - else { + } else { supported_options |= UPS_REALPOWER; - ups_realpower = atof (temp_buffer); - xasprintf (&message, "%sReal power=%3.1fW ", message, ups_realpower); + double ups_realpower = 0.0; + ups_realpower = atof(temp_buffer); + xasprintf(&message, "%sReal power=%3.1fW ", message, ups_realpower); - if (check_variable == UPS_REALPOWER) { - if (check_crit && ups_realpower>=critical_value) { + if (config.check_variable == UPS_REALPOWER) { + if (config.check_crit && ups_realpower >= config.critical_value) { result = STATE_CRITICAL; - } - else if (check_warn && ups_realpower>=warning_value) { - result = max_state (result, STATE_WARNING); - } - xasprintf (&data, "%s %s", data, - perfdata ("realpower", (long)ups_realpower, "W", - check_warn, (long)(warning_value), - check_crit, (long)(critical_value), - true, 0, false, 0)); + } else if (config.check_warn && + ups_realpower >= config.warning_value) { + result = max_state(result, STATE_WARNING); + } + xasprintf(&data, "%s %s", data, + perfdata("realpower", (long)ups_realpower, "W", + config.check_warn, (long)(config.warning_value), + config.check_crit, (long)(config.critical_value), + true, 0, false, 0)); } else { - xasprintf (&data, "%s %s", data, - perfdata ("realpower", (long)ups_realpower, "W", - false, 0, false, 0, true, 0, false, 0)); + xasprintf(&data, "%s %s", data, + perfdata("realpower", (long)ups_realpower, "W", false, 0, + false, 0, true, 0, false, 0)); } } - /* if the UPS does not support any options we are looking for, report an error */ + /* if the UPS does not support any options we are looking for, report an + * error */ if (supported_options == UPS_NONE) { result = STATE_CRITICAL; - xasprintf (&message, _("UPS does not support any available options\n")); + xasprintf(&message, _("UPS does not support any available options\n")); } /* reset timeout */ - alarm (0); + alarm(0); - printf ("UPS %s - %s|%s\n", state_text(result), message, data); + printf("UPS %s - %s|%s\n", state_text(result), message, data); return result; } - - /* determines what options are supported by the UPS */ -int -determine_status (void) -{ +int determine_status(ups_config *config, int *supported_options) { char recv_buffer[MAX_INPUT_BUFFER]; - char temp_buffer[MAX_INPUT_BUFFER]; - char *ptr; - int res; - res=get_ups_variable ("ups.status", recv_buffer); - if (res == NOSUCHVAR) return OK; + int res = get_ups_variable("ups.status", recv_buffer, *config); + if (res == NOSUCHVAR) { + return OK; + } + if (res != STATE_OK) { - printf ("%s\n", _("Invalid response received from host")); + printf("%s\n", _("Invalid response received from host")); return ERROR; } - supported_options |= UPS_STATUS; - - strcpy (temp_buffer, recv_buffer); - for (ptr = (char *) strtok (temp_buffer, " "); ptr != NULL; - ptr = (char *) strtok (NULL, " ")) { - if (!strcmp (ptr, "OFF")) - status |= UPSSTATUS_OFF; - else if (!strcmp (ptr, "OL")) - status |= UPSSTATUS_OL; - else if (!strcmp (ptr, "OB")) - status |= UPSSTATUS_OB; - else if (!strcmp (ptr, "LB")) - status |= UPSSTATUS_LB; - else if (!strcmp (ptr, "CAL")) - status |= UPSSTATUS_CAL; - else if (!strcmp (ptr, "RB")) - status |= UPSSTATUS_RB; - else if (!strcmp (ptr, "BYPASS")) - status |= UPSSTATUS_BYPASS; - else if (!strcmp (ptr, "OVER")) - status |= UPSSTATUS_OVER; - else if (!strcmp (ptr, "TRIM")) - status |= UPSSTATUS_TRIM; - else if (!strcmp (ptr, "BOOST")) - status |= UPSSTATUS_BOOST; - else if (!strcmp (ptr, "CHRG")) - status |= UPSSTATUS_CHRG; - else if (!strcmp (ptr, "DISCHRG")) - status |= UPSSTATUS_DISCHRG; - else - status |= UPSSTATUS_UNKNOWN; + *supported_options |= UPS_STATUS; + + char temp_buffer[MAX_INPUT_BUFFER]; + + strcpy(temp_buffer, recv_buffer); + for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL; + ptr = (char *)strtok(NULL, " ")) { + if (!strcmp(ptr, "OFF")) { + config->status |= UPSSTATUS_OFF; + } else if (!strcmp(ptr, "OL")) { + config->status |= UPSSTATUS_OL; + } else if (!strcmp(ptr, "OB")) { + config->status |= UPSSTATUS_OB; + } else if (!strcmp(ptr, "LB")) { + config->status |= UPSSTATUS_LB; + } else if (!strcmp(ptr, "CAL")) { + config->status |= UPSSTATUS_CAL; + } else if (!strcmp(ptr, "RB")) { + config->status |= UPSSTATUS_RB; + } else if (!strcmp(ptr, "BYPASS")) { + config->status |= UPSSTATUS_BYPASS; + } else if (!strcmp(ptr, "OVER")) { + config->status |= UPSSTATUS_OVER; + } else if (!strcmp(ptr, "TRIM")) { + config->status |= UPSSTATUS_TRIM; + } else if (!strcmp(ptr, "BOOST")) { + config->status |= UPSSTATUS_BOOST; + } else if (!strcmp(ptr, "CHRG")) { + config->status |= UPSSTATUS_CHRG; + } else if (!strcmp(ptr, "DISCHRG")) { + config->status |= UPSSTATUS_DISCHRG; + } else if (!strcmp(ptr, "ALARM")) { + config->status |= UPSSTATUS_ALARM; + } else { + config->status |= UPSSTATUS_UNKNOWN; + } } return OK; } - /* gets a variable value for a specific UPS */ -int -get_ups_variable (const char *varname, char *buf) -{ - /* char command[MAX_INPUT_BUFFER]; */ - char temp_buffer[MAX_INPUT_BUFFER]; +int get_ups_variable(const char *varname, char *buf, const ups_config config) { char send_buffer[MAX_INPUT_BUFFER]; - char *ptr; - char *logout = "OK Goodbye\n"; - int logout_len = strlen(logout); - int len; - - *buf=0; /* create the command string to send to the UPS daemon */ /* Add LOGOUT to avoid read failure logs */ - int res = snprintf (send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", ups_name, varname); - if ( (res > 0) && ((size_t)res >= sizeof(send_buffer))) { + int res = snprintf(send_buffer, sizeof(send_buffer), + "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname); + if ((res > 0) && ((size_t)res >= sizeof(send_buffer))) { printf("%s\n", _("UPS name to long for buffer")); return ERROR; } + char temp_buffer[MAX_INPUT_BUFFER]; + /* send the command to the daemon and get a response back */ - if (process_tcp_request - (server_address, server_port, send_buffer, temp_buffer, - sizeof (temp_buffer)) != STATE_OK) { - printf ("%s\n", _("Invalid response received from host")); + if (process_tcp_request(config.server_address, config.server_port, + send_buffer, temp_buffer, + sizeof(temp_buffer)) != STATE_OK) { + printf("%s\n", _("Invalid response received from host")); return ERROR; } - ptr = temp_buffer; - len = strlen(ptr); - if (len > logout_len && strcmp (ptr + len - logout_len, logout) == 0) len -= logout_len; - if (len > 0 && ptr[len-1] == '\n') ptr[len-1]=0; - if (strcmp (ptr, "ERR UNKNOWN-UPS") == 0) { - printf (_("CRITICAL - no such UPS '%s' on that host\n"), ups_name); + char *ptr = temp_buffer; + int len = strlen(ptr); + const char *logout = "OK Goodbye\n"; + const int logout_len = strlen(logout); + + if (len > logout_len && strcmp(ptr + len - logout_len, logout) == 0) { + len -= logout_len; + } + if (len > 0 && ptr[len - 1] == '\n') { + ptr[len - 1] = 0; + } + if (strcmp(ptr, "ERR UNKNOWN-UPS") == 0) { + printf(_("CRITICAL - no such UPS '%s' on that host\n"), + config.ups_name); return ERROR; } - if (strcmp (ptr, "ERR VAR-NOT-SUPPORTED") == 0) { + if (strcmp(ptr, "ERR VAR-NOT-SUPPORTED") == 0) { /*printf ("Error: Variable '%s' is not supported\n", varname);*/ return NOSUCHVAR; } - if (strcmp (ptr, "ERR DATA-STALE") == 0) { - printf ("%s\n", _("CRITICAL - UPS data is stale")); + if (strcmp(ptr, "ERR DATA-STALE") == 0) { + printf("%s\n", _("CRITICAL - UPS data is stale")); return ERROR; } - if (strncmp (ptr, "ERR", 3) == 0) { - printf (_("Unknown error: %s\n"), ptr); + if (strncmp(ptr, "ERR", 3) == 0) { + printf(_("Unknown error: %s\n"), ptr); return ERROR; } - ptr = temp_buffer + strlen (varname) + strlen (ups_name) + 6; + ptr = temp_buffer + strlen(varname) + strlen(config.ups_name) + 6; len = strlen(ptr); - if (len < 2 || ptr[0] != '"' || ptr[len-1] != '"') { - printf ("%s\n", _("Error: unable to parse variable")); + if (len < 2 || ptr[0] != '"' || ptr[len - 1] != '"') { + printf("%s\n", _("Error: unable to parse variable")); return ERROR; } - strncpy (buf, ptr+1, len - 2); + + *buf = 0; + strncpy(buf, ptr + 1, len - 2); buf[len - 2] = 0; return OK; } - /* Command line: CHECK_UPS -H -u ups [-p port] [-v variable] [-wv warn_value] [-cv crit_value] [-to to_sec] */ - /* process command-line arguments */ -int -process_arguments (int argc, char **argv) -{ - int c; - - int option = 0; - static struct option longopts[] = { - {"hostname", required_argument, 0, 'H'}, - {"ups", required_argument, 0, 'u'}, - {"port", required_argument, 0, 'p'}, - {"critical", required_argument, 0, 'c'}, - {"warning", required_argument, 0, 'w'}, - {"timeout", required_argument, 0, 't'}, - {"temperature", no_argument, 0, 'T'}, - {"variable", required_argument, 0, 'v'}, - {"version", no_argument, 0, 'V'}, - {"help", no_argument, 0, 'h'}, - {0, 0, 0, 0} - }; - - if (argc < 2) +int process_arguments(int argc, char **argv, ups_config *config) { + + static struct option longopts[] = {{"hostname", required_argument, 0, 'H'}, + {"ups", required_argument, 0, 'u'}, + {"port", required_argument, 0, 'p'}, + {"critical", required_argument, 0, 'c'}, + {"warning", required_argument, 0, 'w'}, + {"timeout", required_argument, 0, 't'}, + {"temperature", no_argument, 0, 'T'}, + {"variable", required_argument, 0, 'v'}, + {"version", no_argument, 0, 'V'}, + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0}}; + + if (argc < 2) { return ERROR; + } + int c; for (c = 1; c < argc; c++) { - if (strcmp ("-to", argv[c]) == 0) - strcpy (argv[c], "-t"); - else if (strcmp ("-wt", argv[c]) == 0) - strcpy (argv[c], "-w"); - else if (strcmp ("-ct", argv[c]) == 0) - strcpy (argv[c], "-c"); + if (strcmp("-to", argv[c]) == 0) { + strcpy(argv[c], "-t"); + } else if (strcmp("-wt", argv[c]) == 0) { + strcpy(argv[c], "-w"); + } else if (strcmp("-ct", argv[c]) == 0) { + strcpy(argv[c], "-c"); + } } + int option = 0; while (1) { - c = getopt_long (argc, argv, "hVTH:u:p:v:c:w:t:", longopts, - &option); + c = getopt_long(argc, argv, "hVTH:u:p:v:c:w:t:", longopts, &option); - if (c == -1 || c == EOF) + if (c == -1 || c == EOF) { break; + } switch (c) { - case '?': /* help */ - usage5 (); - case 'H': /* hostname */ - if (is_host (optarg)) { - server_address = optarg; - } - else { - usage2 (_("Invalid hostname/address"), optarg); + case '?': /* help */ + usage5(); + case 'H': /* hostname */ + if (is_host(optarg)) { + config->server_address = optarg; + } else { + usage2(_("Invalid hostname/address"), optarg); } break; - case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Fahrenheit) */ - temp_output_c = true; + case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for + Fahrenheit) */ + config->temp_output_c = true; break; - case 'u': /* ups name */ - ups_name = optarg; + case 'u': /* ups name */ + config->ups_name = optarg; break; - case 'p': /* port */ - if (is_intpos (optarg)) { - server_port = atoi (optarg); - } - else { - usage2 (_("Port must be a positive integer"), optarg); + case 'p': /* port */ + if (is_intpos(optarg)) { + config->server_port = atoi(optarg); + } else { + usage2(_("Port must be a positive integer"), optarg); } break; - case 'c': /* critical time threshold */ - if (is_intnonneg (optarg)) { - critical_value = atoi (optarg); - check_crit = true; - } - else { - usage2 (_("Critical time must be a positive integer"), optarg); + case 'c': /* critical time threshold */ + if (is_intnonneg(optarg)) { + config->critical_value = atoi(optarg); + config->check_crit = true; + } else { + usage2(_("Critical time must be a positive integer"), optarg); } break; - case 'w': /* warning time threshold */ - if (is_intnonneg (optarg)) { - warning_value = atoi (optarg); - check_warn = true; - } - else { - usage2 (_("Warning time must be a positive integer"), optarg); + case 'w': /* warning time threshold */ + if (is_intnonneg(optarg)) { + config->warning_value = atoi(optarg); + config->check_warn = true; + } else { + usage2(_("Warning time must be a positive integer"), optarg); } break; - case 'v': /* variable */ - if (!strcmp (optarg, "LINE")) - check_variable = UPS_UTILITY; - else if (!strcmp (optarg, "TEMP")) - check_variable = UPS_TEMP; - else if (!strcmp (optarg, "BATTPCT")) - check_variable = UPS_BATTPCT; - else if (!strcmp (optarg, "LOADPCT")) - check_variable = UPS_LOADPCT; - else if (!strcmp (optarg, "REALPOWER")) - check_variable = UPS_REALPOWER; - else - usage2 (_("Unrecognized UPS variable"), optarg); - break; - case 't': /* timeout */ - if (is_intnonneg (optarg)) { - socket_timeout = atoi (optarg); + case 'v': /* variable */ + if (!strcmp(optarg, "LINE")) { + config->check_variable = UPS_UTILITY; + } else if (!strcmp(optarg, "TEMP")) { + config->check_variable = UPS_TEMP; + } else if (!strcmp(optarg, "BATTPCT")) { + config->check_variable = UPS_BATTPCT; + } else if (!strcmp(optarg, "LOADPCT")) { + config->check_variable = UPS_LOADPCT; + } else if (!strcmp(optarg, "REALPOWER")) { + config->check_variable = UPS_REALPOWER; + } else { + usage2(_("Unrecognized UPS variable"), optarg); } - else { - usage4 (_("Timeout interval must be a positive integer")); + break; + case 't': /* timeout */ + if (is_intnonneg(optarg)) { + socket_timeout = atoi(optarg); + } else { + usage4(_("Timeout interval must be a positive integer")); } break; - case 'V': /* version */ - print_revision (progname, NP_VERSION); - exit (STATE_UNKNOWN); - case 'h': /* help */ - print_help (); - exit (STATE_UNKNOWN); + case 'V': /* version */ + print_revision(progname, NP_VERSION); + exit(STATE_UNKNOWN); + case 'h': /* help */ + print_help(); + exit(STATE_UNKNOWN); } } - - if (server_address == NULL && argc > optind) { - if (is_host (argv[optind])) - server_address = argv[optind++]; - else - usage2 (_("Invalid hostname/address"), optarg); + if (config->server_address == NULL && argc > optind) { + if (is_host(argv[optind])) { + config->server_address = argv[optind++]; + } else { + usage2(_("Invalid hostname/address"), optarg); + } } - if (server_address == NULL) - server_address = strdup("127.0.0.1"); + if (config->server_address == NULL) { + config->server_address = strdup("127.0.0.1"); + } - return validate_arguments(); + return validate_arguments(*config); } - -int -validate_arguments (void) -{ - if (! ups_name) { - printf ("%s\n", _("Error : no UPS indicated")); +int validate_arguments(ups_config config) { + if (!config.ups_name) { + printf("%s\n", _("Error : no UPS indicated")); return ERROR; } return OK; } +void print_help(void) { + print_revision(progname, NP_VERSION); -void -print_help (void) -{ - char *myport; - xasprintf (&myport, "%d", PORT); - - print_revision (progname, NP_VERSION); - - printf ("Copyright (c) 2000 Tom Shields\n"); - printf ("Copyright (c) 2004 Alain Richard \n"); - printf ("Copyright (c) 2004 Arnaud Quette \n"); - printf (COPYRIGHT, copyright, email); - - printf ("%s\n", _("This plugin tests the UPS service on the specified host. Network UPS Tools")); - printf ("%s\n", _("from www.networkupstools.org must be running for this plugin to work.")); - - printf ("\n\n"); - - print_usage (); + printf("Copyright (c) 2000 Tom Shields\n"); + printf("Copyright (c) 2004 Alain Richard \n"); + printf("Copyright (c) 2004 Arnaud Quette \n"); + printf(COPYRIGHT, copyright, email); - printf (UT_HELP_VRSN); - printf (UT_EXTRA_OPTS); + printf("%s\n", _("This plugin tests the UPS service on the specified host. " + "Network UPS Tools")); + printf("%s\n", _("from www.networkupstools.org must be running for this " + "plugin to work.")); - printf (UT_HOST_PORT, 'p', myport); + printf("\n\n"); - printf (" %s\n", "-u, --ups=STRING"); - printf (" %s\n", _("Name of UPS")); - printf (" %s\n", "-T, --temperature"); - printf (" %s\n", _("Output of temperatures in Celsius")); - printf (" %s\n", "-v, --variable=STRING"); - printf (" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER"); + print_usage(); - printf (UT_WARN_CRIT); + printf(UT_HELP_VRSN); + printf(UT_EXTRA_OPTS); - printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); - -/* TODO: -v clashing with -v/-variable. Commenting out help text since verbose - is unused up to now */ -/* printf (UT_VERBOSE); */ - - printf ("\n"); - printf ("%s\n", _("This plugin attempts to determine the status of a UPS (Uninterruptible Power")); - printf ("%s\n", _("Supply) on a local or remote host. If the UPS is online or calibrating, the")); - printf ("%s\n", _("plugin will return an OK state. If the battery is on it will return a WARNING")); - printf ("%s\n", _("state. If the UPS is off or has a low battery the plugin will return a CRITICAL")); - printf ("%s\n", _("state.")); - - printf ("\n"); - printf ("%s\n", _("Notes:")); - printf (" %s\n", _("You may also specify a variable to check (such as temperature, utility voltage,")); - printf (" %s\n", _("battery load, etc.) as well as warning and critical thresholds for the value")); - printf (" %s\n", _("of that variable. If the remote host has multiple UPS that are being monitored")); - printf (" %s\n", _("you will have to use the --ups option to specify which UPS to check.")); - printf ("\n"); - printf (" %s\n", _("This plugin requires that the UPSD daemon distributed with Russell Kroll's")); - printf (" %s\n", _("Network UPS Tools be installed on the remote host. If you do not have the")); - printf (" %s\n", _("package installed on your system, you can download it from")); - printf (" %s\n", _("http://www.networkupstools.org")); - - printf (UT_SUPPORT); + char *myport; + xasprintf(&myport, "%d", PORT); + printf(UT_HOST_PORT, 'p', myport); + + printf(" %s\n", "-u, --ups=STRING"); + printf(" %s\n", _("Name of UPS")); + printf(" %s\n", "-T, --temperature"); + printf(" %s\n", _("Output of temperatures in Celsius")); + printf(" %s\n", "-v, --variable=STRING"); + printf(" %s %s\n", _("Valid values for STRING are"), + "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER"); + + printf(UT_WARN_CRIT); + + printf(UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT); + + /* TODO: -v clashing with -v/-variable. Commenting out help text since + verbose is unused up to now */ + /* printf (UT_VERBOSE); */ + + printf("\n"); + printf("%s\n", _("This plugin attempts to determine the status of a UPS " + "(Uninterruptible Power")); + printf("%s\n", _("Supply) on a local or remote host. If the UPS is online " + "or calibrating, the")); + printf("%s\n", _("plugin will return an OK state. If the battery is on it " + "will return a WARNING")); + printf("%s\n", _("state. If the UPS is off or has a low battery the plugin " + "will return a CRITICAL")); + printf("%s\n", _("state.")); + + printf("\n"); + printf("%s\n", _("Notes:")); + printf(" %s\n", _("You may also specify a variable to check (such as " + "temperature, utility voltage,")); + printf(" %s\n", _("battery load, etc.) as well as warning and critical " + "thresholds for the value")); + printf(" %s\n", _("of that variable. If the remote host has multiple UPS " + "that are being monitored")); + printf(" %s\n", _("you will have to use the --ups option to specify which " + "UPS to check.")); + printf("\n"); + printf(" %s\n", _("This plugin requires that the UPSD daemon distributed " + "with Russell Kroll's")); + printf(" %s\n", _("Network UPS Tools be installed on the remote host. If " + "you do not have the")); + printf(" %s\n", + _("package installed on your system, you can download it from")); + printf(" %s\n", _("http://www.networkupstools.org")); + + printf(UT_SUPPORT); } - -void -print_usage (void) -{ - printf ("%s\n", _("Usage:")); - printf ("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c crit_value] [-to to_sec] [-T]\n", progname); +void print_usage(void) { + printf("%s\n", _("Usage:")); + printf("%s -H host -u ups [-p port] [-v variable] [-w warn_value] [-c " + "crit_value] [-to to_sec] [-T]\n", + progname); } -- cgit v1.2.3-74-g34f1 From b95e3d7446f33784f0647dc5d60a4b2d0a750a8a Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:25:19 +0200 Subject: check_ups: clang-format --- plugins/check_ups.c | 102 ++++++++++++++++------------------------------------ 1 file changed, 31 insertions(+), 71 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 380ff3bc..1d313298 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -141,7 +141,6 @@ int main(int argc, char **argv) { return STATE_CRITICAL; } - if (supported_options & UPS_STATUS) { ups_status = strdup(""); @@ -151,8 +150,7 @@ int main(int argc, char **argv) { if (config.status & UPSSTATUS_OFF) { xasprintf(&ups_status, "Off"); result = STATE_CRITICAL; - } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) == - (UPSSTATUS_OB | UPSSTATUS_LB)) { + } else if ((config.status & (UPSSTATUS_OB | UPSSTATUS_LB)) == (UPSSTATUS_OB | UPSSTATUS_LB)) { xasprintf(&ups_status, _("On Battery, Low Battery")); result = STATE_CRITICAL; } else { @@ -171,8 +169,7 @@ int main(int argc, char **argv) { xasprintf(&ups_status, "%s%s", ups_status, _(", Calibrating")); } if (config.status & UPSSTATUS_RB) { - xasprintf(&ups_status, "%s%s", ups_status, - _(", Replace Battery")); + xasprintf(&ups_status, "%s%s", ups_status, _(", Replace Battery")); result = max_state(result, STATE_WARNING); } if (config.status & UPSSTATUS_BYPASS) { @@ -233,24 +230,16 @@ int main(int argc, char **argv) { } if (config.check_variable == UPS_UTILITY) { - if (config.check_crit && - ups_utility_deviation >= config.critical_value) { + if (config.check_crit && ups_utility_deviation >= config.critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_utility_deviation >= config.warning_value) { + } else if (config.check_warn && ups_utility_deviation >= config.warning_value) { result = max_state(result, STATE_WARNING); } xasprintf(&data, "%s", - perfdata("voltage", (long)(1000 * ups_utility_voltage), - "mV", config.check_warn, - (long)(1000 * config.warning_value), - config.check_crit, - (long)(1000 * config.critical_value), true, 0, - false, 0)); + perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", config.check_warn, (long)(1000 * config.warning_value), config.check_crit, + (long)(1000 * config.critical_value), true, 0, false, 0)); } else { - xasprintf(&data, "%s", - perfdata("voltage", (long)(1000 * ups_utility_voltage), - "mV", false, 0, false, 0, true, 0, false, 0)); + xasprintf(&data, "%s", perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", false, 0, false, 0, true, 0, false, 0)); } } @@ -268,22 +257,16 @@ int main(int argc, char **argv) { xasprintf(&message, "%sBatt=%3.1f%% ", message, ups_battery_percent); if (config.check_variable == UPS_BATTPCT) { - if (config.check_crit && - ups_battery_percent <= config.critical_value) { + if (config.check_crit && ups_battery_percent <= config.critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_battery_percent <= config.warning_value) { + } else if (config.check_warn && ups_battery_percent <= config.warning_value) { result = max_state(result, STATE_WARNING); } xasprintf(&data, "%s %s", data, - perfdata("battery", (long)ups_battery_percent, "%", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, true, 100)); + perfdata("battery", (long)ups_battery_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, + 0, true, 100)); } else { - xasprintf(&data, "%s %s", data, - perfdata("battery", (long)ups_battery_percent, "%", false, - 0, false, 0, true, 0, true, 100)); + xasprintf(&data, "%s %s", data, perfdata("battery", (long)ups_battery_percent, "%", false, 0, false, 0, true, 0, true, 100)); } } @@ -301,22 +284,16 @@ int main(int argc, char **argv) { xasprintf(&message, "%sLoad=%3.1f%% ", message, ups_load_percent); if (config.check_variable == UPS_LOADPCT) { - if (config.check_crit && - ups_load_percent >= config.critical_value) { + if (config.check_crit && ups_load_percent >= config.critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_load_percent >= config.warning_value) { + } else if (config.check_warn && ups_load_percent >= config.warning_value) { result = max_state(result, STATE_WARNING); } xasprintf(&data, "%s %s", data, - perfdata("load", (long)ups_load_percent, "%", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, true, 100)); + perfdata("load", (long)ups_load_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, + true, 100)); } else { - xasprintf(&data, "%s %s", data, - perfdata("load", (long)ups_load_percent, "%", false, 0, - false, 0, true, 0, true, 100)); + xasprintf(&data, "%s %s", data, perfdata("load", (long)ups_load_percent, "%", false, 0, false, 0, true, 0, true, 100)); } } @@ -345,19 +322,14 @@ int main(int argc, char **argv) { if (config.check_variable == UPS_TEMP) { if (config.check_crit && ups_temperature >= config.critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_temperature >= config.warning_value) { + } else if (config.check_warn && ups_temperature >= config.warning_value) { result = max_state(result, STATE_WARNING); } xasprintf(&data, "%s %s", data, - perfdata("temp", (long)ups_temperature, tunits, - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, false, 0)); + perfdata("temp", (long)ups_temperature, tunits, config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, + false, 0)); } else { - xasprintf(&data, "%s %s", data, - perfdata("temp", (long)ups_temperature, tunits, false, 0, - false, 0, true, 0, false, 0)); + xasprintf(&data, "%s %s", data, perfdata("temp", (long)ups_temperature, tunits, false, 0, false, 0, true, 0, false, 0)); } } @@ -376,19 +348,14 @@ int main(int argc, char **argv) { if (config.check_variable == UPS_REALPOWER) { if (config.check_crit && ups_realpower >= config.critical_value) { result = STATE_CRITICAL; - } else if (config.check_warn && - ups_realpower >= config.warning_value) { + } else if (config.check_warn && ups_realpower >= config.warning_value) { result = max_state(result, STATE_WARNING); } xasprintf(&data, "%s %s", data, - perfdata("realpower", (long)ups_realpower, "W", - config.check_warn, (long)(config.warning_value), - config.check_crit, (long)(config.critical_value), - true, 0, false, 0)); + perfdata("realpower", (long)ups_realpower, "W", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, + false, 0)); } else { - xasprintf(&data, "%s %s", data, - perfdata("realpower", (long)ups_realpower, "W", false, 0, - false, 0, true, 0, false, 0)); + xasprintf(&data, "%s %s", data, perfdata("realpower", (long)ups_realpower, "W", false, 0, false, 0, true, 0, false, 0)); } } @@ -425,8 +392,7 @@ int determine_status(ups_config *config, int *supported_options) { char temp_buffer[MAX_INPUT_BUFFER]; strcpy(temp_buffer, recv_buffer); - for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL; - ptr = (char *)strtok(NULL, " ")) { + for (char *ptr = (char *)strtok(temp_buffer, " "); ptr != NULL; ptr = (char *)strtok(NULL, " ")) { if (!strcmp(ptr, "OFF")) { config->status |= UPSSTATUS_OFF; } else if (!strcmp(ptr, "OL")) { @@ -467,8 +433,7 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) { /* create the command string to send to the UPS daemon */ /* Add LOGOUT to avoid read failure logs */ - int res = snprintf(send_buffer, sizeof(send_buffer), - "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname); + int res = snprintf(send_buffer, sizeof(send_buffer), "GET VAR %s %s\nLOGOUT\n", config.ups_name, varname); if ((res > 0) && ((size_t)res >= sizeof(send_buffer))) { printf("%s\n", _("UPS name to long for buffer")); return ERROR; @@ -477,9 +442,7 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) { char temp_buffer[MAX_INPUT_BUFFER]; /* send the command to the daemon and get a response back */ - if (process_tcp_request(config.server_address, config.server_port, - send_buffer, temp_buffer, - sizeof(temp_buffer)) != STATE_OK) { + if (process_tcp_request(config.server_address, config.server_port, send_buffer, temp_buffer, sizeof(temp_buffer)) != STATE_OK) { printf("%s\n", _("Invalid response received from host")); return ERROR; } @@ -496,8 +459,7 @@ int get_ups_variable(const char *varname, char *buf, const ups_config config) { ptr[len - 1] = 0; } if (strcmp(ptr, "ERR UNKNOWN-UPS") == 0) { - printf(_("CRITICAL - no such UPS '%s' on that host\n"), - config.ups_name); + printf(_("CRITICAL - no such UPS '%s' on that host\n"), config.ups_name); return ERROR; } @@ -694,8 +656,7 @@ void print_help(void) { printf(" %s\n", "-T, --temperature"); printf(" %s\n", _("Output of temperatures in Celsius")); printf(" %s\n", "-v, --variable=STRING"); - printf(" %s %s\n", _("Valid values for STRING are"), - "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER"); + printf(" %s %s\n", _("Valid values for STRING are"), "LINE, TEMP, BATTPCT, LOADPCT or REALPOWER"); printf(UT_WARN_CRIT); @@ -731,8 +692,7 @@ void print_help(void) { "with Russell Kroll's")); printf(" %s\n", _("Network UPS Tools be installed on the remote host. If " "you do not have the")); - printf(" %s\n", - _("package installed on your system, you can download it from")); + printf(" %s\n", _("package installed on your system, you can download it from")); printf(" %s\n", _("http://www.networkupstools.org")); printf(UT_SUPPORT); -- cgit v1.2.3-74-g34f1 From 3f7c533ce87c764ff5278e18cec84b06e221b1c5 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Tue, 15 Oct 2024 16:26:21 +0200 Subject: check_ups: Update copyright --- plugins/check_ups.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 1d313298..e5badc83 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -6,7 +6,7 @@ * Copyright (c) 2000 Tom Shields * 2004 Alain Richard * 2004 Arnaud Quette - * Copyright (c) 2002-2023 Monitoring Plugins Development Team + * Copyright (c) 2002-2024 Monitoring Plugins Development Team * * Description: * @@ -33,7 +33,7 @@ *****************************************************************************/ const char *progname = "check_ups"; -const char *copyright = "2000-2023"; +const char *copyright = "2000-2024"; const char *email = "devel@monitoring-plugins.org"; #include "common.h" -- cgit v1.2.3-74-g34f1 From 4541b2b3571fd7806313187aa852bfe7c2ad5235 Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:21:22 +0200 Subject: check_ups: clang-format again --- plugins/check_ups.c | 144 ++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 105 insertions(+), 39 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index e5badc83..c2451ab3 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -235,9 +235,19 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_utility_deviation >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s", - perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", config.check_warn, (long)(1000 * config.warning_value), config.check_crit, - (long)(1000 * config.critical_value), true, 0, false, 0)); + xasprintf(&data, + "%s", + perfdata("voltage", + (long)(1000 * ups_utility_voltage), + "mV", + config.check_warn, + (long)(1000 * config.warning_value), + config.check_crit, + (long)(1000 * config.critical_value), + true, + 0, + false, + 0)); } else { xasprintf(&data, "%s", perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", false, 0, false, 0, true, 0, false, 0)); } @@ -262,9 +272,20 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_battery_percent <= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("battery", (long)ups_battery_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, - 0, true, 100)); + xasprintf(&data, + "%s %s", + data, + perfdata("battery", + (long)ups_battery_percent, + "%", + config.check_warn, + (long)(config.warning_value), + config.check_crit, + (long)(config.critical_value), + true, + 0, + true, + 100)); } else { xasprintf(&data, "%s %s", data, perfdata("battery", (long)ups_battery_percent, "%", false, 0, false, 0, true, 0, true, 100)); } @@ -289,9 +310,20 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_load_percent >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("load", (long)ups_load_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, - true, 100)); + xasprintf(&data, + "%s %s", + data, + perfdata("load", + (long)ups_load_percent, + "%", + config.check_warn, + (long)(config.warning_value), + config.check_crit, + (long)(config.critical_value), + true, + 0, + true, + 100)); } else { xasprintf(&data, "%s %s", data, perfdata("load", (long)ups_load_percent, "%", false, 0, false, 0, true, 0, true, 100)); } @@ -325,9 +357,20 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_temperature >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("temp", (long)ups_temperature, tunits, config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, - false, 0)); + xasprintf(&data, + "%s %s", + data, + perfdata("temp", + (long)ups_temperature, + tunits, + config.check_warn, + (long)(config.warning_value), + config.check_crit, + (long)(config.critical_value), + true, + 0, + false, + 0)); } else { xasprintf(&data, "%s %s", data, perfdata("temp", (long)ups_temperature, tunits, false, 0, false, 0, true, 0, false, 0)); } @@ -351,9 +394,20 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_realpower >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, "%s %s", data, - perfdata("realpower", (long)ups_realpower, "W", config.check_warn, (long)(config.warning_value), config.check_crit, (long)(config.critical_value), true, 0, - false, 0)); + xasprintf(&data, + "%s %s", + data, + perfdata("realpower", + (long)ups_realpower, + "W", + config.check_warn, + (long)(config.warning_value), + config.check_crit, + (long)(config.critical_value), + true, + 0, + false, + 0)); } else { xasprintf(&data, "%s %s", data, perfdata("realpower", (long)ups_realpower, "W", false, 0, false, 0, true, 0, false, 0)); } @@ -635,10 +689,12 @@ void print_help(void) { printf("Copyright (c) 2004 Arnaud Quette \n"); printf(COPYRIGHT, copyright, email); - printf("%s\n", _("This plugin tests the UPS service on the specified host. " - "Network UPS Tools")); - printf("%s\n", _("from www.networkupstools.org must be running for this " - "plugin to work.")); + printf("%s\n", + _("This plugin tests the UPS service on the specified host. " + "Network UPS Tools")); + printf("%s\n", + _("from www.networkupstools.org must be running for this " + "plugin to work.")); printf("\n\n"); @@ -667,31 +723,41 @@ void print_help(void) { /* printf (UT_VERBOSE); */ printf("\n"); - printf("%s\n", _("This plugin attempts to determine the status of a UPS " - "(Uninterruptible Power")); - printf("%s\n", _("Supply) on a local or remote host. If the UPS is online " - "or calibrating, the")); - printf("%s\n", _("plugin will return an OK state. If the battery is on it " - "will return a WARNING")); - printf("%s\n", _("state. If the UPS is off or has a low battery the plugin " - "will return a CRITICAL")); + printf("%s\n", + _("This plugin attempts to determine the status of a UPS " + "(Uninterruptible Power")); + printf("%s\n", + _("Supply) on a local or remote host. If the UPS is online " + "or calibrating, the")); + printf("%s\n", + _("plugin will return an OK state. If the battery is on it " + "will return a WARNING")); + printf("%s\n", + _("state. If the UPS is off or has a low battery the plugin " + "will return a CRITICAL")); printf("%s\n", _("state.")); printf("\n"); printf("%s\n", _("Notes:")); - printf(" %s\n", _("You may also specify a variable to check (such as " - "temperature, utility voltage,")); - printf(" %s\n", _("battery load, etc.) as well as warning and critical " - "thresholds for the value")); - printf(" %s\n", _("of that variable. If the remote host has multiple UPS " - "that are being monitored")); - printf(" %s\n", _("you will have to use the --ups option to specify which " - "UPS to check.")); + printf(" %s\n", + _("You may also specify a variable to check (such as " + "temperature, utility voltage,")); + printf(" %s\n", + _("battery load, etc.) as well as warning and critical " + "thresholds for the value")); + printf(" %s\n", + _("of that variable. If the remote host has multiple UPS " + "that are being monitored")); + printf(" %s\n", + _("you will have to use the --ups option to specify which " + "UPS to check.")); printf("\n"); - printf(" %s\n", _("This plugin requires that the UPSD daemon distributed " - "with Russell Kroll's")); - printf(" %s\n", _("Network UPS Tools be installed on the remote host. If " - "you do not have the")); + printf(" %s\n", + _("This plugin requires that the UPSD daemon distributed " + "with Russell Kroll's")); + printf(" %s\n", + _("Network UPS Tools be installed on the remote host. If " + "you do not have the")); printf(" %s\n", _("package installed on your system, you can download it from")); printf(" %s\n", _("http://www.networkupstools.org")); -- cgit v1.2.3-74-g34f1 From 05ad606c09325ae9ae7d4607a55236245dcad47a Mon Sep 17 00:00:00 2001 From: RincewindsHat <12514511+RincewindsHat@users.noreply.github.com> Date: Fri, 25 Oct 2024 11:45:58 +0200 Subject: check_ups: clang-format again --- plugins/check_ups.c | 144 ++++++++++++++-------------------------------------- 1 file changed, 39 insertions(+), 105 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index c2451ab3..f60c0e9e 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -235,19 +235,9 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_utility_deviation >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, - "%s", - perfdata("voltage", - (long)(1000 * ups_utility_voltage), - "mV", - config.check_warn, - (long)(1000 * config.warning_value), - config.check_crit, - (long)(1000 * config.critical_value), - true, - 0, - false, - 0)); + xasprintf(&data, "%s", + perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", config.check_warn, (long)(1000 * config.warning_value), + config.check_crit, (long)(1000 * config.critical_value), true, 0, false, 0)); } else { xasprintf(&data, "%s", perfdata("voltage", (long)(1000 * ups_utility_voltage), "mV", false, 0, false, 0, true, 0, false, 0)); } @@ -272,20 +262,9 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_battery_percent <= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, - "%s %s", - data, - perfdata("battery", - (long)ups_battery_percent, - "%", - config.check_warn, - (long)(config.warning_value), - config.check_crit, - (long)(config.critical_value), - true, - 0, - true, - 100)); + xasprintf(&data, "%s %s", data, + perfdata("battery", (long)ups_battery_percent, "%", config.check_warn, (long)(config.warning_value), + config.check_crit, (long)(config.critical_value), true, 0, true, 100)); } else { xasprintf(&data, "%s %s", data, perfdata("battery", (long)ups_battery_percent, "%", false, 0, false, 0, true, 0, true, 100)); } @@ -310,20 +289,9 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_load_percent >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, - "%s %s", - data, - perfdata("load", - (long)ups_load_percent, - "%", - config.check_warn, - (long)(config.warning_value), - config.check_crit, - (long)(config.critical_value), - true, - 0, - true, - 100)); + xasprintf(&data, "%s %s", data, + perfdata("load", (long)ups_load_percent, "%", config.check_warn, (long)(config.warning_value), config.check_crit, + (long)(config.critical_value), true, 0, true, 100)); } else { xasprintf(&data, "%s %s", data, perfdata("load", (long)ups_load_percent, "%", false, 0, false, 0, true, 0, true, 100)); } @@ -357,20 +325,9 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_temperature >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, - "%s %s", - data, - perfdata("temp", - (long)ups_temperature, - tunits, - config.check_warn, - (long)(config.warning_value), - config.check_crit, - (long)(config.critical_value), - true, - 0, - false, - 0)); + xasprintf(&data, "%s %s", data, + perfdata("temp", (long)ups_temperature, tunits, config.check_warn, (long)(config.warning_value), config.check_crit, + (long)(config.critical_value), true, 0, false, 0)); } else { xasprintf(&data, "%s %s", data, perfdata("temp", (long)ups_temperature, tunits, false, 0, false, 0, true, 0, false, 0)); } @@ -394,20 +351,9 @@ int main(int argc, char **argv) { } else if (config.check_warn && ups_realpower >= config.warning_value) { result = max_state(result, STATE_WARNING); } - xasprintf(&data, - "%s %s", - data, - perfdata("realpower", - (long)ups_realpower, - "W", - config.check_warn, - (long)(config.warning_value), - config.check_crit, - (long)(config.critical_value), - true, - 0, - false, - 0)); + xasprintf(&data, "%s %s", data, + perfdata("realpower", (long)ups_realpower, "W", config.check_warn, (long)(config.warning_value), config.check_crit, + (long)(config.critical_value), true, 0, false, 0)); } else { xasprintf(&data, "%s %s", data, perfdata("realpower", (long)ups_realpower, "W", false, 0, false, 0, true, 0, false, 0)); } @@ -689,12 +635,10 @@ void print_help(void) { printf("Copyright (c) 2004 Arnaud Quette \n"); printf(COPYRIGHT, copyright, email); - printf("%s\n", - _("This plugin tests the UPS service on the specified host. " - "Network UPS Tools")); - printf("%s\n", - _("from www.networkupstools.org must be running for this " - "plugin to work.")); + printf("%s\n", _("This plugin tests the UPS service on the specified host. " + "Network UPS Tools")); + printf("%s\n", _("from www.networkupstools.org must be running for this " + "plugin to work.")); printf("\n\n"); @@ -723,41 +667,31 @@ void print_help(void) { /* printf (UT_VERBOSE); */ printf("\n"); - printf("%s\n", - _("This plugin attempts to determine the status of a UPS " - "(Uninterruptible Power")); - printf("%s\n", - _("Supply) on a local or remote host. If the UPS is online " - "or calibrating, the")); - printf("%s\n", - _("plugin will return an OK state. If the battery is on it " - "will return a WARNING")); - printf("%s\n", - _("state. If the UPS is off or has a low battery the plugin " - "will return a CRITICAL")); + printf("%s\n", _("This plugin attempts to determine the status of a UPS " + "(Uninterruptible Power")); + printf("%s\n", _("Supply) on a local or remote host. If the UPS is online " + "or calibrating, the")); + printf("%s\n", _("plugin will return an OK state. If the battery is on it " + "will return a WARNING")); + printf("%s\n", _("state. If the UPS is off or has a low battery the plugin " + "will return a CRITICAL")); printf("%s\n", _("state.")); printf("\n"); printf("%s\n", _("Notes:")); - printf(" %s\n", - _("You may also specify a variable to check (such as " - "temperature, utility voltage,")); - printf(" %s\n", - _("battery load, etc.) as well as warning and critical " - "thresholds for the value")); - printf(" %s\n", - _("of that variable. If the remote host has multiple UPS " - "that are being monitored")); - printf(" %s\n", - _("you will have to use the --ups option to specify which " - "UPS to check.")); + printf(" %s\n", _("You may also specify a variable to check (such as " + "temperature, utility voltage,")); + printf(" %s\n", _("battery load, etc.) as well as warning and critical " + "thresholds for the value")); + printf(" %s\n", _("of that variable. If the remote host has multiple UPS " + "that are being monitored")); + printf(" %s\n", _("you will have to use the --ups option to specify which " + "UPS to check.")); printf("\n"); - printf(" %s\n", - _("This plugin requires that the UPSD daemon distributed " - "with Russell Kroll's")); - printf(" %s\n", - _("Network UPS Tools be installed on the remote host. If " - "you do not have the")); + printf(" %s\n", _("This plugin requires that the UPSD daemon distributed " + "with Russell Kroll's")); + printf(" %s\n", _("Network UPS Tools be installed on the remote host. If " + "you do not have the")); printf(" %s\n", _("package installed on your system, you can download it from")); printf(" %s\n", _("http://www.networkupstools.org")); -- cgit v1.2.3-74-g34f1 From 35723950547b06a359bac9a767d2a6f1520926b7 Mon Sep 17 00:00:00 2001 From: Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:13:43 +0100 Subject: check_ups: clang-format --- plugins/check_ups.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'plugins/check_ups.c') diff --git a/plugins/check_ups.c b/plugins/check_ups.c index f60c0e9e..adb7ab81 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c @@ -40,7 +40,9 @@ const char *email = "devel@monitoring-plugins.org"; #include "netutils.h" #include "utils.h" -enum { PORT = 3493 }; +enum { + PORT = 3493 +}; #define UPS_NONE 0 /* no supported options */ #define UPS_UTILITY 1 /* supports utility line */ @@ -66,7 +68,9 @@ enum { PORT = 3493 }; #define UPSSTATUS_UNKNOWN 4096 #define UPSSTATUS_ALARM 8192 -enum { NOSUCHVAR = ERROR - 1 }; +enum { + NOSUCHVAR = ERROR - 1 +}; typedef struct ups_config { unsigned int server_port; -- cgit v1.2.3-74-g34f1