![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_nt.c b/plugins/check_nt.c
index 3b2bd5e1178db98725bfb8c29867db0b3733a60d..ef0a66b5f2d82b5c3942ccceda6d899a2fb151ac 100644 (file)
--- a/plugins/check_nt.c
+++ b/plugins/check_nt.c
*
* CHECK_NT.C
*
- * Program: Windows NT plugin for NetSaint
+ * Program: Windows NT plugin for Nagios
* License: GPL
* Copyright (c) 2000-2002 Yves Rubin (rubiyz@yahoo.com)
*
unsigned long lvalue_list[MAX_VALUE_LIST];
unsigned long warning_value=0L;
unsigned long critical_value=0L;
-int check_value_list=FALSE;
int check_warning_value=FALSE;
int check_critical_value=FALSE;
enum checkvars vars_to_check = CHECK_NONE;
int return_code = STATE_UNKNOWN;
char *send_buffer=NULL;
char *output_message=NULL;
+ char *perfdata=NULL;
char *temp_string=NULL;
+ char *temp_string_perf=NULL;
char *description=NULL;
double total_disk_space=0;
double free_disk_space=0;
double percent_used_space=0;
+ double warning_used_space=0;
+ double critical_used_space=0;
double mem_commitLimit=0;
double mem_commitByte=0;
unsigned long utilization;
int uphours=0;
int upminutes=0;
+ setlocale (LC_ALL, "");
+ bindtextdomain (PACKAGE, LOCALEDIR);
+ textdomain (PACKAGE);
+
if(process_arguments(argc,argv)==ERROR)
usage(_("Could not parse arguments\n"));
asprintf(&send_buffer, "%s&1", req_password);
fetch_data (server_address, server_port, send_buffer);
- output_message = strdup (recv_buffer);
- return_code=STATE_OK;
+ if (value_list != NULL && strcmp(recv_buffer, value_list) != 0) {
+ asprintf (&output_message, _("Wrong client version - running: %s, required: %s"), recv_buffer, value_list);
+ return_code = STATE_WARNING;
+ } else {
+ asprintf (&output_message, "%s", recv_buffer);
+ return_code = STATE_OK;
+ }
break;
case CHECK_CPULOAD:
/* -l parameters is present with only integers */
return_code=STATE_OK;
temp_string = strdup (_("CPU Load"));
+ temp_string_perf = strdup (_(" "));
+
/* 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 &&
asprintf(&output_message,_(" %lu%% (%lu min average)"), utilization, lvalue_list[0+offset]);
asprintf(&temp_string,"%s%s",temp_string,output_message);
+ asprintf(&perfdata,_(" '%lu min avg Load'=%lu%%;%lu;%lu;0;100"), lvalue_list[0+offset], utilization,
+ lvalue_list[1+offset], lvalue_list[2+offset]);
+ asprintf(&temp_string_perf,"%s%s",temp_string_perf,perfdata);
offset+=3; /* move across the array */
}
- if (strlen(temp_string)>10) /* we had at least one loop */
+
+ if (strlen(temp_string)>10) { /* we had at least one loop */
output_message = strdup (temp_string);
- else
+ perfdata = temp_string_perf;
+ } else
output_message = strdup (_("not enough values for -l parameters"));
}
break;
if (value_list==NULL)
output_message = strdup (_("missing -l parameters"));
- else if (strlen(value_list)==1)
+ else if (strlen(value_list)!=1)
output_message = strdup (_("wrong -l argument"));
else {
asprintf(&send_buffer,"%s&4&%s", req_password, value_list);
free_disk_space=atof(strtok(recv_buffer,"&"));
total_disk_space=atof(strtok(NULL,"&"));
percent_used_space = ((total_disk_space - free_disk_space) / total_disk_space) * 100;
+ warning_used_space = ((float)warning_value / 100) * total_disk_space;
+ critical_used_space = ((float)critical_value / 100) * total_disk_space;
if (free_disk_space>=0) {
asprintf(&temp_string,_("%s:\\ - total: %.2f Gb - used: %.2f Gb (%.0f%%) - free %.2f Gb (%.0f%%)"),
- value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824, percent_used_space,
- free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
-
+ value_list, total_disk_space / 1073741824, (total_disk_space - free_disk_space) / 1073741824,
+ percent_used_space, free_disk_space / 1073741824, (free_disk_space / total_disk_space)*100);
+ asprintf(&temp_string_perf,_("'%s:\\ Used Space'=%.2fGb;%.2f;%.2f;0.00;%.2f"), value_list,
+ (total_disk_space - free_disk_space) / 1073741824, warning_used_space / 1073741824,
+ critical_used_space / 1073741824, total_disk_space / 1073741824);
if(check_critical_value==TRUE && percent_used_space >= critical_value)
return_code=STATE_CRITICAL;
return_code=STATE_OK;
output_message = strdup (temp_string);
- }
- else {
+ perfdata = temp_string_perf;
+ } else {
output_message = strdup (_("Free disk space : Invalid drive "));
return_code=STATE_UNKNOWN;
}
mem_commitLimit=atof(strtok(recv_buffer,"&"));
mem_commitByte=atof(strtok(NULL,"&"));
percent_used_space = (mem_commitByte / mem_commitLimit) * 100;
+ warning_used_space = ((float)warning_value / 100) * mem_commitLimit;
+ critical_used_space = ((float)critical_value / 100) * mem_commitLimit;
+
+ // Changed divisor in following line from 1048567 to 3044515 to accurately reflect memory size
asprintf(&output_message,_("Memory usage: total:%.2f Mb - used: %.2f Mb (%.0f%%) - free: %.2f Mb (%.0f%%)"),
- mem_commitLimit / 1048576, mem_commitByte / 1048567, percent_used_space,
- (mem_commitLimit - mem_commitByte) / 1048576, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+ mem_commitLimit / 3044515, mem_commitByte / 3044515, percent_used_space,
+ (mem_commitLimit - mem_commitByte) / 3044515, (mem_commitLimit - mem_commitByte) / mem_commitLimit * 100);
+ asprintf(&perfdata,_("'Memory usage'=%.2fMb;%.2f;%.2f;0.00;%.2f"), mem_commitByte / 3044515,
+ warning_used_space / 3044515, critical_used_space / 3044515, mem_commitLimit / 3044515);
+ 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;
- else
- return_code=STATE_OK;
break;
asprintf(&output_message, "%.f", counter_value);
else
asprintf(&output_message,"%s = %.f", description, counter_value);
+ asprintf(&perfdata,"'%s'=%.f", description, counter_value);
if (critical_value > warning_value) { /* Normal thresholds */
if(check_critical_value==TRUE && counter_value >= critical_value)
return_code=STATE_OK;
}
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;
- else
- return_code=STATE_OK;
- }
+ }
}
break;
case CHECK_NONE:
default:
- usage (_(""));
+ usage (_("Please specify a variable to check"));
break;
}
/* reset timeout */
alarm(0);
- printf("%s\n",output_message);
-
+ if (perfdata==NULL)
+ printf("%s\n",output_message);
+ else
+ printf("%s | %s\n",output_message,perfdata);
return return_code;
}
-v, --variable=STRING\n\
Variable to check. Valid variables are:\n"));
printf (_("\
- CLIENTVERSION = Get the NSClient version\n"));
+ CLIENTVERSION = Get the NSClient version\n\
+ If -l <version> is specified, will return warning if versions differ.\n"));
printf (_("\
CPULOAD = Average CPU load on last x minutes.\n\
Request a -l parameter with the following syntax:\n\
Some examples:\n\
\"Paging file usage is %%.2f %%%%\"\n\
\"%%.f %%%% paging file used.\"\n"));
- printf (_("Notes:\n\
+ printf (_("Notes:\n\
- The NSClient service should be running on the server to get any information\n\
(http://nsclient.ready2run.nl).\n\
- Critical thresholds should be lower than warning thresholds\n"));