check_systemd 2.0.3__tar.gz → 2.0.4__tar.gz

{check_systemd-2.0.3 → check_systemd-2.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check_systemd
-Version: 2.0.3
+Version: 2.0.4
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -31,6 +31,9 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ```
         usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
         
+        Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
+        Copyright (c) 2019 Josef Friedrich <josef@friedrich.rocks>
+        
         Nagios / Icinga monitoring plugin to check systemd for failed units.
         
         optional arguments:
@@ -47,6 +50,14 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
           -w SECONDS, --warning SECONDS
                                 Startup time in seconds to result in warning status.
         
+        Performance data:
+          - count_units
+          - startup_time
+          - units_activating
+          - units_active
+          - units_failed
+          - units_inactive
+        
         ```
         
         ## Project pages

{check_systemd-2.0.3 → check_systemd-2.0.4}/README.md

@@ -23,6 +23,9 @@ pip3 install check_systemd
 ```
 usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
 
+Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
+Copyright (c) 2019 Josef Friedrich <josef@friedrich.rocks>
+
 Nagios / Icinga monitoring plugin to check systemd for failed units.
 
 optional arguments:
@@ -39,6 +42,14 @@ optional arguments:
   -w SECONDS, --warning SECONDS
                         Startup time in seconds to result in warning status.
 
+Performance data:
+  - count_units
+  - startup_time
+  - units_activating
+  - units_active
+  - units_failed
+  - units_inactive
+
 ```
 
 ## Project pages

{check_systemd-2.0.3 → check_systemd-2.0.4}/check_systemd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-systemd
-Version: 2.0.3
+Version: 2.0.4
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -31,6 +31,9 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ```
         usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
         
+        Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
+        Copyright (c) 2019 Josef Friedrich <josef@friedrich.rocks>
+        
         Nagios / Icinga monitoring plugin to check systemd for failed units.
         
         optional arguments:
@@ -47,6 +50,14 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
           -w SECONDS, --warning SECONDS
                                 Startup time in seconds to result in warning status.
         
+        Performance data:
+          - count_units
+          - startup_time
+          - units_activating
+          - units_active
+          - units_failed
+          - units_inactive
+        
         ```
         
         ## Project pages

{check_systemd-2.0.3 → check_systemd-2.0.4}/check_systemd.py

@@ -15,7 +15,7 @@ import re
 import nagiosplugin
 from nagiosplugin import Metric
 
-__version__ = '2.0.3'
+__version__ = '2.0.4'
 
 
 class SystemdctlListUnitsResource(nagiosplugin.Resource):
@@ -136,10 +136,18 @@ class SystemdAnalyseResource(nagiosplugin.Resource):
             raise nagiosplugin.CheckError(stderr)
 
         if stdout:
+            stdout = stdout.decode('utf-8')
+            # First line:
+            # Startup finished in 1.672s (kernel) + 21.378s (userspace) =
+            # 23.050s
+
+            # On raspian no second line
             # Second line:
             # graphical.target reached after 1min 2.154s in userspace
-            match = re.search(r'reached after (.+) in userspace',
-                              stdout.decode('utf-8'))
+            match = re.search(r'reached after (.+) in userspace', stdout)
+
+            if not match:
+                match = re.search(r' = (.+)\n', stdout)
 
         yield Metric(name='startup_time',
                      value=format_timespan_to_seconds(match.group(1)),
@@ -261,8 +269,20 @@ class SystemdSummary(nagiosplugin.Summary):
 
 def get_argparser():
     parser = argparse.ArgumentParser(
-        description='Nagios / Icinga monitoring plugin to check systemd for '
-                    'failed units.'
+        formatter_class=argparse.RawDescriptionHelpFormatter,
+        description=  # noqa: E251
+        'Copyright (c) 2014-18 Andrea Briganti a.k.a \'Kbyte\' <kbytesys@gmail.com>\n'  # noqa: E501
+        'Copyright (c) 2019 Josef Friedrich <josef@friedrich.rocks>\n'
+        '\n'
+        'Nagios / Icinga monitoring plugin to check systemd for failed units.\n',  # noqa: E501
+        epilog=  # noqa: E251
+        'Performance data:\n'
+        '  - count_units\n'
+        '  - startup_time\n'
+        '  - units_activating\n'
+        '  - units_active\n'
+        '  - units_failed\n'
+        '  - units_inactive\n',
     )
 
     exclusive_group = parser.add_mutually_exclusive_group()