check_systemd 2.2.0__tar.gz → 2.2.1__tar.gz

{check_systemd-2.2.0 → check_systemd-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check_systemd
-Version: 2.2.0
+Version: 2.2.1
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -102,7 +102,7 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         To detect failed units this monitoring script runs:
         
         ```sh
-        systemctl list-units --all --no-legend
+        systemctl list-units --all
         ```
         
         To get the startup time it executes:
@@ -126,9 +126,9 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Testing
         
         ```
-        pyenv install 3.7.6
-        pyenv install 3.8.1
-        pyenv local 3.7.6 3.8.1
+        pyenv install 3.6.12
+        pyenv install 3.7.9
+        pyenv local 3.6.12 3.7.9
         pip3 install tox
         tox
         ```

{check_systemd-2.2.0 → check_systemd-2.2.1}/README.md

@@ -94,7 +94,7 @@ Performance data:
 To detect failed units this monitoring script runs:
 
 ```sh
-systemctl list-units --all --no-legend
+systemctl list-units --all
 ```
 
 To get the startup time it executes:
@@ -118,9 +118,9 @@ systemctl list-timers --all
 ## Testing
 
 ```
-pyenv install 3.7.6
-pyenv install 3.8.1
-pyenv local 3.7.6 3.8.1
+pyenv install 3.6.12
+pyenv install 3.7.9
+pyenv local 3.6.12 3.7.9
 pip3 install tox
 tox
 ```

{check_systemd-2.2.0 → check_systemd-2.2.1}/check_systemd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-systemd
-Version: 2.2.0
+Version: 2.2.1
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -102,7 +102,7 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         To detect failed units this monitoring script runs:
         
         ```sh
-        systemctl list-units --all --no-legend
+        systemctl list-units --all
         ```
         
         To get the startup time it executes:
@@ -126,9 +126,9 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Testing
         
         ```
-        pyenv install 3.7.6
-        pyenv install 3.8.1
-        pyenv local 3.7.6 3.8.1
+        pyenv install 3.6.12
+        pyenv install 3.7.9
+        pyenv local 3.6.12 3.7.9
         pip3 install tox
         tox
         ```

{check_systemd-2.2.0 → check_systemd-2.2.1}/check_systemd.py

@@ -14,7 +14,7 @@ import re
 import nagiosplugin
 from nagiosplugin import Metric
 
-__version__ = '2.2.0'
+__version__ = '2.2.1'
 
 
 class SystemctlListUnitsResource(nagiosplugin.Resource):
@@ -41,8 +41,8 @@ class SystemctlListUnitsResource(nagiosplugin.Resource):
         # We don’t use `systemctl --failed --no-legend`, because we want to
         # collect performance data of all units.
         try:
-            p = subprocess.Popen(['systemctl', 'list-units', '--all',
-                                  '--no-legend'],
+            # p = subprocess.Popen(['./test/bin/ok/systemctl', 'list-units', '--all'],  # noqa: E501
+            p = subprocess.Popen(['systemctl', 'list-units', '--all'],
                                  stderr=subprocess.PIPE,
                                  stdin=subprocess.PIPE,
                                  stdout=subprocess.PIPE)
@@ -61,16 +61,32 @@ class SystemctlListUnitsResource(nagiosplugin.Resource):
             'inactive': [],
         }
         if stdout:
-            # Output of `systemctl list-units --all --no-legend`:
+            lines = stdout.decode('utf-8').splitlines()
+            table_heading = lines[0]
+
+            # Remove the first line because it is the header.
+
+            # Remove the  last seven lines:
+
+            # empty line
+            # LOAD   = Reflects whether the unit definition...
+            # ACTIVE = The high-level unit activation state...
+            # SUB    = The low-level unit activation state...
+            # empty line
+            # xxx loaded units listed. Pass --all to see ...
+            # To show all installed unit files use...
+            table_body = lines[1:-7]
+            table_parser = TableParser(table_heading)
+            # Output of `systemctl list-units --all:
             # UNIT           LOAD   ACTIVE SUB     JOB   DESCRIPTION
             # foobar.service loaded active waiting       Description text
             count_units = 0
-            for line in io.StringIO(stdout.decode('utf-8')):
-                split_line = line.split()
+            for line in table_body:
                 # foobar.service
-                unit = split_line[0]
+                unit = table_parser.get_column_text(line, 'UNIT')
                 # failed
-                active = split_line[2]
+                active = table_parser.get_column_text(line, 'ACTIVE')
+
                 # Only count not excluded units.
                 if not self.re_match(unit):
                     # Quick fix:
@@ -183,6 +199,37 @@ class SystemdAnalyseResource(nagiosplugin.Resource):
                              context='startup_time')
 
 
+class TableParser:
+    """A parser for the various table outputs of different systemd commands."""
+
+    def __init__(self, heading_row):
+        """
+        :param str heading_row: A row with column titles.
+        """
+        self.heading_row = heading_row
+
+    def detect_column_boundaries(self, column_title):
+        """
+        :param str column_title: The title of the column, for example UNIT,
+        ACTIVE. The column title must be included in the heading row.
+        """
+        match = re.search(re.compile(column_title + r'\s*'), self.heading_row)
+        return [match.start(), match.end()]
+
+    def get_column_text(self, row, column_title):
+        """Get the text of a certain column, that is specified by the column
+        title. Leading and trailing whitespaces are removed.
+
+        :param str row: The current row of the table to extract a certain
+          column.
+        :param str column_title: The title of the column, for example UNIT,
+          ACTIVE. The column title must be included in the heading row.
+        """
+        boundaries = self.detect_column_boundaries(column_title)
+        column = row[boundaries[0]:boundaries[1]]
+        return column.strip()
+
+
 class SystemctlListTimersResource(nagiosplugin.Resource):
     """There is one type of systemd "degradation" which is normally not
     detected: dead / inactive timers.