PyPI - check_systemd - Versions diffs - 2.1.0__tar.gz → 2.2.1__tar.gz - Mend

check_systemd 2.1.0tar.gz → 2.2.1tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

{check_systemd-2.1.0 → check_systemd-2.2.1}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check_systemd
-Version: 2.1.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
@@ -33,7 +33,8 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Command line interface
         ```
-        usage: check_systemd [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
+        usage: check_systemd [-h] [-u UNIT | -e UNIT] [-n] [-w SECONDS] [-c SECONDS]
+                             [-t] [-W SECONDS] [-C SECONDS] [-v] [-V]
         Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
         Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
@@ -42,17 +43,43 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         optional arguments:
           -h, --help            show this help message and exit
-          -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. 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.
+          -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. 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).
+          -n, --no-startup-time
+                                Don’t check the startup time. Using this option the
+                                options '-w, --warning' and '-c, --critical' have no
+                                effect. Performance data about the startup time is
+                                collected, but no critical, warning etc. states are
+                                triggered.
+          -w SECONDS, --warning SECONDS
+                                Startup time in seconds to result in a warning status.
+                                Thedefault is 60 seconds.
+          -c SECONDS, --critical SECONDS
+                                Startup time in seconds to result in a critical status.
+                                Thedefault is 120 seconds.
+          -t, --dead-timers     Detect dead / inactive timers. See the corresponding
+                                options '-W, --dead-timer-warning' and '-C, --dead-
+                                timers-critical'. Dead timers are detected by parsing
+                                the output of 'systemctl list-timers'. Dead timer rows
+                                displaying 'n/a' in the NEXT and LEFTcolumns and the
+                                time span in the column PASSED exceeds the values
+                                specified with the options '-W, --dead-timer-warning'
+                                and '-C, --dead-timers-critical'.
+          -W SECONDS, --dead-timers-warning SECONDS
+                                Time ago in seconds for dead / inactive timers to
+                                trigger a warning state (by default 6 days).
+          -C SECONDS, --dead-timers-critical SECONDS
+                                Time ago in seconds for dead / inactive timers to
+                                trigger a critical state (by default 7 days).
           -v, --verbose         Increase output verbosity (use up to 3 times).
           -V, --version         show program's version number and exit
-          -w SECONDS, --warning SECONDS
-                                Startup time in seconds to result in warning status.
         Performance data:
           - count_units
@@ -70,12 +97,38 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         * https://exchange.icinga.com/joseffriedrich/check_systemd
         * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd/details
+        ## Behind the scenes
+        To detect failed units this monitoring script runs:
+        ```sh
+        systemctl list-units --all
+        ```
+        To get the startup time it executes:
+        ```sh
+        systemd-analyze
+        ```
+        To check a specific  unit (`-u, --unit`) this command is executed:
+        ```sh
+        systemctl is-active <unit-name>
+        ```
+        To find dead timers this plugin launches:
+        ```sh
+        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.1/README.md ADDED Viewed

