summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorJan Wagner <waja@cyconet.org>2014-07-30 19:36:19 (GMT)
committerJan Wagner <waja@cyconet.org>2014-07-30 19:36:19 (GMT)
commitfe066559f29aa676d28cde30e28a3da66907ae0a (patch)
treefa1f5d5b1f6c08319646ff0fe283cb723ebd5eb5 /plugins
parentb43030cdd491322de1c026949691cf4117d78e09 (diff)
parent29844037cc4325fced47bdb7a15ddc9d995ac3b7 (diff)
downloadmonitoring-plugins-fe066559f29aa676d28cde30e28a3da66907ae0a.tar.gz
Merge pull request #1182 from waja/github984
Diffstat (limited to 'plugins')
-rw-r--r--plugins/check_disk.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 925dfa8..0d73a4f 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -171,6 +171,7 @@ main (int argc, char **argv)
171 char *details; 171 char *details;
172 char *perf; 172 char *perf;
173 char *preamble; 173 char *preamble;
174 char *flag_header;
174 double inode_space_pct; 175 double inode_space_pct;
175 double warning_high_tide; 176 double warning_high_tide;
176 double critical_high_tide; 177 double critical_high_tide;
@@ -353,18 +354,23 @@ main (int argc, char **argv)
353 if (disk_result==STATE_OK && erronly && !verbose) 354 if (disk_result==STATE_OK && erronly && !verbose)
354 continue; 355 continue;
355 356
356 xasprintf (&output, "%s %s %.0f %s (%.0f%%", 357 if(disk_result && verbose >= 1) {
357 output, 358 xasprintf(&flag_header, " %s [", state_text (disk_result));
359 } else {
360 xasprintf(&flag_header, "");
361 }
362 xasprintf (&output, "%s%s %s %.0f %s (%.0f%%",
363 output, flag_header,
358 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir, 364 (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
359 path->dfree_units, 365 path->dfree_units,
360 units, 366 units,
361 path->dfree_pct); 367 path->dfree_pct);
362 if (path->dused_inodes_percent < 0) { 368 if (path->dused_inodes_percent < 0) {
363 xasprintf(&output, "%s inode=-);", output); 369 xasprintf(&output, "%s inode=-)%s;", output, (disk_result ? "]" : ""));
364 } else { 370 } else {
365 xasprintf(&output, "%s inode=%.0f%%);", output, path->dfree_inodes_percent ); 371 xasprintf(&output, "%s inode=%.0f%%)%s;", output, path->dfree_inodes_percent, ((disk_result && verbose >= 1) ? "]" : ""));
366 } 372 }
367 373 free(flag_header);
368 /* TODO: Need to do a similar debug line 374 /* TODO: Need to do a similar debug line
369 xasprintf (&details, _("%s\n\ 375 xasprintf (&details, _("%s\n\
370%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"), 376%.0f of %.0f %s (%.0f%% inode=%.0f%%) free on %s (type %s mounted on %s) warn:%lu crit:%lu warn%%:%.0f%% crit%%:%.0f%%"),