refactor(fs-inodes): improve code

Author: markuslf

CHANGELOG.md

@@ -38,6 +38,8 @@ Build, CI/CD:
 Monitoring Plugins:
 
 * fail2ban: be a bit more verbose in case everything is ok
+* fs-inodes: improve code
+* icinga-topflap-services: increase default warning level from 5 to 7
 * php-status: bz2 and curl are no default modules
 
 

check-plugins/fs-inodes/README.rst

@@ -4,9 +4,9 @@ Check fs-inodes
 Overview
 --------
 
-Checks the percentage of inode space used. To do this, this plugin fetches a list of local devices that are in use and have a filesystem on them. Filesystems that do not report inode usage are skipped.
+Checks the percentage of inode space used. To do this, this plugin fetches a list of local devices that are in use and have a filesystem on them. Filesystems that do not report inode usage (e.g. btrfs) are skipped.
 
-If you get an alert, use `find $MOUNT -xdev -printf '%h\n\' | sort | uniq -c | sort -k 1 -n | tail -n 10` to find where inodes are being used. This prints a top 10 list of directories prefixed with the number of files (and subdirectories).
+If you get an alert, use `find $MOUNT -xdev -printf '%h\n' | sort | uniq --count | sort --key=1 --numeric-sort --reverse | head -n 10` to find where inodes are being used. This finds the 10 directories under $MOUNT that have the most files inside them.
 
 
 Fact Sheet

check-plugins/fs-inodes/fs-inodes

@@ -40,7 +40,7 @@ def parse_args():
     parser.add_argument(
         '-V', '--version',
         action='version',
-        version='{0}: v{1} by {2}'.format('%(prog)s', __version__, __author__)
+        version=f'%(prog)s: v{__version__} by {__author__}'
     )
 
     parser.add_argument(
@@ -89,10 +89,12 @@ def main():
     except SystemExit:
         sys.exit(STATE_UNKNOWN)
 
-    msg = ''
+    # init some vars
+    msg = []
     perfdata = ''
     state = STATE_OK
 
+    # analyze data
     real_disks = lib.disk.get_real_disks()
     for disk in real_disks:
         mount = disk['mp'].split(' ')[0]
@@ -104,20 +106,18 @@ def main():
             inodes_free = float(st.f_ffree)
             inodes_used = round((inodes_total - inodes_free) / inodes_total * 100, 1)
 
-            msg += '{} {}%, '.format(mount, inodes_used)
-            perfdata += lib.base.get_perfdata(mount, inodes_used, '%', args.WARN, args.CRIT, 0, 100)
+            local_state = lib.base.get_state(inodes_used, args.WARN, args.CRIT)
+            state = lib.base.get_worst(local_state, state)
 
-            if inodes_used >= args.CRIT:
-                state = lib.base.get_worst(state, STATE_CRIT)
-                msg = msg[:-2] + ' (CRIT), '
-            elif inodes_used >= args.WARN:
-                state = lib.base.get_worst(state, STATE_WARN)
-                msg = msg[:-2] + ' (WARN), '
+            msg.append(f'{mount} {inodes_used}%{lib.base.state2str(local_state, prefix=" ")}')
+            perfdata += lib.base.get_perfdata(mount, inodes_used, '%', args.WARN, args.CRIT, 0, 100)
         except Exception:
             lib.base.cu('Something seems to be wrong with the input parameter')
+
+    # build the message
     if not msg:
         lib.base.oao('Everything is ok (although nothing checked).', state)
-    msg = msg[:-2]
+    msg = ', '.join(msg)
     if state != STATE_OK:
         msg += '. Have a look at the README on how to find where inodes are being used.'