Merge pull request #1446 from monitoring-plugins/revert-1436-check_disk_iss1420

Revert "check_disk - show all disks if state is ok and option error only is used"

1 files changed, 4 insertions, 15 deletions

diff --git a/plugins/check_disk.c b/plugins/check_disk.c
index 4b5ba5fe..e73a0083 100644
--- a/plugins/check_disk.c
+++ b/plugins/check_disk.c
@@ -165,7 +165,6 @@ main (int argc, char **argv)
   int result = STATE_UNKNOWN;
   int disk_result = STATE_UNKNOWN;
   char *output;
-  char *ko_output;
   char *details;
   char *perf;
   char *preamble;
@@ -185,7 +184,6 @@ main (int argc, char **argv)
 
   preamble = strdup (" - free space:");
   output = strdup ("");
-  ko_output = strdup ("");
   details = strdup ("");
   perf = strdup ("");
   stat_buf = malloc(sizeof *stat_buf);
@@ -350,6 +348,9 @@ main (int argc, char **argv)
                           TRUE, 0,
                           TRUE, path->dtotal_units));
 
+      if (disk_result==STATE_OK && erronly && !verbose)
+        continue;
+
       if(disk_result && verbose >= 1) {
 	xasprintf(&flag_header, " %s [", state_text (disk_result));
       } else {
@@ -375,27 +376,15 @@ main (int argc, char **argv)
                 (unsigned long)w_df, (unsigned long)c_df, w_dfp, c_dfp);
       */
 
-      /* OS: #1420 save all not ok paths to different output, but only in case of error only option */
-      if (disk_result!=STATE_OK && erronly) {
-        xasprintf (&ko_output, "%s%s %s %.0f %s (%.0f%%",
-                ko_output, flag_header,
-                (!strcmp(me->me_mountdir, "none") || display_mntp) ? me->me_devname : me->me_mountdir,
-                path->dfree_units,
-                units,
-                path->dfree_pct);
-      }
-
     }
 
-    /* OS: #1420 only show offending paths if error only option is set, but show all paths if everything is ok */
-    output = (erronly && result!=STATE_OK) ? ko_output : output;
   }
 
   if (verbose >= 2)
     xasprintf (&output, "%s%s", output, details);
 
 
-  printf ("DISK %s%s%s|%s\n", state_text (result), preamble, output, perf);
+  printf ("DISK %s%s%s|%s\n", state_text (result), (erronly && result==STATE_OK) ? "" : preamble, output, perf);
   return result;
 }