From 129f3e753c948b0315208c614e6bfdf063fab9e4 Mon Sep 17 00:00:00 2001
From: Dan Helfman <witten@torsion.org>
Date: Tue, 29 Oct 2024 10:33:19 -0700
Subject: [PATCH] Flesh out the Zabbix monitoring hook tests, add a logo to the
 documentation, etc.

---
 NEWS                                |   2 +
 README.md                           |   1 +
 borgmatic/config/schema.yaml        |  15 +-
 borgmatic/hooks/zabbix.py           |  32 ++-
 docs/how-to/monitor-your-backups.md |  37 ++--
 docs/static/zabbix.png              | Bin 0 -> 8572 bytes
 tests/unit/hooks/test_zabbix.py     | 322 ++++++++++++++++++++--------
 7 files changed, 281 insertions(+), 128 deletions(-)
 create mode 100644 docs/static/zabbix.png

diff --git a/NEWS b/NEWS
index 442f4e6c..f7ff6b92 100644
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,8 @@
  * Update the "--match-archives" and "--archive" flags to support Borg 2 series names or archive
    hashes.
  * Add a "--match-archives" flag to the "prune" action.
+ * Add a Zabbix monitoring hook. See the documentation for more information:
+   https://torsion.org/borgmatic/docs/how-to/monitor-your-backups/#zabbix-hook
 
 1.8.14
  * #896: Fix an error in borgmatic rcreate/init on an empty repository directory with Borg 1.4.
