diff options
author | Lorenz Kästle <12514511+RincewindsHat@users.noreply.github.com> | 2023-09-17 23:15:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-09-17 23:15:59 +0200 |
commit | d3e07d2b5734149c1314cb98b48dd1adebd62686 (patch) | |
tree | a924b49927ae1925a7e0893d31e0c9c6abd3228e /plugins/check_ups.c | |
parent | 495c4c9adfa482303b31cdac7d28adda82d2d2ed (diff) | |
parent | 2ddc75e69db5a3dd379c896d8420c9af20ec1cee (diff) | |
download | monitoring-plugins-d3e07d2.tar.gz |
Merge branch 'master' into dev/check_ssh-patches
Diffstat (limited to 'plugins/check_ups.c')
-rw-r--r-- | plugins/check_ups.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/plugins/check_ups.c b/plugins/check_ups.c index 0de37a20..68737c4b 100644 --- a/plugins/check_ups.c +++ b/plugins/check_ups.c | |||
@@ -89,7 +89,7 @@ char *ups_status; | |||
89 | int temp_output_c = 0; | 89 | int temp_output_c = 0; |
90 | 90 | ||
91 | int determine_status (void); | 91 | int determine_status (void); |
92 | int get_ups_variable (const char *, char *, size_t); | 92 | int get_ups_variable (const char *, char *); |
93 | 93 | ||
94 | int process_arguments (int, char **); | 94 | int process_arguments (int, char **); |
95 | int validate_arguments (void); | 95 | int validate_arguments (void); |
@@ -189,7 +189,7 @@ main (int argc, char **argv) | |||
189 | } | 189 | } |
190 | 190 | ||
191 | /* get the ups utility voltage if possible */ | 191 | /* get the ups utility voltage if possible */ |
192 | res=get_ups_variable ("input.voltage", temp_buffer, sizeof (temp_buffer)); | 192 | res=get_ups_variable ("input.voltage", temp_buffer); |
193 | if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY; | 193 | if (res == NOSUCHVAR) supported_options &= ~UPS_UTILITY; |
194 | else if (res != OK) | 194 | else if (res != OK) |
195 | return STATE_CRITICAL; | 195 | return STATE_CRITICAL; |
@@ -224,7 +224,7 @@ main (int argc, char **argv) | |||
224 | } | 224 | } |
225 | 225 | ||
226 | /* get the ups battery percent if possible */ | 226 | /* get the ups battery percent if possible */ |
227 | res=get_ups_variable ("battery.charge", temp_buffer, sizeof (temp_buffer)); | 227 | res=get_ups_variable ("battery.charge", temp_buffer); |
228 | if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT; | 228 | if (res == NOSUCHVAR) supported_options &= ~UPS_BATTPCT; |
229 | else if ( res != OK) | 229 | else if ( res != OK) |
230 | return STATE_CRITICAL; | 230 | return STATE_CRITICAL; |
@@ -253,7 +253,7 @@ main (int argc, char **argv) | |||
253 | } | 253 | } |
254 | 254 | ||
255 | /* get the ups load percent if possible */ | 255 | /* get the ups load percent if possible */ |
256 | res=get_ups_variable ("ups.load", temp_buffer, sizeof (temp_buffer)); | 256 | res=get_ups_variable ("ups.load", temp_buffer); |
257 | if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT; | 257 | if ( res == NOSUCHVAR ) supported_options &= ~UPS_LOADPCT; |
258 | else if ( res != OK) | 258 | else if ( res != OK) |
259 | return STATE_CRITICAL; | 259 | return STATE_CRITICAL; |
@@ -282,7 +282,7 @@ main (int argc, char **argv) | |||
282 | } | 282 | } |
283 | 283 | ||
284 | /* get the ups temperature if possible */ | 284 | /* get the ups temperature if possible */ |
285 | res=get_ups_variable ("ups.temperature", temp_buffer, sizeof (temp_buffer)); | 285 | res=get_ups_variable ("ups.temperature", temp_buffer); |
286 | if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP; | 286 | if ( res == NOSUCHVAR ) supported_options &= ~UPS_TEMP; |
287 | else if ( res != OK) | 287 | else if ( res != OK) |
288 | return STATE_CRITICAL; | 288 | return STATE_CRITICAL; |
@@ -342,7 +342,7 @@ determine_status (void) | |||
342 | char *ptr; | 342 | char *ptr; |
343 | int res; | 343 | int res; |
344 | 344 | ||
345 | res=get_ups_variable ("ups.status", recv_buffer, sizeof (recv_buffer)); | 345 | res=get_ups_variable ("ups.status", recv_buffer); |
346 | if (res == NOSUCHVAR) return OK; | 346 | if (res == NOSUCHVAR) return OK; |
347 | if (res != STATE_OK) { | 347 | if (res != STATE_OK) { |
348 | printf ("%s\n", _("Invalid response received from host")); | 348 | printf ("%s\n", _("Invalid response received from host")); |
@@ -388,7 +388,7 @@ determine_status (void) | |||
388 | 388 | ||
389 | /* gets a variable value for a specific UPS */ | 389 | /* gets a variable value for a specific UPS */ |
390 | int | 390 | int |
391 | get_ups_variable (const char *varname, char *buf, size_t buflen) | 391 | get_ups_variable (const char *varname, char *buf) |
392 | { | 392 | { |
393 | /* char command[MAX_INPUT_BUFFER]; */ | 393 | /* char command[MAX_INPUT_BUFFER]; */ |
394 | char temp_buffer[MAX_INPUT_BUFFER]; | 394 | char temp_buffer[MAX_INPUT_BUFFER]; |
@@ -507,7 +507,7 @@ process_arguments (int argc, char **argv) | |||
507 | usage2 (_("Invalid hostname/address"), optarg); | 507 | usage2 (_("Invalid hostname/address"), optarg); |
508 | } | 508 | } |
509 | break; | 509 | break; |
510 | case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Farenheit) */ | 510 | case 'T': /* FIXME: to be improved (ie "-T C" for Celsius or "-T F" for Fahrenheit) */ |
511 | temp_output_c = 1; | 511 | temp_output_c = 1; |
512 | break; | 512 | break; |
513 | case 'u': /* ups name */ | 513 | case 'u': /* ups name */ |