diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 1be5e6c3367d7d54187bb0225ebd58609701b924..88a176926f1454b82697d667e93c4599f9f766bc 100644 (file)
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
/******************************************************************************
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- $Id$
-
+*
+* Nagios check_disk plugin
+*
+* License: GPL
+* Copyright (c) 1999-2006 nagios-plugins team
+*
+* Last Modified: $Date$
+*
+* Description:
+*
+* This file contains the check_disk plugin
+*
+* License Information:
+*
+* This program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2 of the License, or
+* (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*
+* $Id$
+*
*****************************************************************************/
const char *progname = "check_disk";
const char *program_name = "check_disk"; /* Required for coreutils libs */
const char *revision = "$Revision$";
-const char *copyright = "1999-2005";
+const char *copyright = "1999-2006";
const char *email = "nagiosplug-devel@lists.sourceforge.net";
- /*
- * Additional inode code by Jorgen Lundman <lundman@lundman.net>
- */
-
#include "common.h"
+#ifdef HAVE_SYS_STAT_H
+# include <sys/stat.h>
+#endif
#if HAVE_INTTYPES_H
# include <inttypes.h>
#endif
#include <assert.h>
#include "popen.h"
#include "utils.h"
+#include "utils_disk.h"
#include <stdarg.h>
-#include "../lib/fsusage.h"
-#include "../lib/mountlist.h"
+#include "fsusage.h"
+#include "mountlist.h"
+#include "intprops.h" /* necessary for TYPE_MAXIMUM */
#if HAVE_LIMITS_H
# include <limits.h>
#endif
+
/* If nonzero, show inode information. */
-static int inode_format;
+static int inode_format = 1;
/* If nonzero, show even filesystems with zero size or
uninteresting types. */
SunOs4.1.3, for one. It is *not* necessary on Linux. */
/* static int require_sync = 0; */
-/* A filesystem type to display. */
-
-struct name_list
-{
- char *name;
- int found;
- int found_len;
- uintmax_t w_df;
- uintmax_t c_df;
- double w_dfp;
- double c_dfp;
- double w_idfp;
- double c_idfp;
- struct name_list *name_next;
-};
-
/* Linked list of filesystem types to display.
If `fs_select_list' is NULL, list all types.
This table is generated dynamically from command-line options,
Some filesystem types:
4.2 4.3 ufs nfs swap ignore io vm efs dbg */
-/* static struct name_list *fs_select_list; */
+/* static struct parameter_list *fs_select_list; */
/* Linked list of filesystem types to omit.
If the list is empty, don't exclude any types. */
static struct name_list *dp_exclude_list;
-static struct name_list *path_select_list;
-
-static struct name_list *dev_select_list;
+static struct parameter_list *path_select_list = NULL;
/* Linked list of mounted filesystems. */
static struct mount_entry *mount_list;
#pragma alloca
#endif
+/* Linked list of mounted filesystems. */
+static struct mount_entry *mount_list;
+
int process_arguments (int, char **);
void print_path (const char *mypath);
int validate_arguments (uintmax_t, uintmax_t, double, double, double, double, char *);
-int check_disk (double usp, uintmax_t free_disk, double uisp);
-int walk_name_list (struct name_list *list, const char *name);
void print_help (void);
void print_usage (void);
+double calculate_percent(uintmax_t, uintmax_t);
-uintmax_t w_df = 0;
-uintmax_t c_df = 0;
double w_dfp = -1.0;
double c_dfp = -1.0;
-double w_idfp = -1.0;
-double c_idfp = -1.0;
char *path;
char *exclude_device;
char *units;
int verbose = 0;
int erronly = FALSE;
int display_mntp = FALSE;
-
-/* Linked list of mounted filesystems. */
-static struct mount_entry *mount_list;
-
+int exact_match = FALSE;
+char *warn_freespace_units = NULL;
+char *crit_freespace_units = NULL;
+char *warn_freespace_percent = NULL;
+char *crit_freespace_percent = NULL;
+char *warn_usedspace_units = NULL;
+char *crit_usedspace_units = NULL;
+char *warn_usedspace_percent = NULL;
+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
main (int argc, char **argv)
{
- double usp = -1.0, uisp = -1.0;
int result = STATE_UNKNOWN;
int disk_result = STATE_UNKNOWN;
- char file_system[MAX_INPUT_BUFFER];
char *output;
char *details;
char *perf;
- uintmax_t psize;
- float free_space, free_space_pct, total_space, inode_space_pct;
+ 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 fs_usage fsp;
- struct name_list *temp_list;
+ 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 ("");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
- mount_list = read_filesystem_list (0);
+ mount_list = read_file_system_list (0);
if (process_arguments (argc, argv) == ERROR)
usage4 (_("Could not parse arguments"));
- /* if a list of paths has been selected, preseed the list with
- * the longest matching filesystem name by iterating across
- * the mountlist once ahead of time. this will allow a query on
- * "/var/log" to return information about "/var" if no "/var/log"
- * filesystem exists, etc. this is the default behavior already
- * with df-based checks, but for systems with their own space
- * checking routines, this should make them more consistent.
+ /* If a list of paths has not been selected, find entire
+ mount list and create list of paths
*/
- if(path_select_list){
+ if (! path_select_list) {
for (me = mount_list; me; me = me->me_next) {
- walk_name_list(path_select_list, me->me_mountdir);
- walk_name_list(path_select_list, me->me_devname);
+ path = np_add_parameter(&path_select_list, me->me_mountdir);
+ path->best_match = me;
+ set_thresholds(&path->freespace_units, warn_freespace_units, crit_freespace_units);
+ set_thresholds(&path->freespace_percent, warn_freespace_percent, crit_freespace_percent);
+ 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);
}
- /* now pretend we never saw anything, but keep found_len.
- * thus future searches will only match the best match */
- for (temp_list = path_select_list; temp_list; temp_list=temp_list->name_next){
- temp_list->found=0;
+ } else {
+ np_set_best_match(path_select_list, mount_list, exact_match);
+
+ /* Error if no match found for specified paths */
+ temp_list = path_select_list;
+ while (temp_list) {
+ if (! temp_list->best_match) {
+ die (STATE_CRITICAL, _("DISK %s: %s not found\n"), _("CRITICAL"), temp_list->name);
+ }
+ temp_list = temp_list->name_next;
}
}
- /* for every mount entry */
- for (me = mount_list; me; me = me->me_next) {
- /* if there's a list of paths to select, the current mount
- * entry matches in path or device name, get fs usage */
- if (path_select_list &&
- (walk_name_list (path_select_list, me->me_mountdir) ||
- walk_name_list (path_select_list, me->me_devname) ) ) {
- get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
- /* else if there's a list of paths/devices to select (but
- * we didn't match above) skip to the next mount entry */
- } else if (dev_select_list || path_select_list) {
+ /* 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 */
+
+ /* Remove filesystems already seen */
+ if (np_seen_name(seen, me->me_mountdir)) {
continue;
- /* skip remote filesystems if we're not interested in them */
- } else if (me->me_remote && show_local_fs) {
+ } else {
+ np_add_name(&seen, me->me_mountdir);
+ }
+ /* Skip remote filesystems if we're not interested in them */
+ if (me->me_remote && show_local_fs) {
continue;
- /* skip pseudo fs's if we haven't asked for all fs's */
+ /* Skip pseudo fs's if we haven't asked for all fs's */
} else if (me->me_dummy && !show_all_fs) {
continue;
- /* skip excluded fstypes */
- } else if (fs_exclude_list && walk_name_list (fs_exclude_list, me->me_type)) {
+ /* Skip excluded fstypes */
+ } else if (fs_exclude_list && np_find_name (fs_exclude_list, me->me_type)) {
continue;
- /* skip excluded fs's */
+ /* Skip excluded fs's */
} else if (dp_exclude_list &&
- (walk_name_list (dp_exclude_list, me->me_devname) ||
- walk_name_list (dp_exclude_list, me->me_mountdir))) {
+ (np_find_name (dp_exclude_list, me->me_devname) ||
+ np_find_name (dp_exclude_list, me->me_mountdir))) {
continue;
- /* otherwise, get fs usage */
- } else {
- get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
}
+ get_fs_usage (me->me_mountdir, me->me_devname, &fsp);
+
if (fsp.fsu_blocks && strcmp ("none", me->me_mountdir)) {
- usp = (double)(fsp.fsu_blocks - fsp.fsu_bavail) * 100 / fsp.fsu_blocks;
- uisp = (double)(fsp.fsu_files - fsp.fsu_ffree) * 100 / fsp.fsu_files;
- disk_result = check_disk (usp, fsp.fsu_bavail, uisp);
+ total = fsp.fsu_blocks;
+ available = fsp.fsu_bavail;
+ available_to_root = fsp.fsu_bfree;
+ used = total - available_to_root;
+
+ dused_pct = calculate_percent( used, used + available ); /* used + available can never be > uintmax */
+
+ dfree_pct = 100 - dused_pct;
+ dused_units = used*fsp.fsu_blocksize/mult;
+ dfree_units = available*fsp.fsu_blocksize/mult;
+ dtotal_units = total*fsp.fsu_blocksize/mult;
+ dused_inodes_percent = calculate_percent(fsp.fsu_files - fsp.fsu_ffree, fsp.fsu_files);
+ 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 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);
+ 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);
+ 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);
+ 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);
+ 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);
+ disk_result = max_state( disk_result, temp_result );
- result = max_state (disk_result, result);
- psize = fsp.fsu_blocks*fsp.fsu_blocksize/mult;
+ 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);
- /* Moved this computation up here so we can add it
- * to perf */
- inode_space_pct = (float)fsp.fsu_ffree*100/fsp.fsu_files;
+ /* 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(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
- psize-(fsp.fsu_bavail*fsp.fsu_blocksize/mult), units,
- TRUE, min ((uintmax_t)psize-(uintmax_t)w_df, (uintmax_t)((1.0-w_dfp/100.0)*psize)),
- TRUE, min ((uintmax_t)psize-(uintmax_t)c_df, (uintmax_t)((1.0-c_dfp/100.0)*psize)),
- TRUE, inode_space_pct,
+ perfdata ((!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+ dused_units, 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));
- TRUE, psize));
if (disk_result==STATE_OK && erronly && !verbose)
continue;
- free_space = (float)fsp.fsu_bavail*fsp.fsu_blocksize/mult;
- free_space_pct = (float)fsp.fsu_bavail*100/fsp.fsu_blocks;
- total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
- if (disk_result!=STATE_OK || verbose>=0)
- asprintf (&output, ("%s %s %.0f %s (%.0f%% inode=%.0f%%);"),
+ if (disk_result!=STATE_OK || verbose>=0) {
+ asprintf (&output, "%s %s %.0f %s (%.0f%%",
output,
- (!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
- free_space,
+ (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
+ dfree_units,
units,
- free_space_pct,
- inode_space_pct);
+ dfree_pct);
+ if (dused_inodes_percent < 0) {
+ asprintf(&output, "%s inode=-);", output);
+ } else {
+ asprintf(&output, "%s inode=%.0f%%);", output, dfree_inodes_percent );
+ }
+ }
+ /* TODO: Need to do a similar debug line
asprintf (&details, _("%s\n\
%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),
- details, free_space, total_space, units, free_space_pct, inode_space_pct,
+ details, dfree_units, dtotal_units, units, dfree_pct, inode_space_pct,
me->me_devname, me->me_type, me->me_mountdir,
(unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
+ */
}
if (verbose > 2)
asprintf (&output, "%s%s", output, details);
- /* Override result if paths specified and not found */
- temp_list = path_select_list;
- while (temp_list) {
- if (!temp_list->found) {
- asprintf (&output, _("%s [%s not found]"), output, temp_list->name);
- result = STATE_CRITICAL;
- }
- temp_list = temp_list->name_next;
- }
- 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;
}
+double calculate_percent(uintmax_t value, uintmax_t total) {
+ double pct = -1;
+ /* I don't understand the below, but it is taken from coreutils' df */
+ /* Seems to be calculating pct, in the best possible way */
+ if (value <= TYPE_MAXIMUM(uintmax_t) / 100
+ && total != 0) {
+ uintmax_t u100 = value * 100;
+ pct = u100 / total + (u100 % total != 0);
+ } else {
+ /* Possible rounding errors - see coreutils' df for more explanation */
+ double u = value;
+ double t = total;
+ if (t) {
+ long int lipct = pct = u * 100 / t;
+ double ipct = lipct;
+
+ /* Like 'pct = ceil (dpct);', but without ceil - from coreutils again */
+ if (ipct - 1 < pct && pct <= ipct + 1)
+ pct = ipct + (ipct < pct);
+ }
+ }
+ return pct;
+}
/* process command-line arguments */
int
process_arguments (int argc, char **argv)
{
int c;
- struct name_list *se;
- struct name_list **pathtail = &path_select_list;
- struct name_list **fstail = &fs_exclude_list;
- struct name_list **dptail = &dp_exclude_list;
- struct name_list *temp_list;
+ struct parameter_list *se;
+ struct parameter_list *temp_list;
int result = OK;
struct stat *stat_buf;
- unsigned long l;
-
int option = 0;
static struct option longopts[] = {
{"timeout", required_argument, 0, 't'},
{"exclude-type", required_argument, 0, 'X'},
{"mountpoint", no_argument, 0, 'M'},
{"errors-only", no_argument, 0, 'e'},
+ {"exact-match", no_argument, 0, 'E'},
{"verbose", no_argument, 0, 'v'},
{"quiet", no_argument, 0, 'q'},
{"clear", no_argument, 0, 'C'},
if (argc < 2)
return ERROR;
- se = (struct name_list *) malloc (sizeof (struct name_list));
- se->name = strdup ("iso9660");
- se->name_next = NULL;
- se->found = 0;
- se->found_len = 0;
- *fstail = se;
- fstail = &se->name_next;
+ np_add_name(&fs_exclude_list, "iso9660");
for (c = 1; c < argc; c++)
if (strcmp ("-to", argv[c]) == 0)
strcpy (argv[c], "-t");
while (1) {
- c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklM", longopts, &option);
+ c = getopt_long (argc, argv, "+?VqhveCt:c:w:K:W:u:p:x:X:mklME", longopts, &option);
if (c == -1 || c == EOF)
break;
else {
usage2 (_("Timeout interval must be a positive integer"), optarg);
}
+
+ /* See comments for 'c' */
case 'w': /* warning threshold */
- if (is_intnonneg (optarg)) {
- w_df = atoi (optarg);
- break;
- }
- else if (strpbrk (optarg, ",:") &&
- strstr (optarg, "%") &&
- sscanf (optarg, "%lu%*[:,]%lf%%", &l, &w_dfp) == 2) {
- w_df = (uintmax_t)l;
- break;
- }
- else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_dfp) == 1) {
- break;
- }
- else {
- usage4 (_("Warning threshold must be integer or percentage!"));
+ if (strstr(optarg, "%")) {
+ if (*optarg == '@') {
+ warn_freespace_percent = optarg;
+ } else {
+ asprintf(&warn_freespace_percent, "@%s", optarg);
+ }
+ } else {
+ if (*optarg == '@') {
+ warn_freespace_units = optarg;
+ } else {
+ asprintf(&warn_freespace_units, "@%s", optarg);
+ }
}
+ break;
+
+ /* Awful mistake where the range values do not make sense. Normally,
+ you alert if the value is within the range, but since we are using
+ freespace, we have to alert if outside the range. Thus we artifically
+ force @ at the beginning of the range, so that it is backwards compatible
+ */
case 'c': /* critical threshold */
- if (is_intnonneg (optarg)) {
- c_df = atoi (optarg);
- break;
- }
- else if (strpbrk (optarg, ",:") &&
- strstr (optarg, "%") &&
- sscanf (optarg, "%lu%*[,:]%lf%%", &l, &c_dfp) == 2) {
- c_df = (uintmax_t)l;
- break;
+ if (strstr(optarg, "%")) {
+ if (*optarg == '@') {
+ crit_freespace_percent = optarg;
+ } else {
+ asprintf(&crit_freespace_percent, "@%s", optarg);
+ }
+ } else {
+ if (*optarg == '@') {
+ crit_freespace_units = optarg;
+ } else {
+ asprintf(&crit_freespace_units, "@%s", optarg);
+ }
}
- else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_dfp) == 1) {
- break;
+ break;
+
+ case 'W': /* warning inode threshold */
+ if (*optarg == '@') {
+ warn_freeinodes_percent = optarg;
+ } else {
+ asprintf(&warn_freeinodes_percent, "@%s", optarg);
}
- else {
- usage4 (_("Critical threshold must be integer or percentage!"));
+ break;
+ case 'K': /* critical inode threshold */
+ if (*optarg == '@') {
+ crit_freeinodes_percent = optarg;
+ } else {
+ asprintf(&crit_freeinodes_percent, "@%s", optarg);
}
-
-
- case 'W': /* warning inode threshold */
- if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_idfp) == 1) {
- break;
- }
- else {
- usage (_("Warning inode threshold must be percentage!\n"));
- }
- case 'K': /* kritical inode threshold */
- if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_idfp) == 1) {
- break;
- }
- else {
- usage (_("Critical inode threshold must be percentage!\n"));
- }
+ break;
case 'u':
if (units)
free(units);
show_local_fs = 1;
break;
case 'p': /* select path */
- se = (struct name_list *) malloc (sizeof (struct name_list));
- se->name = optarg;
- se->name_next = NULL;
- se->w_df = w_df;
- se->c_df = c_df;
- se->w_dfp = w_dfp;
- se->c_dfp = c_dfp;
- se->found = 0;
- se->found_len = 0;
- *pathtail = se;
- pathtail = &se->name_next;
+ 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 || 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->freespace_units, warn_freespace_units, crit_freespace_units);
+ set_thresholds(&se->freespace_percent, warn_freespace_percent, crit_freespace_percent);
+ 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 */
- se = (struct name_list *) malloc (sizeof (struct name_list));
- se->name = optarg;
- se->name_next = NULL;
-
- /* If you don't clear the w_fd etc values here, they
- * get processed when you walk the list and assigned
- * to the global w_df!
- */
- se->w_df = 0;
- se->c_df = 0;
- se->w_dfp = 0;
- se->c_dfp = 0;
- se->found = 0;
- se->found_len = 0;
- *dptail = se;
- dptail = &se->name_next;
+ np_add_name(&dp_exclude_list, optarg);
break;
case 'X': /* exclude file system type */
- se = (struct name_list *) malloc (sizeof (struct name_list));
- se->name = optarg;
- se->name_next = NULL;
- /* If you don't clear the w_fd etc values here, they
- * get processed when you walk the list and assigned
- * to the global w_df!
- */
- se->w_df = 0;
- se->c_df = 0;
- se->w_dfp = 0;
- se->c_dfp = 0;
- se->found = 0;
- se->found_len = 0;
- *fstail = se;
- fstail = &se->name_next;
+ np_add_name(&fs_exclude_list, optarg);
break;
case 'v': /* verbose */
verbose++;
case 'e':
erronly = TRUE;
break;
+ case 'E':
+ exact_match = TRUE;
+ break;
case 'M': /* display mountpoint */
display_mntp = TRUE;
break;
case 'C':
- w_df = 0;
- c_df = 0;
- w_dfp = -1.0;
- c_dfp = -1.0;
+ warn_freespace_units = NULL;
+ crit_freespace_units = NULL;
+ warn_usedspace_units = NULL;
+ crit_usedspace_units = NULL;
+ warn_freespace_percent = NULL;
+ crit_freespace_percent = NULL;
+ warn_usedspace_percent = NULL;
+ 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);
}
}
- /* Support for "check_disk warn crit [fs]" with thresholds at used level */
+ /* Support for "check_disk warn crit [fs]" with thresholds at used% level */
c = optind;
- if (w_dfp < 0 && argc > c && is_intnonneg (argv[c]))
- w_dfp = (100.0 - atof (argv[c++]));
+ if (warn_usedspace_percent == NULL && argc > c && is_intnonneg (argv[c]))
+ warn_usedspace_percent = argv[c++];
- if (c_dfp < 0 && argc > c && is_intnonneg (argv[c]))
- c_dfp = (100.0 - atof (argv[c++]));
+ if (crit_usedspace_percent == NULL && argc > c && is_intnonneg (argv[c]))
+ crit_usedspace_percent = argv[c++];
if (argc > c && path == NULL) {
- se = (struct name_list *) malloc (sizeof (struct name_list));
- se->name = strdup (argv[c++]);
- se->name_next = NULL;
- se->w_df = w_df;
- se->c_df = c_df;
- se->w_dfp = w_dfp;
- se->c_dfp = c_dfp;
- se->found =0;
- se->found_len = 0;
- *pathtail = se;
+ se = np_add_parameter(&path_select_list, strdup(argv[c++]));
+ set_thresholds(&se->freespace_units, warn_freespace_units, crit_freespace_units);
+ set_thresholds(&se->freespace_percent, warn_freespace_percent, crit_freespace_percent);
+ 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) {
+ units = strdup ("MB");
+ mult = (uintmax_t)1024 * 1024;
}
if (path_select_list) {
printf("DISK %s - ", _("CRITICAL"));
die (STATE_CRITICAL, _("%s does not exist\n"), temp_list->name);
}
- if (validate_arguments (temp_list->w_df,
+ /* if (validate_arguments (temp_list->w_df,
temp_list->c_df,
temp_list->w_dfp,
temp_list->c_dfp,
temp_list->c_idfp,
temp_list->name) == ERROR)
result = ERROR;
+ */
temp_list = temp_list->name_next;
}
free(stat_buf);
return result;
} else {
- return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL);
+ return TRUE;
+ /* return validate_arguments (w_df, c_df, w_dfp, c_dfp, w_idfp, c_idfp, NULL); */
}
}
printf ("\n");
else
printf (_(" for %s\n"), mypath);
-
- return;
}
+/* TODO: Remove?
+
int
validate_arguments (uintmax_t w, uintmax_t c, double wp, double cp, double iwp, double icp, char *mypath)
{
@@ -625,64 +700,14 @@ INPUT ERROR: C_DF (%lu) should be less than W_DF (%lu) and both should be greate
return ERROR;
}
- if (units == NULL) {
- units = strdup ("MB");
- mult = (uintmax_t)1024 * 1024;
- }
return OK;
}
+*/
-int
-
-check_disk (double usp, uintmax_t free_disk, double uisp)
-{
- int result = STATE_UNKNOWN;
- /* check the percent used space against thresholds */
- if (usp >= 0.0 && c_dfp >=0.0 && usp >= (100.0 - c_dfp))
- result = STATE_CRITICAL;
- else if (uisp >= 0.0 && c_idfp >=0.0 && uisp >= (100.0 - c_idfp))
- result = STATE_CRITICAL;
- else if (c_df > 0 && free_disk <= c_df)
- result = STATE_CRITICAL;
- else if (usp >= 0.0 && w_dfp >=0.0 && usp >= (100.0 - w_dfp))
- result = STATE_WARNING;
- else if (uisp >= 0.0 && w_idfp >=0.0 && uisp >= (100.0 - w_idfp))
- result = STATE_WARNING;
- else if (w_df > 0 && free_disk <= w_df)
- result = STATE_WARNING;
- else if (usp >= 0.0)
- result = STATE_OK;
- return result;
-}
-
-int
-walk_name_list (struct name_list *list, const char *name)
-{
- int name_len;
- name_len = strlen(name);
- while (list) {
- /* if the paths match up to the length of the mount path,
- * AND if the mount path name is longer than the longest
- * found match, we have a new winner */
- if (name_len >= list->found_len &&
- ! strncmp(list->name, name, name_len)) {
- list->found = 1;
- list->found_len = name_len;
- /* if required for name_lists that have not saved w_df, etc (eg exclude lists) */
- if (list->w_df) w_df = list->w_df;
- if (list->c_df) c_df = list->c_df;
- if (list->w_dfp>=0.0) w_dfp = list->w_dfp;
- if (list->c_dfp>=0.0) c_dfp = list->c_dfp;
- return TRUE;
- }
- list = list->name_next;
- }
- return FALSE;
-}
printf ("Copyright (c) 1999 Ethan Galstad <nagios@nagios.org>\n");
printf (COPYRIGHT, copyright, email);
- printf (_("This plugin checks the amount of used disk space on a mounted file system"));
- printf (_("and generates an alert if free space is less than one of the threshold values"));
+ printf ("%s\n", _("This plugin checks the amount of used disk space on a mounted file system"));
+ printf ("%s\n", _("and generates an alert if free space is less than one of the threshold values"));
printf ("\n\n");
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"));
printf (" %s\n", "-e, --errors-only");
printf (" %s\n", _("Display only devices/mountpoints with errors"));
printf (_(UT_TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
{
printf (_("Usage:"));
printf (" %s -w limit -c limit [-p path | -x device] [-t timeout]", progname);
- printf ("[-m] [-e] [-W limit] [-K limit] [-v] [-q]\n");
+ printf ("[-m] [-e] [-W limit] [-K limit] [-v] [-q] [-E]\n");
}