diff --git a/README.md b/README.md
index a7000d68..45b48a4e 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,7 @@ borgmatic is powered by [Borg Backup](https://www.borgbackup.org/).
 <a href="https://ntfy.sh/"><img src="docs/static/ntfy.png" alt="ntfy" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
 <a href="https://grafana.com/oss/loki/"><img src="docs/static/loki.png" alt="Loki" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
 <a href="https://github.com/caronc/apprise/wiki"><img src="docs/static/apprise.png" alt="Apprise" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
+<a href="https://www.zabbix.com/"><img src="docs/static/zabbix.png" alt="Zabbix" height="40px" style="margin-bottom:20px; margin-right:20px;"></a>
 <a href="https://www.borgbase.com/?utm_source=borgmatic"><img src="docs/static/borgbase.png" alt="BorgBase" height="60px" style="margin-bottom:20px; margin-right:20px;"></a>
 
 
diff --git a/borgmatic/config/schema.yaml b/borgmatic/config/schema.yaml
index 9536164a..4dd7c76f 100644
--- a/borgmatic/config/schema.yaml
+++ b/borgmatic/config/schema.yaml
@@ -1622,12 +1622,14 @@ properties:
             host:
                 type: string
                 description: |
-                    Host name where the item is stored. Required if "itemid" is not set.
+                    Host name where the item is stored. Required if "itemid"
+                    is not set.
                 example: borg-server
             key:
                 type: string
                 description: |
-                    Key of the host where the item is stored. Required if "itemid" is not set.
+                    Key of the host where the item is stored. Required if
+                    "itemid" is not set.
                 example: borg.status
             server:
                 type: string
@@ -1637,17 +1639,20 @@ properties:
             username:
                 type: string
                 description: |
-                    The username used for authentication. Not needed if using an API key.
+                    The username used for authentication. Not needed if using
+                    an API key.
                 example: testuser
             password:
                 type: string
                 description: |
-                    The password used for authentication. Not needed if using an API key.
+                    The password used for authentication. Not needed if using
+                    an API key.
                 example: fakepassword
             api_key:
                 type: string
                 description: |
-                    The API key used for authentication. Not needed if using an username/password.
+                    The API key used for authentication. Not needed if using
+                    an username/password.
                 example: fakekey
             start:
                 type: object
diff --git a/borgmatic/hooks/zabbix.py b/borgmatic/hooks/zabbix.py
index 13f51b64..a33d77b4 100644
--- a/borgmatic/hooks/zabbix.py
+++ b/borgmatic/hooks/zabbix.py
@@ -1,4 +1,3 @@
-import json
 import logging
 
 import requests
@@ -52,23 +51,23 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
         logger.warning(f'{config_filename}: Server missing for Zabbix')
         return
 
-    # Determine the zabbix method used to store the value: itemid or host/key
+    # Determine the Zabbix method used to store the value: itemid or host/key
     if itemid is not None:
         logger.info(f'{config_filename}: Updating {itemid} on Zabbix')
         data = {
-            "jsonrpc": "2.0",
-            "method": "history.push",
-            "params": {"itemid": itemid, "value": value},
-            "id": 1,
+            'jsonrpc': '2.0',
+            'method': 'history.push',
+            'params': {'itemid': itemid, 'value': value},
+            'id': 1,
         }
 
     elif (host and key) is not None:
         logger.info(f'{config_filename}: Updating Host:{host} and Key:{key} on Zabbix')
         data = {
-            "jsonrpc": "2.0",
-            "method": "history.push",
-            "params": {"host": host, "key": key, "value": value},
-            "id": 1,
+            'jsonrpc': '2.0',
+            'method': 'history.push',
+            'params': {'host': host, 'key': key, 'value': value},
+            'id': 1,
         }
 
     elif host is not None:
@@ -90,13 +89,10 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
     elif (username and password) is not None:
         logger.info(f'{config_filename}: Using user/pass auth with user {username} for Zabbix')
         auth_data = {
-            "jsonrpc": "2.0",
-            "method": "user.login",
-            "params": {
-                "username": username,
-                "password": password
-            },
-            "id": 1
+            'jsonrpc': '2.0',
+            'method': 'user.login',
+            'params': {'username': username, 'password': password},
+            'id': 1,
         }
         if not dry_run:
             logging.getLogger('urllib3').setLevel(logging.ERROR)
@@ -107,6 +103,7 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
                     response.raise_for_status()
             except requests.exceptions.RequestException as error:
                 logger.warning(f'{config_filename}: Zabbix error: {error}')
+                return
 
     elif username is not None:
         logger.warning(f'{config_filename}: Password missing for Zabbix authentication')
@@ -118,7 +115,6 @@ def ping_monitor(hook_config, config, config_filename, state, monitoring_log_lev
     else:
         logger.warning(f'{config_filename}: Authentication data missing for Zabbix')
         return
-    
 
     if not dry_run:
         logging.getLogger('urllib3').setLevel(logging.ERROR)
diff --git a/docs/how-to/monitor-your-backups.md b/docs/how-to/monitor-your-backups.md
index 3ea51735..f5007401 100644
--- a/docs/how-to/monitor-your-backups.md
+++ b/docs/how-to/monitor-your-backups.md
@@ -566,14 +566,16 @@ Resend Notification every X times = 1
 ## Zabbix hook
 
 <span class="minilink minilink-addedin">New in version 1.9.0</span>
-[zabbix](https://www.zabbix.com/) is an open-source monitoring tool used for tracking and managing the performance and availability of networks, servers, and applications in real-time.
+[Zabbix](https://www.zabbix.com/) is an open-source monitoring tool used for
+tracking and managing the performance and availability of networks, servers,
+and applications in real-time.
 
-This hook does not do any notifications on its own. Instead, it relies on
-your Zabbix instance to notify and perform escalations based on the Zabbix
-configuration. The `states` defined in the configuration will determine which states 
-will trigger the hook. The value defined in the configuration of each state is 
-used to populate the data of the configured Zabbix item. If none are provided, 
-it default to a lower-case string of the state.
+This hook does not do any notifications on its own. Instead, it relies on your
+Zabbix instance to notify and perform escalations based on the Zabbix
+configuration. The `states` defined in the configuration determine which
+states will trigger the hook. The value defined in the configuration of each
+state is used to populate the data of the configured Zabbix item. If none are
+provided, it defaults to a lower-case string of the state.
 
 An example configuration is shown here with all the available options.
 
@@ -601,19 +603,22 @@ zabbix:
         - fail
 ```
 
-###  Zabbix 7.0+
 This hook requires the Zabbix server be running version 7.0+
 
-<span class="minilink minilink-addedin">Authentication Methods</span>
-Authentication can be accomplished via `api_key` or `username` and `password`. 
-If both are declared, `api_key` will be chosen.
 
-<span class="minilink minilink-addedin">Items</span> The item 
-to be updated can be chosen by either declaring the `itemid` or 
-`host` and `key`. If both are declared, `itemid` will be chosen.
+### Authentication methods
 
-Keep in mind that `host` is referring to the 'Host name' on the 
-Zabbix host and not the 'Visual name'.
+Authentication can be accomplished via `api_key` or both `username` and
+`password`. If all three are declared, only `api_key` is used.
+
+
+### Items
+
+The item to be updated can be chosen by either declaring the `itemid` or both
+`host` and `key`. If all three are declared, only `itemid` is used.
+
+Keep in mind that `host` is referring to the "Host name" on the Zabbix server
+and not the "Visual name".
 
 
 ## Scripting borgmatic
diff --git a/docs/static/zabbix.png b/docs/static/zabbix.png
new file mode 100644
index 0000000000000000000000000000000000000000..746ad2bcf5c99e83162078a07f36a40e1283e193
GIT binary patch
literal 8572
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%0AnN3#A5{u(ut$aZ3EoB#7Aj$LPpm)iPZsTcI
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
PV;)IKP8|Z1F$?=IE<urX

literal 0
HcmV?d00001

diff --git a/tests/unit/hooks/test_zabbix.py b/tests/unit/hooks/test_zabbix.py
index 2fe28cca..6f1a641d 100644
--- a/tests/unit/hooks/test_zabbix.py
+++ b/tests/unit/hooks/test_zabbix.py
@@ -1,5 +1,3 @@
-from enum import Enum
-
 from flexmock import flexmock
 
 import borgmatic.hooks.monitor
@@ -15,58 +13,70 @@ KEY = 'borg.status'
 VALUE = 'fail'
 
 DATA_HOST_KEY = {
-    "jsonrpc": "2.0",
-    "method": "history.push",
-    "params": {"host": HOST, "key": KEY, "value": VALUE},
-    "id": 1,
+    'jsonrpc': '2.0',
+    'method': 'history.push',
+    'params': {'host': HOST, 'key': KEY, 'value': VALUE},
+    'id': 1,
 }
 
-DATA_HOST_KEY_WITH_TOKEN = {
-    "jsonrpc": "2.0",
-    "method": "history.push",
-    "params": {"host": HOST, "key": KEY, "value": VALUE},
-    "id": 1,
-    "auth": "3fe6ed01a69ebd79907a120bcd04e494"
+DATA_HOST_KEY_WITH_KEY_VALUE = {
+    'jsonrpc': '2.0',
+    'method': 'history.push',
+    'params': {'host': HOST, 'key': KEY, 'value': VALUE},
+    'id': 1,
+    'auth': '3fe6ed01a69ebd79907a120bcd04e494',
 }
 
 DATA_ITEMID = {
-    "jsonrpc": "2.0",
-    "method": "history.push",
-    "params": {"itemid": ITEMID, "value": VALUE},
-    "id": 1,
+    'jsonrpc': '2.0',
+    'method': 'history.push',
+    'params': {'itemid': ITEMID, 'value': VALUE},
+    'id': 1,
 }
 
-DATA_HOST_KEY_WITH_TOKEN = {
-    "jsonrpc": "2.0",
-    "method": "history.push",
-    "params": {"itemid": ITEMID, "value": VALUE},
-    "id": 1,
-    "auth": "3fe6ed01a69ebd79907a120bcd04e494"
+DATA_HOST_KEY_WITH_ITEMID = {
+    'jsonrpc': '2.0',
+    'method': 'history.push',
+    'params': {'itemid': ITEMID, 'value': VALUE},
+    'id': 1,
+    'auth': '3fe6ed01a69ebd79907a120bcd04e494',
 }
 
 DATA_USER_LOGIN = {
-    "jsonrpc": "2.0",
-    "method": "user.login",
-    "params": {"username": USERNAME, "password": PASSWORD},
-    "id": 1,
+    'jsonrpc': '2.0',
+    'method': 'user.login',
+    'params': {'username': USERNAME, 'password': PASSWORD},
+    'id': 1,
 }
 
 AUTH_HEADERS_API_KEY = {
     'Content-Type': 'application/json-rpc',
-    'Authorization': f'Bearer {API_KEY}'
+    'Authorization': f'Bearer {API_KEY}',
 }
 
-AUTH_HEADERS_USERNAME_PASSWORD = {
-    'Content-Type': 'application/json-rpc'
-}
+AUTH_HEADERS_USERNAME_PASSWORD = {'Content-Type': 'application/json-rpc'}
+
+
+def test_ping_monitor_with_non_matching_state_exits_early():
+    hook_config = {'api_key': API_KEY}
+    flexmock(module.requests).should_receive('post').never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.START,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
 
 def test_ping_monitor_config_with_api_key_only_exit_early():
-    # This test should exit early since only providing an API KEY is not enough 
+    # This test should exit early since only providing an API KEY is not enough
     # for the hook to work
-    hook_config = {
-        'api_key': API_KEY
-    }
+    hook_config = {'api_key': API_KEY}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -77,13 +87,13 @@ def test_ping_monitor_config_with_api_key_only_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_with_host_only_exit_early():
-    # This test should exit early since only providing a HOST is not enough 
+    # This test should exit early since only providing a HOST is not enough
     # for the hook to work
-    hook_config = {
-        'host': HOST
-    }
+    hook_config = {'host': HOST}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -94,13 +104,13 @@ def test_ping_monitor_config_with_host_only_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_with_key_only_exit_early():
-    # This test should exit early since only providing a KEY is not enough 
+    # This test should exit early since only providing a KEY is not enough
     # for the hook to work
-    hook_config = {
-        'key': KEY
-    }
+    hook_config = {'key': KEY}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -111,13 +121,13 @@ def test_ping_monitor_config_with_key_only_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_with_server_only_exit_early():
-    # This test should exit early since only providing a SERVER is not enough 
+    # This test should exit early since only providing a SERVER is not enough
     # for the hook to work
-    hook_config = {
-        'server': SERVER
-    }
+    hook_config = {'server': SERVER}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -128,14 +138,12 @@ def test_ping_monitor_config_with_server_only_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_user_password_no_zabbix_data_exit_early():
     # This test should exit early since there are HOST/KEY or ITEMID provided to publish data to
-    hook_config = {
-        'server': SERVER,
-        'username': USERNAME,
-        'password': PASSWORD
-    }
+    hook_config = {'server': SERVER, 'username': USERNAME, 'password': PASSWORD}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -146,13 +154,12 @@ def test_ping_monitor_config_user_password_no_zabbix_data_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_api_key_no_zabbix_data_exit_early():
     # This test should exit early since there are HOST/KEY or ITEMID provided to publish data to
-    hook_config = {
-        'server': SERVER,
-        'api_key': API_KEY
-    }
+    hook_config = {'server': SERVER, 'api_key': API_KEY}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -163,14 +170,13 @@ def test_ping_monitor_config_api_key_no_zabbix_data_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_itemid_no_auth_data_exit_early():
-    # This test should exit early since there is no authentication provided 
+    # This test should exit early since there is no authentication provided
     # and Zabbix requires authentication to use it's API
-    hook_config = {
-        'server': SERVER,
-        'itemid': ITEMID
-    }
+    hook_config = {'server': SERVER, 'itemid': ITEMID}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -181,15 +187,13 @@ def test_ping_monitor_config_itemid_no_auth_data_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_host_and_key_no_auth_data_exit_early():
-    # This test should exit early since there is no authentication provided 
+    # This test should exit early since there is no authentication provided
     # and Zabbix requires authentication to use it's API
-    hook_config = {
-        'server': SERVER,
-        'host': HOST,
-        'key': KEY
-    }
+    hook_config = {'server': SERVER, 'host': HOST, 'key': KEY}
     flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
 
     module.ping_monitor(
         hook_config,
@@ -200,15 +204,11 @@ def test_ping_monitor_config_host_and_key_no_auth_data_exit_early():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_host_and_key_with_api_key_auth_data_successful():
     # This test should simulate a successful POST to a Zabbix server. This test uses API_KEY
     # to authenticate and HOST/KEY to know which item to populate in Zabbix.
-    hook_config = {
-        'server': SERVER,
-        'host': HOST,
-        'key': KEY,
-        'api_key': API_KEY
-    }
+    hook_config = {'server': SERVER, 'host': HOST, 'key': KEY, 'api_key': API_KEY}
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
         headers=AUTH_HEADERS_API_KEY,
@@ -225,6 +225,37 @@ def test_ping_monitor_config_host_and_key_with_api_key_auth_data_successful():
         dry_run=False,
     )
 
+
+def test_ping_monitor_config_host_and_missing_key_exits_early():
+    hook_config = {'server': SERVER, 'host': HOST, 'api_key': API_KEY}
+    flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
+
+def test_ping_monitor_config_key_and_missing_host_exits_early():
+    hook_config = {'server': SERVER, 'key': KEY, 'api_key': API_KEY}
+    flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
+
 def test_ping_monitor_config_host_and_key_with_username_password_auth_data_successful():
     # This test should simulate a successful POST to a Zabbix server. This test uses USERNAME/PASSWORD
     # to authenticate and HOST/KEY to know which item to populate in Zabbix.
@@ -233,11 +264,13 @@ def test_ping_monitor_config_host_and_key_with_username_password_auth_data_succe
         'host': HOST,
         'key': KEY,
         'username': USERNAME,
-        'password': PASSWORD
+        'password': PASSWORD,
     }
 
     auth_response = flexmock(ok=True)
-    auth_response.should_receive('json').and_return({"jsonrpc":"2.0","result":"3fe6ed01a69ebd79907a120bcd04e494","id":1})
+    auth_response.should_receive('json').and_return(
+        {'jsonrpc': '2.0', 'result': '3fe6ed01a69ebd79907a120bcd04e494', 'id': 1}
+    )
 
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
@@ -250,7 +283,7 @@ def test_ping_monitor_config_host_and_key_with_username_password_auth_data_succe
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
         headers=AUTH_HEADERS_USERNAME_PASSWORD,
-        json=DATA_HOST_KEY_WITH_TOKEN,
+        json=DATA_HOST_KEY_WITH_KEY_VALUE,
     ).and_return(flexmock(ok=True)).once()
 
     module.ping_monitor(
@@ -262,14 +295,92 @@ def test_ping_monitor_config_host_and_key_with_username_password_auth_data_succe
         dry_run=False,
     )
 
+
+def test_ping_monitor_config_host_and_key_with_username_password_auth_data_and_auth_post_error_exits_early():
+    hook_config = {
+        'server': SERVER,
+        'host': HOST,
+        'key': KEY,
+        'username': USERNAME,
+        'password': PASSWORD,
+    }
+
+    auth_response = flexmock(ok=False)
+    auth_response.should_receive('json').and_return(
+        {'jsonrpc': '2.0', 'result': '3fe6ed01a69ebd79907a120bcd04e494', 'id': 1}
+    )
+    auth_response.should_receive('raise_for_status').and_raise(
+        module.requests.ConnectionError
+    ).once()
+
+    flexmock(module.requests).should_receive('post').with_args(
+        f'{SERVER}',
+        headers=AUTH_HEADERS_USERNAME_PASSWORD,
+        json=DATA_USER_LOGIN,
+    ).and_return(auth_response).once()
+    flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').with_args(
+        f'{SERVER}',
+        headers=AUTH_HEADERS_USERNAME_PASSWORD,
+        json=DATA_HOST_KEY_WITH_KEY_VALUE,
+    ).never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
+
+def test_ping_monitor_config_host_and_key_with_username_and_missing_password_exits_early():
+    hook_config = {
+        'server': SERVER,
+        'host': HOST,
+        'key': KEY,
+        'username': USERNAME,
+    }
+
+    flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
+
+def test_ping_monitor_config_host_and_key_with_passing_and_missing_username_exits_early():
+    hook_config = {
+        'server': SERVER,
+        'host': HOST,
+        'key': KEY,
+        'password': PASSWORD,
+    }
+
+    flexmock(module.logger).should_receive('warning').once()
+    flexmock(module.requests).should_receive('post').never()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )
+
+
 def test_ping_monitor_config_itemid_with_api_key_auth_data_successful():
     # This test should simulate a successful POST to a Zabbix server. This test uses API_KEY
     # to authenticate and HOST/KEY to know which item to populate in Zabbix.
-    hook_config = {
-        'server': SERVER,
-        'itemid': ITEMID,
-        'api_key': API_KEY
-    }
+    hook_config = {'server': SERVER, 'itemid': ITEMID, 'api_key': API_KEY}
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
         headers=AUTH_HEADERS_API_KEY,
@@ -286,18 +397,16 @@ def test_ping_monitor_config_itemid_with_api_key_auth_data_successful():
         dry_run=False,
     )
 
+
 def test_ping_monitor_config_itemid_with_username_password_auth_data_successful():
     # This test should simulate a successful POST to a Zabbix server. This test uses USERNAME/PASSWORD
     # to authenticate and HOST/KEY to know which item to populate in Zabbix.
-    hook_config = {
-        'server': SERVER,
-        'itemid': ITEMID,
-        'username': USERNAME,
-        'password': PASSWORD
-    }
+    hook_config = {'server': SERVER, 'itemid': ITEMID, 'username': USERNAME, 'password': PASSWORD}
 
     auth_response = flexmock(ok=True)
-    auth_response.should_receive('json').and_return({"jsonrpc":"2.0","result":"3fe6ed01a69ebd79907a120bcd04e494","id":1})
+    auth_response.should_receive('json').and_return(
+        {'jsonrpc': '2.0', 'result': '3fe6ed01a69ebd79907a120bcd04e494', 'id': 1}
+    )
 
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
@@ -310,7 +419,7 @@ def test_ping_monitor_config_itemid_with_username_password_auth_data_successful(
     flexmock(module.requests).should_receive('post').with_args(
         f'{SERVER}',
         headers=AUTH_HEADERS_USERNAME_PASSWORD,
-        json=DATA_HOST_KEY_WITH_TOKEN,
+        json=DATA_HOST_KEY_WITH_ITEMID,
     ).and_return(flexmock(ok=True)).once()
 
     module.ping_monitor(
@@ -321,4 +430,39 @@ def test_ping_monitor_config_itemid_with_username_password_auth_data_successful(
         monitoring_log_level=1,
         dry_run=False,
     )
-test_ping_monitor_config_itemid_with_username_password_auth_data_successful()
\ No newline at end of file
+
+
+def test_ping_monitor_config_itemid_with_username_password_auth_data_and_push_post_error_exits_early():
+    hook_config = {'server': SERVER, 'itemid': ITEMID, 'username': USERNAME, 'password': PASSWORD}
+
+    auth_response = flexmock(ok=True)
+    auth_response.should_receive('json').and_return(
+        {'jsonrpc': '2.0', 'result': '3fe6ed01a69ebd79907a120bcd04e494', 'id': 1}
+    )
+
+    flexmock(module.requests).should_receive('post').with_args(
+        f'{SERVER}',
+        headers=AUTH_HEADERS_USERNAME_PASSWORD,
+        json=DATA_USER_LOGIN,
+    ).and_return(auth_response).once()
+
+    push_response = flexmock(ok=False)
+    push_response.should_receive('raise_for_status').and_raise(
+        module.requests.ConnectionError
+    ).once()
+    flexmock(module.requests).should_receive('post').with_args(
+        f'{SERVER}',
+        headers=AUTH_HEADERS_USERNAME_PASSWORD,
+        json=DATA_HOST_KEY_WITH_ITEMID,
+    ).and_return(push_response).once()
+
+    flexmock(module.logger).should_receive('warning').once()
+
+    module.ping_monitor(
+        hook_config,
+        {},
+        'config.yaml',
+        borgmatic.hooks.monitor.State.FAIL,
+        monitoring_log_level=1,
+        dry_run=False,
+    )