[Nagiosplug-checkins] CVS: nagiosplug/plugins utils.h,1.5,1.6 check_disk.c,1.27,1.28
Karl DeBisschop
kdebisschop at users.sourceforge.net
Thu Jul 31 04:03:04 CEST 2003
Update of /cvsroot/nagiosplug/nagiosplug/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv21666/plugins
Modified Files:
utils.h check_disk.c
Log Message:
mark for translation
Index: utils.h
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/utils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** utils.h 30 Jul 2003 04:07:53 -0000 1.5
--- utils.h 31 Jul 2003 11:02:42 -0000 1.6
***************
*** 123,124 ****
--- 123,128 ----
-t, --timeout=INTEGER\n\
Seconds before connection times out (default: %d)\n"
+
+ #define TIMEOUT "\
+ -t, --timeout=INTEGER\n\
+ Seconds before connection times out (default: %d)\n"
Index: check_disk.c
===================================================================
RCS file: /cvsroot/nagiosplug/nagiosplug/plugins/check_disk.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -r1.27 -r1.28
*** check_disk.c 30 Jun 2003 17:02:19 -0000 1.27
--- check_disk.c 31 Jul 2003 11:02:43 -0000 1.28
***************
*** 20,35 ****
const char *revision = "$Revision$";
const char *copyright = "1999-2003";
- const char *authors = "Nagios Plugin Development Team";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
! const char *summary = "\
This plugin checks the amount of used disk space on a mounted file system\n\
! and generates an alert if free space is less than one of the threshold values.";
! const char *option_summary = "\
! -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
! [-v] [-q]";
! const char *options = "\
-w, --warning=INTEGER\n\
Exit with WARNING status if less than INTEGER kilobytes of disk are free\n\
--- 20,66 ----
const char *revision = "$Revision$";
const char *copyright = "1999-2003";
const char *email = "nagiosplug-devel at lists.sourceforge.net";
! #include "common.h"
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #endif
! #include <assert.h>
! #include "popen.h"
! #include "utils.h"
! #include <stdarg.h>
! #include "../lib/fsusage.h"
! #include "../lib/mountlist.h"
! #if HAVE_LIMITS_H
! # include <limits.h>
! #endif
!
! void
! print_usage (void)
! {
! printf (_("\
! Usage: %s -w limit -c limit [-p path | -x device] [-t timeout] [-m] [-e]\n\
! [-v] [-q]\n\
! %s (-h|--help)\n\
! %s (-V|--version)\n"),
! progname, progname, progname);
! }
!
! void
! print_help (void)
! {
! print_revision (progname, revision);
!
! printf (_(COPYRIGHT), copyright, email);
!
! printf (_("\
This plugin checks the amount of used disk space on a mounted file system\n\
! and generates an alert if free space is less than one of the threshold values."));
! print_usage ();
!
! printf (_(HELP_VRSN));
! printf (_("\
-w, --warning=INTEGER\n\
Exit with WARNING status if less than INTEGER kilobytes of disk are free\n\
***************
*** 40,43 ****
--- 71,78 ----
-c, --critical=PERCENT%%\n\
Exit with CRITCAL status if less than PERCENT of disk space is free\n\
+ -C, --clear\n\
+ Clear thresholds\n"));
+
+ printf (_("\
-u, --units=STRING\n\
Choose bytes, kB, MB, GB, TB (default: MB)\n\
***************
*** 45,49 ****
Same as '--units kB'\n\
-m, --megabytes\n\
! Same as '--units MB'\n\
-l, --local\n\
Only check local filesystems\n\
--- 80,86 ----
Same as '--units kB'\n\
-m, --megabytes\n\
! Same as '--units MB'\n"));
!
! printf (_("\
-l, --local\n\
Only check local filesystems\n\
***************
*** 57,94 ****
Display the mountpoint instead of the partition\n\
-e, --errors-only\n\
! Display only devices/mountpoints with errors\n\
! -C, --clear\n\
! Clear thresholds\n\
! -v, --verbose\n\
! Show details for command-line debugging (do not use with nagios server)\n\
! -h, --help\n\
! Print detailed help screen\n\
! -V, --version\n\
! Print version information\n";
! const char *notes = "\
! \n";
! const char *examples = "\
check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n\
! Checks /tmp and /var at 10%,5% and / at 100MB, 50MB\n\
! \n";
! #include "common.h"
! #if HAVE_INTTYPES_H
! # include <inttypes.h>
! #endif
! #include <assert.h>
! #include "popen.h"
! #include "utils.h"
! #include <stdarg.h>
! #include "../lib/fsusage.h"
! #include "../lib/mountlist.h"
! #if HAVE_LIMITS_H
! # include <limits.h>
! #endif
/* If nonzero, show inode information. */
! static int inode_format;
/* If nonzero, show even filesystems with zero size or
--- 94,113 ----
Display the mountpoint instead of the partition\n\
-e, --errors-only\n\
! Display only devices/mountpoints with errors\n"));
! printf (_(TIMEOUT), DEFAULT_SOCKET_TIMEOUT);
! printf (_(VRBS));
!
! printf ("%s", _("Examples:\n\
check_disk -w 10% -c 5% -p /tmp -p /var -C -w 100000 -c 50000 -p /\n\
! Checks /tmp and /var at 10%,5% and / at 100MB, 50MB\n"));
! support ();
! }
!
/* If nonzero, show inode information. */
! /* static int inode_format; */
/* If nonzero, show even filesystems with zero size or
***************
*** 101,105 ****
/* If positive, the units to use when printing sizes;
if negative, the human-readable base. */
! static int output_block_size;
/* If nonzero, invoke the `sync' system call before getting any usage data.
--- 120,124 ----
/* If positive, the units to use when printing sizes;
if negative, the human-readable base. */
! /* static int output_block_size; */
/* If nonzero, invoke the `sync' system call before getting any usage data.
***************
*** 107,111 ****
busy disks. Note that this may make a difference on some systems --
SunOs4.1.3, for one. It is *not* necessary on Linux. */
! static int require_sync = 0;
/* A filesystem type to display. */
--- 126,130 ----
busy disks. Note that this may make a difference on some systems --
SunOs4.1.3, for one. It is *not* necessary on Linux. */
! /* static int require_sync = 0; */
/* A filesystem type to display. */
***************
*** 117,122 ****
int w_df;
int c_df;
! float w_dfp;
! float c_dfp;
struct name_list *name_next;
};
--- 136,141 ----
int w_df;
int c_df;
! double w_dfp;
! double c_dfp;
struct name_list *name_next;
};
***************
*** 133,137 ****
4.2 4.3 ufs nfs swap ignore io vm efs dbg */
! static struct name_list *fs_select_list;
/* Linked list of filesystem types to omit.
--- 152,156 ----
4.2 4.3 ufs nfs swap ignore io vm efs dbg */
! /* static struct name_list *fs_select_list; */
/* Linked list of filesystem types to omit.
***************
*** 163,176 ****
int process_arguments (int, char **);
! int validate_arguments (int, int, float, float, char *);
int check_disk (int usp, int free_disk);
int walk_name_list (struct name_list *list, const char *name);
- void print_help (void);
- void print_usage (void);
int w_df = -1;
int c_df = -1;
! float w_dfp = -1.0;
! float c_dfp = -1.0;
char *path = "";
char *exclude_device = "";
--- 182,193 ----
int process_arguments (int, char **);
! int validate_arguments (int, int, double, double, char *);
int check_disk (int usp, int free_disk);
int walk_name_list (struct name_list *list, const char *name);
int w_df = -1;
int c_df = -1;
! double w_dfp = -1.0;
! double c_dfp = -1.0;
char *path = "";
char *exclude_device = "";
***************
*** 188,200 ****
{
int usp = -1;
- int total_disk = -1;
- int used_disk = -1;
- int free_disk = -1;
int result = STATE_UNKNOWN;
int disk_result = STATE_UNKNOWN;
- char *command_line = "";
- char input_buffer[MAX_INPUT_BUFFER];
char file_system[MAX_INPUT_BUFFER];
- char mntp[MAX_INPUT_BUFFER];
char *output = "";
char *details = "";
--- 205,211 ----
***************
*** 204,213 ****
struct fs_usage fsp;
struct name_list *temp_list;
- char *disk;
mount_list = read_filesystem_list (0);
if (process_arguments (argc, argv) != OK)
! usage ("Could not parse arguments\n");
for (me = mount_list; me; me = me->me_next) {
--- 215,223 ----
struct fs_usage fsp;
struct name_list *temp_list;
mount_list = read_filesystem_list (0);
if (process_arguments (argc, argv) != OK)
! usage (_("Could not parse arguments\n"));
for (me = mount_list; me; me = me->me_next) {
***************
*** 226,231 ****
continue;
else if (dp_exclude_list &&
! walk_name_list (dp_exclude_list, me->me_devname) ||
! walk_name_list (dp_exclude_list, me->me_mountdir))
continue;
else
--- 236,241 ----
continue;
else if (dp_exclude_list &&
! (walk_name_list (dp_exclude_list, me->me_devname) ||
! walk_name_list (dp_exclude_list, me->me_mountdir)))
continue;
else
***************
*** 243,247 ****
total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
if (disk_result!=STATE_OK || verbose>=0)
! asprintf (&output, "%s [%.0f %s (%.0f%%) free on %s]",
output,
free_space,
--- 253,257 ----
total_space = (float)fsp.fsu_blocks*fsp.fsu_blocksize/mult;
if (disk_result!=STATE_OK || verbose>=0)
! asprintf (&output, ("%s [%.0f %s (%.0f%%) free on %s]"),
output,
free_space,
***************
*** 249,253 ****
free_space_pct,
(!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
! asprintf (&details, "%s\n%.0f of %.0f %s (%.0f%%) free on %s (type %s mounted on %s) warn:%d crit:%d warn%%:%.0f%% crit%%:%.0f%%",
details,
free_space,
--- 259,263 ----
free_space_pct,
(!strcmp(file_system, "none") || display_mntp) ? me->me_devname : me->me_mountdir);
! asprintf (&details, _("%s\n%.0f of %.0f %s (%.0f%%) free on %s (type %s mounted on %s) warn:%d crit:%d warn%%:%.0f%% crit%%:%.0f%%"),
details,
free_space,
***************
*** 270,274 ****
while (temp_list) {
if (temp_list->found != TRUE) {
! asprintf (&output, "%s [%s not found]", output, temp_list->name);
result = STATE_CRITICAL;
}
--- 280,284 ----
while (temp_list) {
if (temp_list->found != TRUE) {
! asprintf (&output, _("%s [%s not found]"), output, temp_list->name);
result = STATE_CRITICAL;
}
***************
*** 277,280 ****
--- 287,291 ----
terminate (result, "DISK %s%s\n", state_text (result), output, details);
+ return STATE_UNKNOWN;
}
***************
*** 289,293 ****
struct name_list *se;
struct name_list **pathtail = &path_select_list;
- struct name_list **devtail = &dev_select_list;
struct name_list **fstail = &fs_exclude_list;
struct name_list **dptail = &dp_exclude_list;
--- 300,303 ----
***************
*** 344,350 ****
}
else {
! usage ("Timeout Interval must be an integer!\n");
}
! case 'w': /* warning time threshold */
if (is_intnonneg (optarg)) {
w_df = atoi (optarg);
--- 354,360 ----
}
else {
! usage (_("Timeout Interval must be an integer!\n"));
}
! case 'w': /* warning threshold */
if (is_intnonneg (optarg)) {
w_df = atoi (optarg);
***************
*** 353,366 ****
else if (strpbrk (optarg, ",:") &&
strstr (optarg, "%") &&
! sscanf (optarg, "%d%*[:,]%f%%", &w_df, &w_dfp) == 2) {
break;
}
! else if (strstr (optarg, "%") && sscanf (optarg, "%f%%", &w_dfp) == 1) {
break;
}
else {
! usage ("Warning threshold must be integer or percentage!\n");
}
! case 'c': /* critical time threshold */
if (is_intnonneg (optarg)) {
c_df = atoi (optarg);
--- 363,376 ----
else if (strpbrk (optarg, ",:") &&
strstr (optarg, "%") &&
! sscanf (optarg, "%d%*[:,]%lf%%", &w_df, &w_dfp) == 2) {
break;
}
! else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &w_dfp) == 1) {
break;
}
else {
! usage (_("Warning threshold must be integer or percentage!\n"));
}
! case 'c': /* critical threshold */
if (is_intnonneg (optarg)) {
c_df = atoi (optarg);
***************
*** 369,380 ****
else if (strpbrk (optarg, ",:") &&
strstr (optarg, "%") &&
! sscanf (optarg, "%d%*[,:]%f%%", &c_df, &c_dfp) == 2) {
break;
}
! else if (strstr (optarg, "%") && sscanf (optarg, "%f%%", &c_dfp) == 1) {
break;
}
else {
! usage ("Critical threshold must be integer or percentage!\n");
}
case 'u':
--- 379,390 ----
else if (strpbrk (optarg, ",:") &&
strstr (optarg, "%") &&
! sscanf (optarg, "%d%*[,:]%lf%%", &c_df, &c_dfp) == 2) {
break;
}
! else if (strstr (optarg, "%") && sscanf (optarg, "%lf%%", &c_dfp) == 1) {
break;
}
else {
! usage (_("Critical threshold must be integer or percentage!\n"));
}
case 'u':
***************
*** 395,399 ****
units = "TB";
} else {
! terminate (STATE_UNKNOWN, "unit type %s not known\n", optarg);
}
break;
--- 405,409 ----
units = "TB";
} else {
! terminate (STATE_UNKNOWN, _("unit type %s not known\n"), optarg);
}
break;
***************
*** 459,463 ****
exit (STATE_OK);
case '?': /* help */
! usage ("check_disk: unrecognized option\n");
break;
}
--- 469,473 ----
exit (STATE_OK);
case '?': /* help */
! usage (_("check_disk: unrecognized option\n"));
break;
}
***************
*** 486,490 ****
temp_list = path_select_list;
while (temp_list) {
! if (validate_arguments (temp_list->w_df, temp_list->c_df, temp_list->w_dfp, temp_list->c_dfp, temp_list->name) == ERROR)
result = ERROR;
temp_list = temp_list->name_next;
--- 496,504 ----
temp_list = path_select_list;
while (temp_list) {
! if (validate_arguments (temp_list->w_df,
! temp_list->c_df,
! temp_list->w_dfp,
! temp_list->c_dfp,
! temp_list->name) == ERROR)
result = ERROR;
temp_list = temp_list->name_next;
***************
*** 497,528 ****
! void print_path (char *path)
{
! if (path)
! printf (" for %s", path);
printf ("\n");
}
int
! validate_arguments (int w, int c, float wp, float cp, char *path)
{
! if (w < 0 && c < 0 && wp < 0 && cp < 0) {
! printf ("INPUT ERROR: No thresholds specified");
! print_path (path);
return ERROR;
}
! else if ((wp >= 0 || cp >= 0)
! && (wp < 0 || cp < 0 || wp > 100 || cp > 100
! || cp > wp)) {
! printf
! ("INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive",
! cp, wp);
print_path (path);
return ERROR;
}
else if ((w > 0 || c > 0) && (w < 0 || c < 0 || c > w)) {
! printf
! ("INPUT ERROR: C_DF (%d) should be less than W_DF (%d) and both should be greater than zero",
! c, w);
print_path (path);
return ERROR;
--- 511,541 ----
! void print_path (char *mypath)
{
! if (mypath)
! printf (" for %s", mypath);
printf ("\n");
}
int
! validate_arguments (int w, int c, double wp, double cp, char *mypath)
{
! if (w < 0 && c < 0 && wp < 0.0 && cp < 0.0) {
! printf (_("INPUT ERROR: No thresholds specified"));
! print_path (mypath);
return ERROR;
}
! else if ((wp >= 0.0 || cp >= 0.0) &&
! (wp < 0.0 || cp < 0.0 || wp > 100.0 || cp > 100.0 || cp > wp)) {
! printf (_("\
! INPUT ERROR: C_DFP (%f) should be less than W_DFP (%.1f) and both should be between zero and 100 percent, inclusive"),
! cp, wp);
print_path (path);
return ERROR;
}
else if ((w > 0 || c > 0) && (w < 0 || c < 0 || c > w)) {
! printf (_("\
! INPUT ERROR: C_DF (%d) should be less than W_DF (%d) and both should be greater than zero"),
! c, w);
print_path (path);
return ERROR;
***************
*** 572,600 ****
}
return FALSE;
- }
-
-
-
-
- void
- print_help (void)
- {
- print_revision (progname, revision);
- printf ("Copyright (c) %s %s\n\t<%s>\n\n%s\n",
- copyright, authors, email, summary);
- print_usage ();
- printf ("\nOptions:\n");
- printf (options);
- printf (notes);
- printf ("Examples:\n%s", examples);
- support ();
- }
-
- void
- print_usage (void)
- {
- printf
- ("Usage: %s %s\n"
- " %s (-h|--help)\n"
- " %s (-V|--version)\n", progname, option_summary, progname, progname);
}
--- 585,587 ----
More information about the Commits
mailing list