@@ -0,0 +1,135 @@
+[![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https://pypi.python.org/pypi/check_systemd)
+[![Build Status](https://travis-ci.org/Josef-Friedrich/check_systemd.svg?branch=master)](https://travis-ci.org/Josef-Friedrich/check_systemd)
+# check_systemd
+`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 your monitoring solution.
+It requires only the
+[nagiosplugin](https://nagiosplugin.readthedocs.io/en/stable) library.
+You can also test a single service with the `-u, --unit` parameter.
+Released under GNU GPLv2 License.
+## Installation
+```
+pip3 install check_systemd
+```
+## Command line interface
+```
+usage: check_systemd [-h] [-u UNIT | -e UNIT] [-n] [-w SECONDS] [-c SECONDS]
+                     [-t] [-W SECONDS] [-C SECONDS] [-v] [-V]
+Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
+Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
+Nagios / Icinga monitoring plugin to check systemd for failed units.
+optional arguments:
+  -h, --help            show this help message and exit
+  -u UNIT, --unit UNIT  Name of the systemd unit that is being tested.
+  -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. 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).
+  -n, --no-startup-time
+                        Don’t check the startup time. Using this option the
+                        options '-w, --warning' and '-c, --critical' have no
+                        effect. Performance data about the startup time is
+                        collected, but no critical, warning etc. states are
+                        triggered.
+  -w SECONDS, --warning SECONDS
+                        Startup time in seconds to result in a warning status.
+                        Thedefault is 60 seconds.
+  -c SECONDS, --critical SECONDS
+                        Startup time in seconds to result in a critical status.
+                        Thedefault is 120 seconds.
+  -t, --dead-timers     Detect dead / inactive timers. See the corresponding
+                        options '-W, --dead-timer-warning' and '-C, --dead-
+                        timers-critical'. Dead timers are detected by parsing
+                        the output of 'systemctl list-timers'. Dead timer rows
+                        displaying 'n/a' in the NEXT and LEFTcolumns and the
+                        time span in the column PASSED exceeds the values
+                        specified with the options '-W, --dead-timer-warning'
+                        and '-C, --dead-timers-critical'.
+  -W SECONDS, --dead-timers-warning SECONDS
+                        Time ago in seconds for dead / inactive timers to
+                        trigger a warning state (by default 6 days).
+  -C SECONDS, --dead-timers-critical SECONDS
+                        Time ago in seconds for dead / inactive timers to
+                        trigger a critical state (by default 7 days).
+  -v, --verbose         Increase output verbosity (use up to 3 times).
+  -V, --version         show program's version number and exit
+Performance data:
+  - count_units
+  - startup_time
+  - units_activating
+  - units_active
+  - units_failed
+  - units_inactive
+```
+## Project pages
+* 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/details
+## Behind the scenes
+To detect failed units this monitoring script runs:
+```sh
+systemctl list-units --all
+```
+To get the startup time it executes:
+```sh
+systemd-analyze
+```
+To check a specific  unit (`-u, --unit`) this command is executed:
+```sh
+systemctl is-active <unit-name>
+```
+To find dead timers this plugin launches:
+```sh
+systemctl list-timers --all
+```
+## Testing
+```
+pyenv install 3.6.12
+pyenv install 3.7.9
+pyenv local 3.6.12 3.7.9
+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.1.0 → check_systemd-2.2.1}/check_systemd.egg-info/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: check-systemd
-Version: 2.1.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
@@ -33,7 +33,8 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         ## Command line interface
         ```
-        usage: check_systemd [-h] [-c SECONDS] [-e UNIT | -u UNIT] [-v] [-V] [-w SECONDS]
+        usage: check_systemd [-h] [-u UNIT | -e UNIT] [-n] [-w SECONDS] [-c SECONDS]
+                             [-t] [-W SECONDS] [-C SECONDS] [-v] [-V]
         Copyright (c) 2014-18 Andrea Briganti a.k.a 'Kbyte' <kbytesys@gmail.com>
         Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>
@@ -42,17 +43,43 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         optional arguments:
           -h, --help            show this help message and exit
-          -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. 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.
+          -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. 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).
+          -n, --no-startup-time
+                                Don’t check the startup time. Using this option the
+                                options '-w, --warning' and '-c, --critical' have no
+                                effect. Performance data about the startup time is
+                                collected, but no critical, warning etc. states are
+                                triggered.
+          -w SECONDS, --warning SECONDS
+                                Startup time in seconds to result in a warning status.
+                                Thedefault is 60 seconds.
+          -c SECONDS, --critical SECONDS
+                                Startup time in seconds to result in a critical status.
+                                Thedefault is 120 seconds.
+          -t, --dead-timers     Detect dead / inactive timers. See the corresponding
+                                options '-W, --dead-timer-warning' and '-C, --dead-
+                                timers-critical'. Dead timers are detected by parsing
+                                the output of 'systemctl list-timers'. Dead timer rows
+                                displaying 'n/a' in the NEXT and LEFTcolumns and the
+                                time span in the column PASSED exceeds the values
+                                specified with the options '-W, --dead-timer-warning'
+                                and '-C, --dead-timers-critical'.
+          -W SECONDS, --dead-timers-warning SECONDS
+                                Time ago in seconds for dead / inactive timers to
+                                trigger a warning state (by default 6 days).
+          -C SECONDS, --dead-timers-critical SECONDS
+                                Time ago in seconds for dead / inactive timers to
+                                trigger a critical state (by default 7 days).
           -v, --verbose         Increase output verbosity (use up to 3 times).
           -V, --version         show program's version number and exit
-          -w SECONDS, --warning SECONDS
-                                Startup time in seconds to result in warning status.
         Performance data:
           - count_units
@@ -70,12 +97,38 @@ Description: [![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https
         * https://exchange.icinga.com/joseffriedrich/check_systemd
         * https://exchange.nagios.org/directory/Plugins/System-Metrics/Processes/check_systemd/details
+        ## Behind the scenes
+        To detect failed units this monitoring script runs:
+        ```sh
+        systemctl list-units --all
+        ```
+        To get the startup time it executes:
+        ```sh
+        systemd-analyze
+        ```
+        To check a specific  unit (`-u, --unit`) this command is executed:
+        ```sh
+        systemctl is-active <unit-name>
+        ```
+        To find dead timers this plugin launches:
+        ```sh
+        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.1.0 → check_systemd-2.2.1}/check_systemd.py RENAMED Viewed

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 """
 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
@@ -14,10 +14,10 @@ import re
 import nagiosplugin
 from nagiosplugin import Metric
-__version__ = '2.1.0'
+__version__ = '2.2.1'
-class SystemdctlListUnitsResource(nagiosplugin.Resource):
+class SystemctlListUnitsResource(nagiosplugin.Resource):
     """
     :param list excludes: A list of systemd unit names.
     """
@@ -41,8 +41,8 @@ class SystemdctlListUnitsResource(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 SystemdctlListUnitsResource(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:
@@ -102,17 +118,29 @@ class SystemdctlListUnitsResource(nagiosplugin.Resource):
 def format_timespan_to_seconds(fmt_timespan):
     """Convert a timespan format string into secondes.
-    :param str fmt_timespan: for example `2.345s` or `3min 45.234s`
+    https://github.com/systemd/systemd/blob/master/src/basic/time-util.c#L357
+    :param str fmt_timespan: for example `2.345s` or `3min 45.234s` or
+      `34min left` or `2 months 8 days`
     :return: The seconds
     :rtype: float
     """
+    for replacement in [
+        ['years', 'y'],
+        ['months', 'month'],
+        ['weeks', 'w'],
+        ['days', 'd'],
+    ]:
+        fmt_timespan = fmt_timespan.replace(
+            ' ' + replacement[0], replacement[1]
+        )
     seconds = {
-        'y': 365 * 24 * 60 * 60,
-        'month': 30 * 24 * 60 * 60,
-        'w': 7 * 24 * 60 * 60,
-        'd': 24 * 60 * 60,
-        'h': 60 * 60,
+        'y': 31536000,  # 365 * 24 * 60 * 60
+        'month': 2592000,  # 30 * 24 * 60 * 60
+        'w': 604800,  # 7 * 24 * 60 * 60
+        'd': 86400,  # 24 * 60 * 60
+        'h': 3600,  # 60 * 60
         'min': 60,
         's': 1,
         'ms': 0.001,
@@ -120,9 +148,10 @@ def format_timespan_to_seconds(fmt_timespan):
     result = 0
     for span in fmt_timespan.split():
         match = re.search(r'([\d\.]+)([a-z]+)', span)
-        value = match.group(1)
-        unit = match.group(2)
-        result += float(value) * seconds[unit]
+        if match:
+            value = match.group(1)
+            unit = match.group(2)
+            result += float(value) * seconds[unit]
     return round(float(result), 3)
@@ -170,6 +199,142 @@ 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.
+    """
+    def __init__(self, excludes=[], *args, **kwargs):
+        self.excludes = excludes
+        self.warning = kwargs.pop('warning')
+        self.critical = kwargs.pop('critical')
+        super().__init__(*args, **kwargs)
+    name = 'SYSTEMD'
+    column_names = [
+      'NEXT', 'LEFT', 'LAST', 'PASSED', 'UNIT', 'ACTIVATES'
+    ]
+    column_boundaries = None
+    def re_match(self, unit):
+        for exclude in self.excludes:
+            if re.match(exclude, unit):
+                return(True)
+        return(False)
+    def detect_column_boundaries(self, heading):
+        boundaries = []
+        previous_column_start = 0
+        for column_title in self.column_names[1:]:
+            next_column_start = heading.index(column_title)
+            boundaries.append([previous_column_start, next_column_start])
+            previous_column_start = next_column_start
+        return boundaries
+    def get_column_text(self, row, column_name):
+        boundaries = self.column_boundaries[
+            self.column_names.index(column_name)
+        ]
+        return row[boundaries[0]:boundaries[1]].strip()
+    def probe(self):
+        """
+        :return: generator that emits
+          :class:`~nagiosplugin.metric.Metric` objects
+        """
+        try:
+            p = subprocess.Popen(['systemctl', 'list-timers', '--all'],
+                                 stderr=subprocess.PIPE,
+                                 stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE)
+            stdout, stderr = p.communicate()
+        except OSError as e:
+            raise nagiosplugin.CheckError(e)
+        if stderr:
+            raise nagiosplugin.CheckError(stderr)
+        # NEXT                          LEFT
+        # Sat 2020-05-16 15:11:15 CEST  34min left
+        # LAST                          PASSED
+        # Sat 2020-05-16 14:31:56 CEST  4min 20s ago
+        # UNIT             ACTIVATES
+        # apt-daily.timer  apt-daily.service
+        if stdout:
+            lines = stdout.decode('utf-8').splitlines()
+            table_heading = lines[0]
+            self.column_boundaries = self.detect_column_boundaries(
+                table_heading
+            )
+            # Remove the first line because it is the header.
+            # Remove the two last lines: empty line + "XX timers listed."
+            table_body = lines[1:-2]
+            state = nagiosplugin.Ok  # ok
+            for row in table_body:
+                unit = self.get_column_text(row, 'UNIT')
+                if self.re_match(unit):
+                    continue
+                next_date_time = self.get_column_text(row, 'NEXT')
+                if next_date_time == 'n/a':
+                    passed_text = self.get_column_text(row, 'PASSED')
+                    if passed_text == 'n/a':
+                        state = nagiosplugin.Critical
+                    else:
+                        passed = format_timespan_to_seconds(
+                            passed_text
+                        )
+                        if passed_text == 'n/a' or passed >= self.critical:
+                            state = nagiosplugin.Critical
+                        elif passed >= self.warning:
+                            state = nagiosplugin.Warn
+                yield Metric(
+                    name=unit,
+                    value=state,
+                    context='dead_timers'
+                )
 class SystemctlIsActiveResource(nagiosplugin.Resource):
     name = 'SYSTEMD'
@@ -218,8 +383,10 @@ class UnitContext(nagiosplugin.Context):
             (may optionally be consulted)
         :returns: :class:`~.result.Result`
         """
-        hint = '%s: %s' % (metric.name, metric.value) \
-            if metric.value else metric.name
+        if metric.value:
+            hint = '{}: {}'.format(metric.name, metric.value)
+        else:
+            hint = metric.name
         if metric.value and metric.value != 'active':
             return self.result_cls(nagiosplugin.Critical, metric=metric,
                                    hint=hint)
@@ -227,6 +394,22 @@ class UnitContext(nagiosplugin.Context):
             return self.result_cls(nagiosplugin.Ok, metric=metric, hint=hint)
+class DeadTimersContext(nagiosplugin.Context):
+    def __init__(self):
+        super(DeadTimersContext, self).__init__('dead_timers')
+    def evaluate(self, metric, resource):
+        """Determines state of a given metric.
+        :param metric: associated metric that is to be evaluated
+        :param resource: resource that produced the associated metric
+            (may optionally be consulted)
+        :returns: :class:`~.result.Result`
+        """
+        return self.result_cls(metric.value, metric=metric, hint=metric.name)
 class PerformanceDataContext(nagiosplugin.Context):
     def __init__(self):
@@ -266,7 +449,7 @@ class SystemdSummary(nagiosplugin.Summary):
         """
         summary = []
         for result in results.most_significant:
-            if result.context.name in ['startup_time', 'unit']:
+            if result.context.name in ['startup_time', 'unit', 'dead_timers']:
                 summary.append(result)
         return ', '.join(['{0}'.format(result) for result in summary])
@@ -278,14 +461,15 @@ class SystemdSummary(nagiosplugin.Summary):
         """
         summary = []
         for result in results.most_significant:
-            if result.context.name in ['startup_time', 'unit']:
+            if result.context.name in ['startup_time', 'unit', 'dead_timers']:
                 summary.append('{0}: {1}'.format(result.state, result))
         return summary
 def get_argparser():
     parser = argparse.ArgumentParser(
-        formatter_class=argparse.RawDescriptionHelpFormatter,
+        prog='check_systemd',  # To get the right command name in the README.
+        formatter_class=lambda prog: argparse.RawDescriptionHelpFormatter(prog, width=80),  # noqa: E501
         description=  # noqa: E251
         'Copyright (c) 2014-18 Andrea Briganti a.k.a \'Kbyte\' <kbytesys@gmail.com>\n'  # noqa: E501
         'Copyright (c) 2019-20 Josef Friedrich <josef@friedrich.rocks>\n'
@@ -303,11 +487,11 @@ def get_argparser():
     exclusive_group = parser.add_mutually_exclusive_group()
-    parser.add_argument(
-        '-c', '--critical',
-        metavar='SECONDS',
-        default=120,
-        help='Startup time in seconds to result in critical status.',
+    exclusive_group.add_argument(
+        '-u', '--unit',
+        type=str,
+        dest='unit',
+        help='Name of the systemd unit that is being tested.',
     )
     exclusive_group.add_argument(
@@ -325,11 +509,62 @@ def get_argparser():
              '(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 being tested.',
+    parser.add_argument(
+        '-n', '--no-startup-time',
+        action='store_true',
+        default=False,
+        help='Don’t check the startup time. Using this option the options '
+             '\'-w, --warning\' and \'-c, --critical\' have no effect. '
+             'Performance data about the startup time is collected, but '
+             'no critical, warning etc. states are triggered.',
+    )
+    parser.add_argument(
+        '-w', '--warning',
+        default=60,
+        metavar='SECONDS',
+        help='Startup time in seconds to result in a warning status. The'
+             'default is 60 seconds.',
+    )
+    parser.add_argument(
+        '-c', '--critical',
+        metavar='SECONDS',
+        default=120,
+        help='Startup time in seconds to result in a critical status. The'
+             'default is 120 seconds.',
+    )
+    parser.add_argument(
+        '-t', '--dead-timers',
+        action='store_true',
+        help='Detect dead / inactive timers. See the corresponding options '
+             '\'-W, --dead-timer-warning\' and '
+             '\'-C, --dead-timers-critical\'. '
+             'Dead timers are detected by parsing the output of '
+             '\'systemctl list-timers\'. '
+             'Dead timer rows displaying \'n/a\' in the NEXT and LEFT'
+             'columns and the time span in the column PASSED exceeds the '
+             'values specified with the options \'-W, --dead-timer-warning\' '
+             'and \'-C, --dead-timers-critical\'.'
+    )
+    parser.add_argument(
+        '-W', '--dead-timers-warning',
+        metavar='SECONDS',
+        type=float,
+        default=60 * 60 * 24 * 6,
+        help='Time ago in seconds for dead / inactive timers to trigger a '
+             'warning state (by default 6 days).'
+    )
+    parser.add_argument(
+        '-C', '--dead-timers-critical',
+        metavar='SECONDS',
+        type=float,
+        default=60 * 60 * 24 * 7,
+        help='Time ago in seconds for dead / inactive timers to trigger a '
+             'critical state (by default 7 days).'
     )
     parser.add_argument(
@@ -345,13 +580,6 @@ def get_argparser():
         version='%(prog)s {}'.format(__version__),
     )
-    parser.add_argument(
-        '-w', '--warning',
-        default=60,
-        metavar='SECONDS',
-        help='Startup time in seconds to result in warning status.',
-    )
     return parser
@@ -360,30 +588,53 @@ def main():
     objects = []
+    if args.dead_timers:
+        objects += [
+            SystemctlListTimersResource(
+                excludes=args.exclude,
+                warning=args.dead_timers_warning,
+                critical=args.dead_timers_critical,
+            ),
+            DeadTimersContext()
+        ]
     if args.unit:
         objects.append(SystemctlIsActiveResource(unit=args.unit))
     else:
         objects += [
-            SystemdctlListUnitsResource(excludes=args.exclude),
+            SystemctlListUnitsResource(excludes=args.exclude),
             PerformanceDataContext(),
         ]
-        analyse = subprocess.run(['systemd-analyze'], stderr=subprocess.PIPE,
-                                 stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-        # systemd-analyze: boot not finshed exists with 1
+        analyse = subprocess.run(
+            ['systemd-analyze'],
+            stderr=subprocess.PIPE,
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE
+        )
+        # systemd-analyze: boot not finshed exits with 1
         if analyse.returncode == 0:
             objects.append(SystemdAnalyseResource())
     objects += [
         UnitContext(),
-        nagiosplugin.ScalarContext(
-            name='startup_time',
-            warning=args.warning,
-            critical=args.critical,
-        ),
         SystemdSummary()
     ]
+    if not args.no_startup_time:
+        objects.append(
+            nagiosplugin.ScalarContext(
+                name='startup_time',
+                warning=args.warning,
+                critical=args.critical,
+            )
+        )
+    else:
+        objects.append(
+            nagiosplugin.ScalarContext(
+                name='startup_time'
+            )
+        )
     check = nagiosplugin.Check(*objects)
     check.main(args.verbose)

check_systemd-2.1.0/README.md DELETED Viewed

@@ -1,82 +0,0 @@
-[![pypi.org](http://img.shields.io/pypi/v/check_systemd.svg)](https://pypi.python.org/pypi/check_systemd)
-[![Build Status](https://travis-ci.org/Josef-Friedrich/check_systemd.svg?branch=master)](https://travis-ci.org/Josef-Friedrich/check_systemd)
-# check_systemd
-`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 your monitoring solution.
-It requires only the
-[nagiosplugin](https://nagiosplugin.readthedocs.io/en/stable) library.
-You can also test a single service with the `-u, --unit` parameter.
-Released under GNU GPLv2 License.
-## Installation
-```
-pip3 install check_systemd
-```
-## Command line interface
-```
-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-20 Josef Friedrich <josef@friedrich.rocks>
-Nagios / Icinga monitoring plugin to check systemd for failed units.
-optional arguments:
-  -h, --help            show this help message and exit
-  -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. 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
-                        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
-* 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/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
-```