From: Thomas Guyot-Sionnest Date: Tue, 24 Mar 2009 05:50:01 +0000 (-0400) Subject: Whitespace and intend cleanup X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f2f2f35240c976ddc6e44cd6276df88aad812199;p=nagiosplug.git Whitespace and intend cleanup --- diff --git a/plugins/check_nt.c b/plugins/check_nt.c index ee5e2a6..48bdccc 100644 --- a/plugins/check_nt.c +++ b/plugins/check_nt.c @@ -160,9 +160,9 @@ int main(int argc, char **argv){ /* loop until one of the parameters is wrong or not present */ while (lvalue_list[0+offset]> (unsigned long)0 && - lvalue_list[0+offset]<=(unsigned long)17280 && + lvalue_list[0+offset]<=(unsigned long)17280 && lvalue_list[1+offset]> (unsigned long)0 && - lvalue_list[1+offset]<=(unsigned long)100 && + lvalue_list[1+offset]<=(unsigned long)100 && lvalue_list[2+offset]> (unsigned long)0 && lvalue_list[2+offset]<=(unsigned long)100) { @@ -171,7 +171,7 @@ int main(int argc, char **argv){ fetch_data (server_address, server_port, send_buffer); utilization=strtoul(recv_buffer,NULL,10); - + /* Check if any of the request is in a warning or critical state */ if(utilization >= lvalue_list[2+offset]) return_code=STATE_CRITICAL; @@ -191,7 +191,7 @@ int main(int argc, char **argv){ perfdata = temp_string_perf; } else output_message = strdup (_("not enough values for -l parameters")); - } + } break; case CHECK_UPTIME: @@ -199,7 +199,7 @@ int main(int argc, char **argv){ asprintf(&send_buffer, "%s&3", req_password); fetch_data (server_address, server_port, send_buffer); uptime=strtoul(recv_buffer,NULL,10); - updays = uptime / 86400; + updays = uptime / 86400; uphours = (uptime % 86400) / 3600; upminutes = ((uptime % 86400) % 3600) / 60; asprintf(&output_message,_("System Uptime - %u day(s) %u hour(s) %u minute(s)"),updays,uphours, upminutes); @@ -237,9 +237,9 @@ int main(int argc, char **argv){ if(check_critical_value==TRUE && percent_used_space >= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && percent_used_space >= warning_value) - return_code=STATE_WARNING; + return_code=STATE_WARNING; else - return_code=STATE_OK; + return_code=STATE_OK; output_message = strdup (temp_string); perfdata = temp_string_perf; @@ -267,7 +267,7 @@ int main(int argc, char **argv){ break; case CHECK_MEMUSE: - + asprintf(&send_buffer,"%s&7", req_password); fetch_data (server_address, server_port, send_buffer); mem_commitLimit=atof(strtok(recv_buffer,"&")); @@ -276,130 +276,129 @@ int main(int argc, char **argv){ warning_used_space = ((float)warning_value / 100) * mem_commitLimit; critical_used_space = ((float)critical_value / 100) * mem_commitLimit; - /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here, + /* Divisor should be 1048567, not 3044515, as we are measuring "Commit Charge" here, which equals RAM + Pagefiles. */ - asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"), - mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space, + asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"), + mem_commitLimit / 1048567, mem_commitByte / 1048567, percent_used_space, (mem_commitLimit - mem_commitByte) / 1048567, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100); asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 1048567, warning_used_space / 1048567, critical_used_space / 1048567, mem_commitLimit / 1048567); - + return_code=STATE_OK; if(check_critical_value==TRUE && percent_used_space >= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && percent_used_space >= warning_value) - return_code=STATE_WARNING; + return_code=STATE_WARNING; break; case CHECK_COUNTER: - /* + /* CHECK_COUNTER has been modified to provide extensive perfdata information. - In order to do this, some modifications have been done to the code - and some constraints have been introduced. - - 1) For the sake of simplicity of the code, perfdata information will only be - provided when the "description" field is added. - - 2) If the counter you're going to measure is percent-based, the code will detect - the percent sign in its name and will attribute minimum (0%) and maximum (100%) - values automagically, as well the ¨%" sign to graph units. - - 3) OTOH, if the counter is "absolute", you'll have to provide the following - the counter unit - that is, the dimensions of the counter you're getting. Examples: - pages/s, packets transferred, etc. - - 4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory, - but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise. - strange things will happen when you make graphs of your data. + In order to do this, some modifications have been done to the code + and some constraints have been introduced. + + 1) For the sake of simplicity of the code, perfdata information will only be + provided when the "description" field is added. + + 2) If the counter you're going to measure is percent-based, the code will detect + the percent sign in its name and will attribute minimum (0%) and maximum (100%) + values automagically, as well the ¨%" sign to graph units. + + 3) OTOH, if the counter is "absolute", you'll have to provide the following + the counter unit - that is, the dimensions of the counter you're getting. Examples: + pages/s, packets transferred, etc. + + 4) If you want, you may provide the minimum and maximum values to expect. They aren't mandatory, + but once specified they MUST have the same order of magnitude and units of -w and -c; otherwise. + strange things will happen when you make graphs of your data. */ - if (value_list == NULL) + if (value_list == NULL) output_message = strdup (_("No counter specified")); - else + else { - preparelist (value_list); /* replace , between services with & to send the request */ - isPercent = (strchr (value_list, '%') != NULL); - - strtok (value_list, "&"); /* burn the first parameters */ - description = strtok (NULL, "&"); - counter_unit = strtok (NULL, "&"); - asprintf (&send_buffer, "%s&8&%s", req_password, value_list); - fetch_data (server_address, server_port, send_buffer); - counter_value = atof (recv_buffer); - + preparelist (value_list); /* replace , between services with & to send the request */ + isPercent = (strchr (value_list, '%') != NULL); - if (description == NULL) - asprintf (&output_message, "%.f", counter_value); - else if (isPercent) - { - counter_unit = strdup ("%"); - allRight = TRUE; - } + strtok (value_list, "&"); /* burn the first parameters */ + description = strtok (NULL, "&"); + counter_unit = strtok (NULL, "&"); + asprintf (&send_buffer, "%s&8&%s", req_password, value_list); + fetch_data (server_address, server_port, send_buffer); + counter_value = atof (recv_buffer); + + if (description == NULL) + asprintf (&output_message, "%.f", counter_value); + else if (isPercent) + { + counter_unit = strdup ("%"); + allRight = TRUE; + } - if ((counter_unit != NULL) && (!allRight)) - { - minval = strtok (NULL, "&"); - maxval = strtok (NULL, "&"); + if ((counter_unit != NULL) && (!allRight)) + { + minval = strtok (NULL, "&"); + maxval = strtok (NULL, "&"); - /* All parameters specified. Let's check the numbers */ + /* All parameters specified. Let's check the numbers */ - fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1; - fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1; + fminval = (minval != NULL) ? strtod (minval, &errcvt) : -1; + fmaxval = (minval != NULL) ? strtod (maxval, &errcvt) : -1; - if ((fminval == 0) && (minval == errcvt)) + if ((fminval == 0) && (minval == errcvt)) output_message = strdup (_("Minimum value contains non-numbers")); - else + else { - if ((fmaxval == 0) && (maxval == errcvt)) - output_message = strdup (_("Maximum value contains non-numbers")); - else - allRight = TRUE; /* Everything is OK. */ + if ((fmaxval == 0) && (maxval == errcvt)) + output_message = strdup (_("Maximum value contains non-numbers")); + else + allRight = TRUE; /* Everything is OK. */ } - } - else if ((counter_unit == NULL) && (description != NULL)) - output_message = strdup (_("No unit counter specified")); + } + else if ((counter_unit == NULL) && (description != NULL)) + output_message = strdup (_("No unit counter specified")); - if (allRight) - { - /* Let's format the output string, finally... */ + if (allRight) + { + /* Let's format the output string, finally... */ if (strstr(description, "%") == NULL) { - asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit); + asprintf (&output_message, "%s = %.2f %s", description, counter_value, counter_unit); } else { /* has formatting, will segv if wrong */ - asprintf (&output_message, description, counter_value); + asprintf (&output_message, description, counter_value); } asprintf (&output_message, "%s |", output_message); - asprintf (&output_message,"%s %s", output_message, - fperfdata (description, counter_value, + asprintf (&output_message,"%s %s", output_message, + fperfdata (description, counter_value, counter_unit, 1, warning_value, 1, critical_value, - (!(isPercent) && (minval != NULL)), fminval, - (!(isPercent) && (minval != NULL)), fmaxval)); - } + (!(isPercent) && (minval != NULL)), fminval, + (!(isPercent) && (minval != NULL)), fmaxval)); + } } - if (critical_value > warning_value) + if (critical_value > warning_value) { /* Normal thresholds */ - if (check_critical_value == TRUE && counter_value >= critical_value) - return_code = STATE_CRITICAL; - else if (check_warning_value == TRUE && counter_value >= warning_value) - return_code = STATE_WARNING; - else - return_code = STATE_OK; + if (check_critical_value == TRUE && counter_value >= critical_value) + return_code = STATE_CRITICAL; + else if (check_warning_value == TRUE && counter_value >= warning_value) + return_code = STATE_WARNING; + else + return_code = STATE_OK; } - else + else { /* inverse thresholds */ - return_code = STATE_OK; - if (check_critical_value == TRUE && counter_value <= critical_value) - return_code = STATE_CRITICAL; - else if (check_warning_value == TRUE && counter_value <= warning_value) - return_code = STATE_WARNING; + return_code = STATE_OK; + if (check_critical_value == TRUE && counter_value <= critical_value) + return_code = STATE_CRITICAL; + else if (check_warning_value == TRUE && counter_value <= warning_value) + return_code = STATE_WARNING; } - break; - + break; + case CHECK_FILEAGE: if (value_list==NULL) @@ -411,27 +410,27 @@ int main(int argc, char **argv){ age_in_minutes = atoi(strtok(recv_buffer,"&")); description = strtok(NULL,"&"); output_message = strdup (description); - + if (critical_value > warning_value) { /* Normal thresholds */ if(check_critical_value==TRUE && age_in_minutes >= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && age_in_minutes >= warning_value) - return_code=STATE_WARNING; + return_code=STATE_WARNING; else - return_code=STATE_OK; + return_code=STATE_OK; } else { /* inverse thresholds */ if(check_critical_value==TRUE && age_in_minutes <= critical_value) return_code=STATE_CRITICAL; else if (check_warning_value==TRUE && age_in_minutes <= warning_value) - return_code=STATE_WARNING; + return_code=STATE_WARNING; else - return_code=STATE_OK; + return_code=STATE_OK; } } break; - case CHECK_INSTANCES: + case CHECK_INSTANCES: if (value_list==NULL) output_message = strdup (_("No counter specified")); else { @@ -441,7 +440,7 @@ int main(int argc, char **argv){ printf("NSClient - %s\n",recv_buffer); exit(STATE_UNKNOWN); } - asprintf(&output_message,"%s",recv_buffer); + asprintf(&output_message,"%s",recv_buffer); return_code=STATE_OK; } break; @@ -471,7 +470,7 @@ int process_arguments(int argc, char **argv){ int option = 0; static struct option longopts[] = - { + { {"port", required_argument,0,'p'}, {"timeout", required_argument,0,'t'}, {"critical", required_argument,0,'c'}, @@ -497,13 +496,13 @@ int process_arguments(int argc, char **argv){ argc--; } - for (c=1;c"); - printf (" %s\n", _("Password needed for the request")); - printf (" %s\n", "-w, --warning=INTEGER"); - printf (" %s\n", _("Threshold which will result in a warning status")); - printf (" %s\n", "-c, --critical=INTEGER"); - printf (" %s\n", _("Threshold which will result in a critical status")); - printf (" %s\n", "-t, --timeout=INTEGER"); - printf (" %s", _("Seconds before connection attempt times out (default: ")); - printf (" %s\n", "-l, --params="); - printf (" %s", _("Parameters passed to specified check (see below)")); - printf (" %s\n", "-d, --display={SHOWALL}"); - printf (" %s", _("Display options (currently only SHOWALL works)")); - printf ("%d)\n", DEFAULT_SOCKET_TIMEOUT); - printf (" %s\n", "-h, --help"); - printf (" %s\n", _("Print this help screen")); - printf (" %s\n", "-V, --version"); - printf (" %s\n", _("Print version information")); - printf (" %s\n", "-v, --variable=STRING"); - printf (" %s\n\n", _("Variable to check")); - printf ("%s\n", _("Valid variables are:")); - printf (" %s", "CLIENTVERSION ="); - printf (" %s\n", _("Get the NSClient version")); - printf (" %s\n", _("If -l is specified, will return warning if versions differ.")); - printf (" %s\n", "CPULOAD ="); - printf (" %s\n", _("Average CPU load on last x minutes.")); - printf (" %s\n", _("Request a -l parameter with the following syntax:")); - printf (" %s\n", _("-l ,,.")); - printf (" %s\n", _(" should be less than 24*60.")); - printf (" %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot.")); - printf (" %s\n", "ie: -l 60,90,95,120,90,95"); - printf (" %s\n", "UPTIME ="); - printf (" %s\n", _("Get the uptime of the machine.")); - printf (" %s\n", _("No specific parameters. No warning or critical threshold")); - printf (" %s\n", "USEDDISKSPACE ="); - printf (" %s\n", _("Size and percentage of disk use.")); - printf (" %s\n", _("Request a -l parameter containing the drive letter only.")); - printf (" %s\n", _("Warning and critical thresholds can be specified with -w and -c.")); - printf (" %s\n", "MEMUSE ="); - printf (" %s\n", _("Memory use.")); - printf (" %s\n", _("Warning and critical thresholds can be specified with -w and -c.")); - printf (" %s\n", "SERVICESTATE ="); - printf (" %s\n", _("Check the state of one or several services.")); - printf (" %s\n", _("Request a -l parameters with the following syntax:")); - printf (" %s\n", _("-l ,,,...")); - printf (" %s\n", _("You can specify -d SHOWALL in case you want to see working services")); - printf (" %s\n", _("in the returned string.")); - printf (" %s\n", "PROCSTATE ="); - printf (" %s\n", _("Check if one or several process are running.")); - printf (" %s\n", _("Same syntax as SERVICESTATE.")); - printf (" %s\n", "COUNTER ="); - printf (" %s\n", _("Check any performance counter of Windows NT/2000.")); - printf (" %s\n", _("Request a -l parameters with the following syntax:")); - printf (" %s\n", _("-l \"\\\\\\\\counter\",\"")); - printf (" %s\n", _("The parameter is optional and is given to a printf ")); - printf (" %s\n", _("output command which requires a float parameter.")); - printf (" %s\n", _("If does not include \"%%\", it is used as a label.")); - printf (" %s\n", _("Some examples:")); - printf (" %s\n", "\"Paging file usage is %%.2f %%%%\""); - printf (" %s\n", "\"%%.f %%%% paging file used.\""); - printf (" %s\n", "INSTANCES ="); - printf (" %s\n", _("Check any performance counter object of Windows NT/2000.")); - printf (" %s\n", _("Syntax: check_nt -H -p -v INSTANCES -l ")); - printf (" %s\n", _(" is a Windows Perfmon Counter object (eg. Process),")); - printf (" %s\n", _("if it is two words, it should be enclosed in quotes")); - printf (" %s\n", _("The returned results will be a comma-separated list of instances on ")); - printf (" %s\n", _(" the selected computer for that object.")); - printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); - printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); - printf (" %s\n", _(" to run Perfmon directly.")); - printf (" %s\n", _("It can also be used in scripts that automatically create Nagios service")); - printf (" %s\n", _(" configuration files.")); - printf (" %s\n", _("Some examples:")); - printf (" %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process")); - - printf ("%s\n", _("Notes:")); - printf (" %s\n", _("- The NSClient service should be running on the server to get any information")); - printf (" %s\n", "(http://nsclient.ready2run.nl)."); - printf (" %s\n", _("- Critical thresholds should be lower than warning thresholds")); - printf (" %s\n", _("- Default port 1248 is sometimes in use by other services. The error")); - printf (" %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\".")); - printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); - printf (" %s\n", _("and on the client service it\'s connecting to.")); + + printf (_(UT_HELP_VRSN)); + printf (_(UT_EXTRA_OPTS)); + + printf ("%s\n", _("Options:")); + printf (" %s\n", "-H, --hostname=HOST"); + printf (" %s\n", _("Name of the host to check")); + printf (" %s\n", "-p, --port=INTEGER"); + printf (" %s", _("Optional port number (default: ")); + printf ("%d)\n", PORT); + printf (" %s\n", "-s, --secret="); + printf (" %s\n", _("Password needed for the request")); + printf (" %s\n", "-w, --warning=INTEGER"); + printf (" %s\n", _("Threshold which will result in a warning status")); + printf (" %s\n", "-c, --critical=INTEGER"); + printf (" %s\n", _("Threshold which will result in a critical status")); + printf (" %s\n", "-t, --timeout=INTEGER"); + printf (" %s", _("Seconds before connection attempt times out (default: ")); + printf (" %s\n", "-l, --params="); + printf (" %s", _("Parameters passed to specified check (see below)")); + printf (" %s\n", "-d, --display={SHOWALL}"); + printf (" %s", _("Display options (currently only SHOWALL works)")); + printf ("%d)\n", DEFAULT_SOCKET_TIMEOUT); + printf (" %s\n", "-h, --help"); + printf (" %s\n", _("Print this help screen")); + printf (" %s\n", "-V, --version"); + printf (" %s\n", _("Print version information")); + printf (" %s\n", "-v, --variable=STRING"); + printf (" %s\n\n", _("Variable to check")); + printf ("%s\n", _("Valid variables are:")); + printf (" %s", "CLIENTVERSION ="); + printf (" %s\n", _("Get the NSClient version")); + printf (" %s\n", _("If -l is specified, will return warning if versions differ.")); + printf (" %s\n", "CPULOAD ="); + printf (" %s\n", _("Average CPU load on last x minutes.")); + printf (" %s\n", _("Request a -l parameter with the following syntax:")); + printf (" %s\n", _("-l ,,.")); + printf (" %s\n", _(" should be less than 24*60.")); + printf (" %s\n", _("Thresholds are percentage and up to 10 requests can be done in one shot.")); + printf (" %s\n", "ie: -l 60,90,95,120,90,95"); + printf (" %s\n", "UPTIME ="); + printf (" %s\n", _("Get the uptime of the machine.")); + printf (" %s\n", _("No specific parameters. No warning or critical threshold")); + printf (" %s\n", "USEDDISKSPACE ="); + printf (" %s\n", _("Size and percentage of disk use.")); + printf (" %s\n", _("Request a -l parameter containing the drive letter only.")); + printf (" %s\n", _("Warning and critical thresholds can be specified with -w and -c.")); + printf (" %s\n", "MEMUSE ="); + printf (" %s\n", _("Memory use.")); + printf (" %s\n", _("Warning and critical thresholds can be specified with -w and -c.")); + printf (" %s\n", "SERVICESTATE ="); + printf (" %s\n", _("Check the state of one or several services.")); + printf (" %s\n", _("Request a -l parameters with the following syntax:")); + printf (" %s\n", _("-l ,,,...")); + printf (" %s\n", _("You can specify -d SHOWALL in case you want to see working services")); + printf (" %s\n", _("in the returned string.")); + printf (" %s\n", "PROCSTATE ="); + printf (" %s\n", _("Check if one or several process are running.")); + printf (" %s\n", _("Same syntax as SERVICESTATE.")); + printf (" %s\n", "COUNTER ="); + printf (" %s\n", _("Check any performance counter of Windows NT/2000.")); + printf (" %s\n", _("Request a -l parameters with the following syntax:")); + printf (" %s\n", _("-l \"\\\\\\\\counter\",\"")); + printf (" %s\n", _("The parameter is optional and is given to a printf ")); + printf (" %s\n", _("output command which requires a float parameter.")); + printf (" %s\n", _("If does not include \"%%\", it is used as a label.")); + printf (" %s\n", _("Some examples:")); + printf (" %s\n", "\"Paging file usage is %%.2f %%%%\""); + printf (" %s\n", "\"%%.f %%%% paging file used.\""); + printf (" %s\n", "INSTANCES ="); + printf (" %s\n", _("Check any performance counter object of Windows NT/2000.")); + printf (" %s\n", _("Syntax: check_nt -H -p -v INSTANCES -l ")); + printf (" %s\n", _(" is a Windows Perfmon Counter object (eg. Process),")); + printf (" %s\n", _("if it is two words, it should be enclosed in quotes")); + printf (" %s\n", _("The returned results will be a comma-separated list of instances on ")); + printf (" %s\n", _(" the selected computer for that object.")); + printf (" %s\n", _("The purpose of this is to be run from command line to determine what instances")); + printf (" %s\n", _(" are available for monitoring without having to log onto the Windows server")); + printf (" %s\n", _(" to run Perfmon directly.")); + printf (" %s\n", _("It can also be used in scripts that automatically create Nagios service")); + printf (" %s\n", _(" configuration files.")); + printf (" %s\n", _("Some examples:")); + printf (" %s\n\n", _("check_nt -H 192.168.1.1 -p 1248 -v INSTANCES -l Process")); + + printf ("%s\n", _("Notes:")); + printf (" %s\n", _("- The NSClient service should be running on the server to get any information")); + printf (" %s\n", "(http://nsclient.ready2run.nl)."); + printf (" %s\n", _("- Critical thresholds should be lower than warning thresholds")); + printf (" %s\n", _("- Default port 1248 is sometimes in use by other services. The error")); + printf (" %s\n", _("output when this happens contains \"Cannot map xxxxx to protocol number\".")); + printf (" %s\n", _("One fix for this is to change the port to something else on check_nt ")); + printf (" %s\n", _("and on the client service it\'s connecting to.")); #ifdef NP_EXTRA_OPTS - printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); + printf (" -%s", _(UT_EXTRA_OPTS_NOTES)); #endif - printf (_(UT_SUPPORT)); + printf (_(UT_SUPPORT)); } void print_usage(void) { - printf (_("Usage:")); + printf (_("Usage:")); printf ("%s -H host -v variable [-p port] [-w warning] [-c critical]\n",progname); - printf ("[-l params] [-d SHOWALL] [-t timeout]\n"); + printf ("[-l params] [-d SHOWALL] [-t timeout]\n"); } +