check_systemd 2.0.8__tar.gz → 2.1.0__tar.gz

{check_systemd-2.0.8 → check_systemd-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check_systemd
-Version: 2.0.8
+Version: 2.1.0
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -11,12 +11,16 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         
         # check_systemd
         
-        Nagios / Icinga monitoring plugin to check systemd for failed units.
+        `check_systemd` is a
+        [Nagios](https://www.nagios.org) / [Icinga](https://icinga.com)
+        monitoring plugin to check [systemd](https://systemd.io) for failed
+        units.
         
-        This Python script will report a degraded system to Nagios / Icinga.
-        It requires only the nagiosplugin library.
+        This Python script will report a degraded system to your monitoring solution.
+        It requires only the
+        [nagiosplugin](https://nagiosplugin.readthedocs.io/en/stable) library.
         
-        You can also test a single service with -s parameter.
+        You can also test a single service with the `-u, --unit` parameter.
         
         Released under GNU GPLv2 License.
         
@@ -29,10 +33,10 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Command line interface
         
         ```
-        usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
+        usage: check_systemd [-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>
+        Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
         
         Nagios / Icinga monitoring plugin to check systemd for failed units.
         
@@ -41,10 +45,10 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
           -c SECONDS, --critical SECONDS
                                 Startup time in seconds to result in critical status.
           -e UNIT, --exclude UNIT
-                                Exclude a systemd unit from the checks. This option
-                                can be applied multiple times. For example: -e mnt-
-                                data.mount -e task.service.
-          -u UNIT, --unit UNIT  Name of the systemd unit that is beeing tested.
+                                Exclude a systemd unit from the checks. This option can be applied multiple times, for example: -e mnt-data.mount -e
+                                task.service. Regular expressions can be used to exclude multiple units at once, for example: -e 'user@\d+\.service'. For
+                                more informations see the Python documentation about regular expressions (https://docs.python.org/3/library/re.html).
+          -u UNIT, --unit UNIT  Name of the systemd unit that is being tested.
           -v, --verbose         Increase output verbosity (use up to 3 times).
           -V, --version         show program's version number and exit
           -w SECONDS, --warning SECONDS
@@ -64,14 +68,27 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         
         * https://github.com/Josef-Friedrich/check_systemd
         * https://exchange.icinga.com/joseffriedrich/check_systemd
-        * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd
+        * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd/details
         
         ## Testing
         
         ```
+        pyenv install 3.7.6
+        pyenv install 3.8.1
+        pyenv local 3.7.6 3.8.1
         pip3 install tox
         tox
         ```
+        
+        ## Deploying
+        
+        Edit version number in check_systemd.py (without `v`)
+        
+        ```
+        git tag v2.0.11
+        git push --tags
+        ```
+        
 Keywords: nagios,systemd
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable

{check_systemd-2.0.8 → check_systemd-2.1.0}/README.md

@@ -3,12 +3,16 @@
 
 # check_systemd
 
-Nagios / Icinga monitoring plugin to check systemd for failed units.
+`check_systemd` is a
+[Nagios](https://www.nagios.org) / [Icinga](https://icinga.com)
+monitoring plugin to check [systemd](https://systemd.io) for failed
+units.
 
-This Python script will report a degraded system to Nagios / Icinga.
-It requires only the nagiosplugin library.
+This Python script will report a degraded system to your monitoring solution.
+It requires only the
+[nagiosplugin](https://nagiosplugin.readthedocs.io/en/stable) library.
 
-You can also test a single service with -s parameter.
+You can also test a single service with the `-u, --unit` parameter.
 
 Released under GNU GPLv2 License.
 
@@ -21,10 +25,10 @@ pip3 install check_systemd
 ## Command line interface
 
 ```
-usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
+usage: check_systemd [-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>
+Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
 
 Nagios / Icinga monitoring plugin to check systemd for failed units.
 
@@ -33,10 +37,10 @@ optional arguments:
   -c SECONDS, --critical SECONDS
                         Startup time in seconds to result in critical status.
   -e UNIT, --exclude UNIT
-                        Exclude a systemd unit from the checks. This option
-                        can be applied multiple times. For example: -e mnt-
-                        data.mount -e task.service.
-  -u UNIT, --unit UNIT  Name of the systemd unit that is beeing tested.
+                        Exclude a systemd unit from the checks. This option can be applied multiple times, for example: -e mnt-data.mount -e
+                        task.service. Regular expressions can be used to exclude multiple units at once, for example: -e 'user@\d+\.service'. For
+                        more informations see the Python documentation about regular expressions (https://docs.python.org/3/library/re.html).
+  -u UNIT, --unit UNIT  Name of the systemd unit that is being tested.
   -v, --verbose         Increase output verbosity (use up to 3 times).
   -V, --version         show program's version number and exit
   -w SECONDS, --warning SECONDS
@@ -56,11 +60,23 @@ Performance data:
 
 * https://github.com/Josef-Friedrich/check_systemd
 * https://exchange.icinga.com/joseffriedrich/check_systemd
-* https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd
+* https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd/details
 
 ## Testing
 
 ```
+pyenv install 3.7.6
+pyenv install 3.8.1
+pyenv local 3.7.6 3.8.1
 pip3 install tox
 tox
-```
+```
+
+## Deploying
+
+Edit version number in check_systemd.py (without `v`)
+
+```
+git tag v2.0.11
+git push --tags
+```

{check_systemd-2.0.8 → check_systemd-2.1.0}/check_systemd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-systemd
-Version: 2.0.8
+Version: 2.1.0
 Summary: Nagios / Icinga monitoring plugin to check systemd for failed units.
 Home-page: https://github.com/Josef-Friedrich/check_systemd
 Author: Josef Friedrich
@@ -11,12 +11,16 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         
         # check_systemd
         
-        Nagios / Icinga monitoring plugin to check systemd for failed units.
+        `check_systemd` is a
+        [Nagios](https://www.nagios.org) / [Icinga](https://icinga.com)
+        monitoring plugin to check [systemd](https://systemd.io) for failed
+        units.
         
-        This Python script will report a degraded system to Nagios / Icinga.
-        It requires only the nagiosplugin library.
+        This Python script will report a degraded system to your monitoring solution.
+        It requires only the
+        [nagiosplugin](https://nagiosplugin.readthedocs.io/en/stable) library.
         
-        You can also test a single service with -s parameter.
+        You can also test a single service with the `-u, --unit` parameter.
         
         Released under GNU GPLv2 License.
         
@@ -29,10 +33,10 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Command line interface
         
         ```
-        usage: nosetests [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
+        usage: check_systemd [-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>
+        Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
         
         Nagios / Icinga monitoring plugin to check systemd for failed units.
         
@@ -41,10 +45,10 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
           -c SECONDS, --critical SECONDS
                                 Startup time in seconds to result in critical status.
           -e UNIT, --exclude UNIT
-                                Exclude a systemd unit from the checks. This option
-                                can be applied multiple times. For example: -e mnt-
-                                data.mount -e task.service.
-          -u UNIT, --unit UNIT  Name of the systemd unit that is beeing tested.
+                                Exclude a systemd unit from the checks. This option can be applied multiple times, for example: -e mnt-data.mount -e
+                                task.service. Regular expressions can be used to exclude multiple units at once, for example: -e 'user@\d+\.service'. For
+                                more informations see the Python documentation about regular expressions (https://docs.python.org/3/library/re.html).
+          -u UNIT, --unit UNIT  Name of the systemd unit that is being tested.
           -v, --verbose         Increase output verbosity (use up to 3 times).
           -V, --version         show program's version number and exit
           -w SECONDS, --warning SECONDS
@@ -64,14 +68,27 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         
         * https://github.com/Josef-Friedrich/check_systemd
         * https://exchange.icinga.com/joseffriedrich/check_systemd
-        * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd
+        * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd/details
         
         ## Testing
         
         ```
+        pyenv install 3.7.6
+        pyenv install 3.8.1
+        pyenv local 3.7.6 3.8.1
         pip3 install tox
         tox
         ```
+        
+        ## Deploying
+        
+        Edit version number in check_systemd.py (without `v`)
+        
+        ```
+        git tag v2.0.11
+        git push --tags
+        ```
+        
 Keywords: nagios,systemd
 Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable

{check_systemd-2.0.8 → check_systemd-2.1.0}/check_systemd.py

@@ -4,8 +4,7 @@
 You can redistribute it and/or modify it under the terms of the GNU General
 Public License as published by the Free Software Foundation, either version 2
 of the License.
-Copyright 2014-18 Andrea Briganti a.k.a 'Kbyte'
-Copyright 2019 Josef Friedrich
+Copyright see argparse help text.
 """
 import io
 import subprocess
@@ -15,7 +14,7 @@ import re
 import nagiosplugin
 from nagiosplugin import Metric
 
-__version__ = '2.0.8'
+__version__ = '2.1.0'
 
 
 class SystemdctlListUnitsResource(nagiosplugin.Resource):
@@ -27,6 +26,12 @@ class SystemdctlListUnitsResource(nagiosplugin.Resource):
     def __init__(self, excludes=[]):
         self.excludes = excludes
 
+    def re_match(self, unit):
+        for exclude in self.excludes:
+            if re.match(exclude, unit):
+                return(True)
+        return(False)
+
     def probe(self):
         """Query system state and return metrics.
 
@@ -66,13 +71,20 @@ class SystemdctlListUnitsResource(nagiosplugin.Resource):
                 unit = split_line[0]
                 # failed
                 active = split_line[2]
-                # Only count not excludes units.
-                if unit not in self.excludes:
+                # Only count not excluded units.
+                if not self.re_match(unit):
+                    # Quick fix:
+                    # Issue on Arch: “not-found” in column ACTIVE
+                    # maybe cli table output changed on newer versions of
+                    # systemd?
+                    # maybe .split() is not working correctly?
+                    if active not in units:
+                        units[active] = []
                     units[active].append(unit)
                     count_units += 1
 
             for unit in units['failed']:
-                if unit not in self.excludes:
+                if not self.re_match(unit):
                     yield Metric(name=unit, value='failed', context='unit')
 
             for active, unit_names in units.items():
@@ -103,6 +115,7 @@ def format_timespan_to_seconds(fmt_timespan):
         'h': 60 * 60,
         'min': 60,
         's': 1,
+        'ms': 0.001,
     }
     result = 0
     for span in fmt_timespan.split():
@@ -163,7 +176,7 @@ class SystemctlIsActiveResource(nagiosplugin.Resource):
 
     def __init__(self, *args, **kwargs):
         self.unit = kwargs.pop('unit')
-        super(nagiosplugin.Resource, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def probe(self):
         """Query system state and return metrics.
@@ -275,7 +288,7 @@ def get_argparser():
         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'
+        'Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>\n'
         '\n'
         'Nagios / Icinga monitoring plugin to check systemd for failed units.\n',  # noqa: E501
         epilog=  # noqa: E251
@@ -303,15 +316,20 @@ def get_argparser():
         action='append',
         default=[],
         help='Exclude a systemd unit from the checks. This option can be '
-             'applied multiple times. For example: -e mnt-data.mount -e '
-             'task.service.',
+             'applied multiple times, for example: -e mnt-data.mount -e '
+             'task.service. Regular expressions can be used to exclude '
+             'multiple units at once, for example: '
+             '-e \'user@\\d+\\.service\'. '
+             'For more informations see the Python documentation about '
+             'regular expressions '
+             '(https://docs.python.org/3/library/re.html).',
     )
 
     exclusive_group.add_argument(
         '-u', '--unit',
         type=str,
         dest='unit',
-        help='Name of the systemd unit that is beeing tested.',
+        help='Name of the systemd unit that is being tested.',
     )
 
     parser.add_argument(
@@ -337,7 +355,6 @@ def get_argparser():
     return parser
 
 
-@nagiosplugin.guarded
 def main():
     args = get_argparser().parse_args()