![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index b546fd2ff9febd0971642d60579c3dcceb879124..88a176926f1454b82697d667e93c4599f9f766bc 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
#include "common.h"
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
char *crit_usedspace_percent = NULL;
char *warn_usedinodes_percent = NULL;
char *crit_usedinodes_percent = NULL;
+char *warn_freeinodes_percent = NULL;
+char *crit_freeinodes_percent = NULL;
int
char *output;
char *details;
char *perf;
+ char *preamble;
double inode_space_pct;
uintmax_t total, available, available_to_root, used;
double dfree_pct = -1, dused_pct = -1;
double dused_units, dfree_units, dtotal_units;
double dused_inodes_percent, dfree_inodes_percent;
+ double warning_high_tide;
+ double critical_high_tide;
int temp_result;
struct mount_entry *me;
struct parameter_list *temp_list, *path;
struct name_list *seen = NULL;
- output = strdup (" - free space:");
+ preamble = strdup (" - free space:");
+ output = strdup ("");
details = strdup ("");
perf = strdup ("");
set_thresholds(&path->usedspace_units, warn_usedspace_units, crit_usedspace_units);
set_thresholds(&path->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
set_thresholds(&path->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
+ set_thresholds(&path->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
}
} else {
np_set_best_match(path_select_list, mount_list, exact_match);
/* Process for every path in list */
for (path = path_select_list; path; path=path->name_next) {
+
+ /* reset disk result */
+ disk_result = STATE_UNKNOWN;
+
me = path->best_match;
/* Filters */
dfree_inodes_percent = 100 - dused_inodes_percent;
if (verbose >= 3) {
- printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g\n",
- me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent);
+ printf ("For %s, used_pct=%g free_pct=%g used_units=%g free_units=%g total_units=%g used_inodes_pct=%g free_inodes_pct=%g\n",
+ me->me_mountdir, dused_pct, dfree_pct, dused_units, dfree_units, dtotal_units, dused_inodes_percent, dfree_inodes_percent);
}
/* Threshold comparisons */
temp_result = get_status(dfree_units, path->freespace_units);
if (verbose >=3) printf("Freespace_units result=%d\n", temp_result);
- result = max_state( result, temp_result );
+ disk_result = max_state( disk_result, temp_result );
temp_result = get_status(dfree_pct, path->freespace_percent);
if (verbose >=3) printf("Freespace%% result=%d\n", temp_result);
- result = max_state( result, temp_result );
+ disk_result = max_state( disk_result, temp_result );
temp_result = get_status(dused_units, path->usedspace_units);
if (verbose >=3) printf("Usedspace_units result=%d\n", temp_result);
- result = max_state( result, temp_result );
+ disk_result = max_state( disk_result, temp_result );
temp_result = get_status(dused_pct, path->usedspace_percent);
if (verbose >=3) printf("Usedspace_percent result=%d\n", temp_result);
- result = max_state( result, temp_result );
+ disk_result = max_state( disk_result, temp_result );
temp_result = get_status(dused_inodes_percent, path->usedinodes_percent);
if (verbose >=3) printf("Usedinodes_percent result=%d\n", temp_result);
- result = max_state( result, temp_result );
+ disk_result = max_state( disk_result, temp_result );
+
+ temp_result = get_status(dfree_inodes_percent, path->freeinodes_percent);
+ if (verbose >=3) printf("Freeinodes_percent result=%d\n", temp_result);
+ disk_result = max_state( disk_result, temp_result );
+
+ result = max_state(result, disk_result);
+
+ /* What a mess of units. The output shows free space, the perf data shows used space. Yikes!
+ Hack here. Trying to get warn/crit levels from freespace_(units|percent) for perf
+ data. Assumption that start=0. Roll on new syntax...
+ */
+
+ /* *_high_tide must be reinitialized at each run */
+ warning_high_tide = UINT_MAX;
+ critical_high_tide = UINT_MAX;
+
+ if (path->freespace_units->warning != NULL) {
+ warning_high_tide = dtotal_units - path->freespace_units->warning->end;
+ }
+ if (path->freespace_percent->warning != NULL) {
+ warning_high_tide = abs( min( (double) warning_high_tide, (double) (1.0 - path->freespace_percent->warning->end/100)*dtotal_units ));
+ }
+ if (path->freespace_units->critical != NULL) {
+ critical_high_tide = dtotal_units - path->freespace_units->critical->end;
+ }
+ if (path->freespace_percent->critical != NULL) {
+ critical_high_tide = abs( min( (double) critical_high_tide, (double) (1.0 - path->freespace_percent->critical->end/100)*dtotal_units ));
+ }
asprintf (&perf, "%s %s", perf,
perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
dused_units, units,
- FALSE, 0, /* min ((uintmax_t)dtotal_units-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*dtotal_units)), */
- FALSE, 0, /* min ((uintmax_t)dtotal_units-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*dtotal_units)), */
- FALSE, 0, /* inode_space_pct - this is not meant to be here???, */
- FALSE, 0));; /* dtotal_units)); */
+ (warning_high_tide != UINT_MAX ? TRUE : FALSE), warning_high_tide,
+ (critical_high_tide != UINT_MAX ? TRUE : FALSE), critical_high_tide,
+ TRUE, 0,
+ TRUE, dtotal_units));
if (disk_result==STATE_OK && erronly && !verbose)
continue;
asprintf (&output, "%s%s", output, details);
- printf ("DISK %s%s|%s\n", state_text (result), output, perf);
+ printf ("DISK %s%s%s|%s\n", state_text (result), (erronly && result==STATE_OK) ? "" : preamble, output, perf);
return result;
}
break;
case 'W': /* warning inode threshold */
- warn_usedinodes_percent = optarg;
+ if (*optarg == '@') {
+ warn_freeinodes_percent = optarg;
+ } else {
+ asprintf(&warn_freeinodes_percent, "@%s", optarg);
+ }
break;
case 'K': /* critical inode threshold */
- crit_usedinodes_percent = optarg;
+ if (*optarg == '@') {
+ crit_freeinodes_percent = optarg;
+ } else {
+ asprintf(&crit_freeinodes_percent, "@%s", optarg);
+ }
break;
case 'u':
if (units)
if (! (warn_freespace_units || crit_freespace_units || warn_freespace_percent ||
crit_freespace_percent || warn_usedspace_units || crit_usedspace_units ||
warn_usedspace_percent || crit_usedspace_percent || warn_usedinodes_percent ||
- crit_usedinodes_percent)) {
+ crit_usedinodes_percent || warn_freeinodes_percent || crit_freeinodes_percent )) {
die (STATE_UNKNOWN, "DISK %s: %s", _("UNKNOWN"), _("Must set a threshold value before using -p\n"));
}
se = np_add_parameter(&path_select_list, optarg);
set_thresholds(&se->usedspace_units, warn_usedspace_units, crit_usedspace_units);
set_thresholds(&se->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
set_thresholds(&se->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
+ set_thresholds(&se->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
break;
case 'x': /* exclude path or partition */
np_add_name(&dp_exclude_list, optarg);
crit_usedspace_percent = NULL;
warn_usedinodes_percent = NULL;
crit_usedinodes_percent = NULL;
+ warn_freeinodes_percent = NULL;
+ crit_freeinodes_percent = NULL;
break;
case 'V': /* version */
print_revision (progname, revision);
set_thresholds(&se->usedspace_units, warn_usedspace_units, crit_usedspace_units);
set_thresholds(&se->usedspace_percent, warn_usedspace_percent, crit_usedspace_percent);
set_thresholds(&se->usedinodes_percent, warn_usedinodes_percent, crit_usedinodes_percent);
+ set_thresholds(&se->freeinodes_percent, warn_freeinodes_percent, crit_freeinodes_percent);
}
if (units == NULL) {
printf ("\n");
else
printf (_(" for %s\n"), mypath);
-
- //return;
}
printf (" %s\n", _("Path or partition (may be repeated)"));
printf (" %s\n", "-x, --exclude_device=PATH <STRING>");
printf (" %s\n", _("Ignore device (only works if -p unspecified)"));
- printf (" %s\n", _("-X, --exclude-type=TYPE <STRING>"));
+ printf (" %s\n", "-X, --exclude-type=TYPE <STRING>");
printf (" %s\n", _("Ignore all filesystems of indicated type (may be repeated)"));
- printf (" %s\n", "-m, --mountpoint");
+ printf (" %s\n", "-M, --mountpoint");
printf (" %s\n", _("Display the mountpoint instead of the partition"));
printf (" %s\n", "-E, --exact-match");
printf (" %s\n", _("For paths or partitions specified with -p, only check for exact paths"));