From c3cc5cc95c3a7ad84084dd955e2e76bf30134894 Mon Sep 17 00:00:00 2001 From: jetchirag Date: Sat, 25 Mar 2023 20:04:19 +0530 Subject: [PATCH] Minor bug fixes, removed debug print and restored cronitor description in schema Signed-off-by: jetchirag --- borgmatic/commands/borgmatic.py | 2 +- borgmatic/config/schema.yaml | 5 +++++ borgmatic/hooks/cronitor.py | 1 - 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/borgmatic/commands/borgmatic.py b/borgmatic/commands/borgmatic.py index 7b2f1ef5..c20b3056 100644 --- a/borgmatic/commands/borgmatic.py +++ b/borgmatic/commands/borgmatic.py @@ -66,7 +66,7 @@ def run_configuration(config_filename, config, arguments): error_repository = '' using_primary_action = {'create', 'prune', 'compact', 'check'}.intersection(arguments) monitoring_log_level = verbosity_to_log_level(global_arguments.monitoring_verbosity) - action_name = list(arguments.keys())[0] + action_name = next(iter(arguments)) try: local_borg_version = borg_version.local_borg_version(storage, local_path) diff --git a/borgmatic/config/schema.yaml b/borgmatic/config/schema.yaml index b1a5ddbe..f1ccf7fc 100644 --- a/borgmatic/config/schema.yaml +++ b/borgmatic/config/schema.yaml @@ -1259,6 +1259,11 @@ properties: If this is set, other properties will be ignored and replaced by this value. example: https://cronitor.link/d3x0c1 + description: | + Configuration for a monitoring integration with Cronitor. + Create an account at https://cronitor.io if you'd + like to use this service. See borgmatic monitoring + documentation for details. pagerduty: type: object required: ['integration_key'] diff --git a/borgmatic/hooks/cronitor.py b/borgmatic/hooks/cronitor.py index 563c376a..0818a5a8 100644 --- a/borgmatic/hooks/cronitor.py +++ b/borgmatic/hooks/cronitor.py @@ -37,7 +37,6 @@ def ping_monitor(hook_config, config_filename, state, monitoring_log_level, dry_ try: ping_url = '{}/{}'.format(hook_config[action_name], MONITOR_STATE_TO_CRONITOR[state]) except KeyError: - print('KeyError') return logger.info(