command_watcher 0.1.0__tar.gz → 0.3.0__tar.gz

{command_watcher-0.1.0 → command_watcher-0.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: command-watcher
-Version: 0.1.0
+Version: 0.3.0
 Summary: Module to watch the execution of shell scripts. Both streams (`stdout` and `stderr`) are captured.
 Home-page: https://github.com/Josef-Friedrich/command-watcher
 License: MIT
@@ -13,9 +13,8 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
-Requires-Dist: conf2levels (>=0.4.0,<0.5.0)
-Requires-Dist: jflib (>=1.0.0,<2.0.0)
-Requires-Dist: requests (>=2.28.1,<3.0.0)
+Requires-Dist: conf2levels (>=0.5.0,<0.6.0)
+Requires-Dist: icinga2apic (>=0.7.5,<0.8.0)
 Requires-Dist: termcolor (>=1.1.0,<2.0.0)
 Requires-Dist: types-requests (>=2.28.1,<3.0.0)
 Requires-Dist: types-termcolor (>=1.1.5,<2.0.0)

{command_watcher-0.1.0 → command_watcher-0.3.0}/command_watcher/__init__.py

@@ -11,11 +11,11 @@ import shutil
 import subprocess
 import threading
 import time
-from typing import (IO, Any, Dict, List, Optional, Sequence, Tuple, TypedDict,
-                    Union)
+from importlib import metadata
+from typing import (IO, Any, Dict, List, Literal, Optional, Sequence, Tuple,
+                    TypedDict, Union)
 
 from conf2levels import ClassInterface, ConfigReader, Spec
-from jflib import capturing
 from typing_extensions import Unpack
 
 from .log import ExtendedLogger, LoggingHandler, setup_logging
@@ -23,6 +23,10 @@ from .report import (HOSTNAME, BaseChannel, BeepChannel, EmailChannel,
                      IcingaChannel, Message, MessageParams,
                      MinimalMessageParams, Status, reporter)
 
+__version__: str = metadata.version('command_watcher')
+
+Stream = Literal['stdout', 'stderr']
+
 
 class CommandWatcherError(Exception):
     """Exception raised by this module."""
@@ -173,7 +177,7 @@ class Process:
     args: Args
     """Process arguments in various types."""
 
-    _queue: 'queue.Queue[Optional[Tuple[bytes, capturing.Stream]]]'
+    _queue: 'queue.Queue[Optional[Tuple[bytes, Stream]]]'
 
     log: ExtendedLogger
     """A ready to go and configured logger."""
@@ -251,7 +255,7 @@ class Process:
         return len(self.stderr.splitlines())
 
     def _stdout_stderr_reader(self, pipe: IO[bytes],
-                              stream: capturing.Stream) -> None:
+                              stream: Stream) -> None:
         """
         :param object pipe: `process.stdout` or `process.stdout`
         """
@@ -263,7 +267,7 @@ class Process:
             self._queue.put(None)
 
     def _start_thread(self, pipe: Optional[IO[str]],
-                      stream: capturing.Stream) -> None:
+                      stream: Stream) -> None:
         """
         :param object pipe: `process.stdout` or `process.stdout`
         """

command_watcher-0.3.0/command_watcher/icinga.py

@@ -0,0 +1,37 @@
+from typing import Literal, Optional
+
+import urllib3
+from icinga2apic.client import Client
+
+urllib3.disable_warnings()  # type: ignore
+
+
+STATE_OK = 0
+STATE_WARNING = 1
+STATE_CRITICAL = 2
+STATE_UNKNOWN = 3
+
+States = {
+    STATE_OK: 'OK',
+    STATE_WARNING: 'WARNING',
+    STATE_CRITICAL: 'CRITICAL',
+    STATE_UNKNOWN: 'UNKNOWN',
+}
+
+
+def send_passive_check(url: str, user: str, password: str,
+                       status: Literal[0, 1, 2, 3],
+                       host_name: str, service_name: str,
+                       text_output: str,
+                       performance_data: Optional[str] = None
+                       ):
+    """
+    https://icinga.com/docs/icinga-2/latest/doc/12-icinga2-api/#process-check-result
+    """
+    client = Client(url=url,
+                    username=user, password=password)
+    return client.actions.process_check_result(
+        object_type='Service',
+        name='{}!{}'.format(host_name, service_name),
+        exit_status=status,
+        plugin_output=text_output, performance_data=performance_data)

