diff --git a/NEWS b/NEWS index d3e7bcdb..02b2c69f 100644 --- a/NEWS +++ b/NEWS @@ -5,6 +5,7 @@ * #1149: Include automated tests in the source dist tarball uploaded to PyPI. * #1151: Fix snapshotting in the ZFS, Btrfs, and LVM hooks to play nicely with the Borg 1.4+ "slashdot" hack within source directory paths. + * #1152: Fix a regression in the Loki monitoring hook in which log messages weren't sending. 2.0.8 * #1114: Document systemd configuration changes for the ZFS filesystem hook. diff --git a/borgmatic/hooks/monitoring/loki.py b/borgmatic/hooks/monitoring/loki.py index c60c7520..2b0a0894 100644 --- a/borgmatic/hooks/monitoring/loki.py +++ b/borgmatic/hooks/monitoring/loki.py @@ -65,12 +65,13 @@ class Loki_log_buffer: # Skip as there are not logs to send yet return + request_body = self.to_request() self.root['streams'][0]['values'] = [] try: result = requests.post( self.url, - data=self.to_request(), + data=request_body, timeout=TIMEOUT_SECONDS, headers={ 'Content-Type': 'application/json', diff --git a/tests/integration/hooks/monitoring/test_loki.py b/tests/integration/hooks/monitoring/test_loki.py index c35c672c..89555d45 100644 --- a/tests/integration/hooks/monitoring/test_loki.py +++ b/tests/integration/hooks/monitoring/test_loki.py @@ -15,8 +15,7 @@ def test_initialize_monitor_replaces_labels(): 'labels': {'hostname': '__hostname', 'config': '__config', 'config_full': '__config_path'}, } config_filename = '/mock/path/test.yaml' - dry_run = True - module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run) + module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run=False) for handler in tuple(logging.getLogger().handlers): if isinstance(handler, module.Loki_log_handler): @@ -48,32 +47,39 @@ def test_initialize_monitor_adds_log_handler(): raise AssertionError() -def test_ping_monitor_adds_log_message(): +def test_ping_monitor_sends_log_message(): ''' - Assert that calling ping_monitor adds a message to our logger. + Assert that calling ping_monitor sends a message to Loki via our logger. ''' hook_config = {'url': 'http://localhost:3100/loki/api/v1/push', 'labels': {'app': 'borgmatic'}} config_filename = 'test.yaml' - dry_run = True - module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run) + post_called = False + + def post(url, data, timeout, headers): + nonlocal post_called + post_called = True + + assert any( + value[1] == f'{module.MONITOR_STATE_TO_LOKI[module.monitor.State.FINISH]} backup' + for value in module.json.loads(data)['streams'][0]['values'] + ) + + return flexmock(raise_for_status=lambda: None) + + flexmock(module.requests).should_receive('post').replace_with(post) + + module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run=False) module.ping_monitor( hook_config, flexmock(), config_filename, module.monitor.State.FINISH, flexmock(), - dry_run, + dry_run=False, ) + module.destroy_monitor(hook_config, flexmock(), flexmock(), dry_run=False) - for handler in tuple(logging.getLogger().handlers): - if isinstance(handler, module.Loki_log_handler): - assert any( - value[1] == f'{module.MONITOR_STATE_TO_LOKI[module.monitor.State.FINISH]} backup' - for value in handler.buffer.root['streams'][0]['values'] - ) - return - - raise AssertionError() + assert post_called def test_destroy_monitor_removes_log_handler(): @@ -82,9 +88,10 @@ def test_destroy_monitor_removes_log_handler(): ''' hook_config = {'url': 'http://localhost:3100/loki/api/v1/push', 'labels': {'app': 'borgmatic'}} config_filename = 'test.yaml' - dry_run = True - module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run) - module.destroy_monitor(hook_config, flexmock(), flexmock(), dry_run) + flexmock(module.requests).should_receive('post').never() + + module.initialize_monitor(hook_config, flexmock(), config_filename, flexmock(), dry_run=False) + module.destroy_monitor(hook_config, flexmock(), flexmock(), dry_run=False) for handler in tuple(logging.getLogger().handlers): if isinstance(handler, module.Loki_log_handler):