![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_swap.c b/plugins/check_swap.c
index 367c720d2d2a8313d7c51b07920e0c2174ab79f7..02b043e5156e9ee7034dc1f576c0afcafddff357 100644 (file)
--- a/plugins/check_swap.c
+++ b/plugins/check_swap.c
void print_usage (void);
void print_help (void);
-int warn_percent = 200;
-int crit_percent = 200;
-long unsigned int warn_size = 0;
-long unsigned int crit_size = 0;
+int warn_percent = 0;
+int crit_percent = 0;
+unsigned long long warn_size = 0;
+unsigned long long crit_size = 0;
int verbose;
int allswaps;
main (int argc, char **argv)
{
int percent_used, percent;
- long unsigned int total_swap = 0, used_swap = 0, free_swap = 0;
- long unsigned int dsktotal, dskused, dskfree;
+ unsigned long long total_swap = 0, used_swap = 0, free_swap = 0;
+ unsigned long long dsktotal, dskused, dskfree;
int result = STATE_OK;
char input_buffer[MAX_INPUT_BUFFER];
+ char *perf;
#ifdef HAVE_PROC_MEMINFO
FILE *fp;
#else
textdomain (PACKAGE);
status = strdup("");
+ perf = strdup("");
if (process_arguments (argc, argv) != OK)
usage (_("Invalid command arguments supplied\n"));
#ifdef HAVE_PROC_MEMINFO
fp = fopen (PROC_MEMINFO, "r");
while (fgets (input_buffer, MAX_INPUT_BUFFER - 1, fp)) {
- if (sscanf (input_buffer, " %s %lu %lu %lu", str, &dsktotal, &dskused, &dskfree) == 4 &&
+ if (sscanf (input_buffer, " %s %llu %llu %llu", str, &dsktotal, &dskused, &dskfree) == 4 &&
strstr (str, "Swap")) {
dsktotal = dsktotal / 1048576;
dskused = dskused / 1048576;
percent = 100 * (((double) dskused) / ((double) dsktotal));
result = max_state (result, check_swap (percent, dskfree));
if (verbose)
- asprintf (&status, "%s [%lu (%d%%)]", status, dskfree, 100 - percent);
+ asprintf (&status, "%s [%llu (%d%%)]", status, dskfree, 100 - percent);
}
}
}
percent = 100 * (((double) dskused) / ((double) dsktotal));
result = max_state (result, check_swap (percent, dskfree));
if (verbose)
- asprintf (&status, "%s [%lu (%d%%)]", status, dskfree, 100 - percent);
+ asprintf (&status, "%s [%llu (%d%%)]", status, dskfree, 100 - percent);
}
}
# ifdef _AIX
percent_used = 100 * ((double) used_swap) / ((double) total_swap);
result = max_state (result, check_swap (percent_used, free_swap));
- asprintf (&status, _(" %d%% free (%lu MB out of %lu MB)%s"),
+ asprintf (&status, _(" %d%% free (%llu MB out of %llu MB)%s"),
(100 - percent_used), free_swap, total_swap, status);
- die (result, "SWAP %s:%s\n", state_text (result), status);
- return STATE_UNKNOWN;
+ asprintf (&perf, "%s", perfdata ("swap", (long) free_swap, "MB",
+ TRUE, (long) max (warn_size/1024, warn_percent/100.0*total_swap),
+ TRUE, (long) max (crit_size/1024, crit_percent/100.0*total_swap),
+ TRUE, 0,
+ TRUE, (long) total_swap));
+ printf ("SWAP %s:%s |%s\n", state_text (result), status, perf);
+ return result;
}
check_swap (int usp, long unsigned int free_swap)
{
int result = STATE_UNKNOWN;
- if (usp >= 0 && usp >= (100.0 - crit_percent))
+ free_swap = free_swap * 1024; /* Convert back to bytes as warn and crit specified in bytes */
+ if (usp >= 0 && crit_percent != 0 && usp >= (100.0 - crit_percent))
result = STATE_CRITICAL;
else if (crit_size > 0 && free_swap <= crit_size)
result = STATE_CRITICAL;
- else if (usp >= 0 && usp >= (100.0 - warn_percent))
+ else if (usp >= 0 && warn_percent != 0 && usp >= (100.0 - warn_percent))
result = STATE_WARNING;
else if (warn_size > 0 && free_swap <= warn_size)
result = STATE_WARNING;
}
else if (strstr (optarg, ",") &&
strstr (optarg, "%") &&
- sscanf (optarg, "%lu,%d%%", &warn_size, &warn_percent) == 2) {
+ sscanf (optarg, "%llu,%d%%", &warn_size, &warn_percent) == 2) {
break;
}
else if (strstr (optarg, "%") &&
}
else if (strstr (optarg, ",") &&
strstr (optarg, "%") &&
- sscanf (optarg, "%lu,%d%%", &crit_size, &crit_percent) == 2) {
+ sscanf (optarg, "%llu,%d%%", &crit_size, &crit_percent) == 2) {
break;
}
else if (strstr (optarg, "%") &&
case 'h': /* help */
print_help ();
exit (STATE_OK);
- case '?': /* help */
+ case '?': /* error */
usage (_("Invalid argument\n"));
}
}
c = optind;
if (c == argc)
return validate_arguments ();
- if (warn_percent > 100 && is_intnonneg (argv[c]))
+ if (warn_percent == 0 && is_intnonneg (argv[c]))
warn_percent = atoi (argv[c++]);
if (c == argc)
return validate_arguments ();
- if (crit_percent > 100 && is_intnonneg (argv[c]))
+ if (crit_percent == 0 && is_intnonneg (argv[c]))
crit_percent = atoi (argv[c++]);
if (c == argc)
int
validate_arguments (void)
{
- if (warn_percent > 100 && crit_percent > 100 && warn_size == 0
+ if (warn_percent == 0 && crit_percent == 0 && warn_size == 0
&& crit_size == 0) {
return ERROR;
}
-w, --warning=INTEGER\n\
Exit with WARNING status if less than INTEGER bytes of swap space are free\n\
-w, --warning=PERCENT%%\n\
- Exit with WARNING status if less than PERCENT of swap space has been used\n\
+ Exit with WARNING status if less than PERCENT of swap space is free\n\
-c, --critical=INTEGER\n\
Exit with CRITICAL status if less than INTEGER bytes of swap space are free\n\
-c, --critical=PERCENT%%\n\
- Exit with CRITCAL status if less than PERCENT of swap space has been used\n\
+ Exit with CRITCAL status if less than PERCENT of swap space is free\n\
-a, --allswaps\n\
- Conduct comparisons for all swap partitions, one by one\n"));
+ Conduct comparisons for all swap partitions, one by one\n\
+ -v, --verbose\n\
+ Verbose output. Up to 3 levels\n"));
printf (_("\n\
On Solaris, if -a specified, uses swap -l, otherwise uses swap -s.\n\
print_usage (void)
{
printf (_("Usage:\n\
- %s [-a] -w <used_percentage>%% -c <used_percentage>%%\n\
- %s [-a] -w <bytes_free> -c <bytes_free>\n\
+ %s [-av] -w <percent_free>%% -c <percent_free>%%\n\
+ %s [-av] -w <bytes_free> -c <bytes_free>\n\
%s (-h | --help) for detailed help\n\
%s (-V | --version) for version information\n"),
progname, progname, progname, progname);