{command_watcher-0.1.0 → command_watcher-0.3.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "command_watcher"
-version = "0.1.0"
+version = "0.3.0"
 description = "Module to watch the execution of shell scripts. Both streams (`stdout` and `stderr`) are captured."
 authors = ["Josef Friedrich <josef@friedrich.rocks>"]
 license = "MIT"
@@ -13,12 +13,11 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
+conf2levels = "^0.5.0"
+icinga2apic = "^0.7.5"
 termcolor = "^1.1.0"
-types-termcolor = "^1.1.5"
-conf2levels = "^0.4.0"
-requests = "^2.28.1"
-jflib = "^1.0.0"
 types-requests = "^2.28.1"
+types-termcolor = "^1.1.5"
 
 [tool.poetry.group.dev.dependencies]
 tox = "^3.25.1"

{command_watcher-0.1.0 → command_watcher-0.3.0}/setup.py

@@ -8,16 +8,15 @@ package_data = \
 {'': ['*']}
 
 install_requires = \
-['conf2levels>=0.4.0,<0.5.0',
- 'jflib>=1.0.0,<2.0.0',
- 'requests>=2.28.1,<3.0.0',
+['conf2levels>=0.5.0,<0.6.0',
+ 'icinga2apic>=0.7.5,<0.8.0',
  'termcolor>=1.1.0,<2.0.0',
  'types-requests>=2.28.1,<3.0.0',
  'types-termcolor>=1.1.5,<2.0.0']
 
 setup_kwargs = {
     'name': 'command-watcher',
-    'version': '0.1.0',
+    'version': '0.3.0',
     'description': 'Module to watch the execution of shell scripts. Both streams (`stdout` and `stderr`) are captured.',
     'long_description': "command_watcher\n===============\n\nModule to watch the execution of shell scripts. Both streams (`stdout`\nand `stderr`) are captured.\n\n.. code:: python\n\n    watch = Watch()\n    watch.log.critical('msg')\n    watch.log.error('msg')\n    watch.log.warning('msg')\n    watch.log.info('msg')\n    watch.log.debug('msg')\n    watch.run(['rsync', '-av', '/home', '/backup'])\n\n.. code-block:: python\n\n    from command_watcher import Watch\n    watch = Watch(\n        config_file='/etc/command-watcher.ini',\n        service_name='texlive_update'\n    )\n\n    tlmgr = '/usr/local/texlive/bin/x86_64-linux/tlmgr'\n\n    watch.run('{} update --self'.format(tlmgr))\n    watch.run('{} update --all'.format(tlmgr))\n    installed_packages = watch.run(\n        '{} info --only-installed'.format(tlmgr), log=False\n    )\n    all_packages = watch.run('{} info'.format(tlmgr), log=False)\n\n    watch.final_report(\n        status=0,\n        performance_data={\n            'installed_packages': installed_packages.line_count_stdout,\n            'all_packages': all_packages.line_count_stdout,\n        },\n    )\n\n.. code-block:: ini\n\n    [email]\n    subject_prefix = [cwatcher]\n    from_addr =\n    to_addr = logs@example.com\n    to_addr_critical = critical@example.com\n    smtp_login = mailer\n    smtp_password = 1234\n    smtp_server = mail.example.com:587\n\n    [nsca]\n    remote_host = 1.2.3.4\n    password = asdf1234\n    encryption_method = 8\n    ; port = 5667\n\n    [icinga]\n    url = https://icinga.example.com:5665\n    user = user\n    password = 1234\n\n    [beep]\n    activated = True\n",
     'author': 'Josef Friedrich',

command_watcher-0.1.0/command_watcher/icinga.py

@@ -1,54 +0,0 @@
-import json
-from typing import Optional
-
-import requests
-import urllib3
-
-urllib3.disable_warnings()  # type: ignore
-
-
-STATE_OK = 0
-STATE_WARNING = 1
-STATE_CRITICAL = 2
-STATE_UNKNOWN = 3
-
-States = {
-    STATE_OK: 'OK',
-    STATE_WARNING: 'WARNING',
-    STATE_CRITICAL: 'CRITICAL',
-    STATE_UNKNOWN: 'UNKNOWN',
-}
-
-
-def send_passive_check(url: str, user: str, password: str, status: int,
-                       host_name: str, service_name: str,
-                       text_output: str,
-                       performance_data: Optional[str] = None):
-    """
-    https://icinga.com/docs/icinga-2/latest/doc/12-icinga2-api/#process-check-result
-
-    [icinga]
-    url
-    user
-    password
-    """
-    request_url = '{}/v1/actions/process-check-result'.format(url)
-    headers = {
-        'Accept': 'application/json',
-        'X-HTTP-Method-Override': 'POST'
-    }
-    data = {
-        'type': 'Service',
-        'filter': 'host.name=="{}" && service.name=="{}"'.format(host_name,
-                                                                 service_name),
-        'exit_status': status,
-        'plugin_output': text_output,
-    }
-
-    if performance_data:
-        data['performance_data'] = performance_data
-
-    return requests.post(request_url,
-                         headers=headers,
-                         auth=(user, password),
-                         data=json.dumps(data), verify=False)