netinvent/npbackup
1
1
Fork 0
mirror of https://github.com/netinvent/npbackup.git synced 2024-09-21 07:16:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make minimum_backup_size_error unit aware

Browse source
This commit is contained in:
Orsiris de Jong 2024-01-22 12:39:32 +01:00
parent fa7fc8f69b
commit 8387ebc354
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
npbackup/configuration.py
View file

@ -164,7 +164,7 @@ empty_config_dict = {
"exclude_files_larger_than": None,
"additional_parameters": None,
"additional_backup_only_parameters": None,
"minimum_backup_size_error": "10", # In megabytes
"minimum_backup_size_error": "10MiB", # allows BytesConverter units
"pre_exec_commands": [],
"pre_exec_per_command_timeout": 3600,
"pre_exec_failure_is_fatal": False,

4
npbackup/restic_metrics/__init__.py
View file

@ -168,7 +168,7 @@ def restic_str_output_to_json(
def restic_json_to_prometheus(
restic_result: bool, restic_json: dict, labels: dict = None, minimum_backup_size_error: float = None,
restic_result: bool, restic_json: dict, labels: dict = None, minimum_backup_size_error: str = None,
) -> Tuple[bool, List[str], bool]:
"""
Transform a restic JSON result into prometheus metrics
@ -225,7 +225,7 @@ def restic_json_to_prometheus(
backup_too_small = False
if minimum_backup_size_error:
if restic_json["data_added"] < minimum_backup_size_error:
if restic_json["data_added"] < int(BytesConverter(str(minimum_backup_size_error).replace(" ", ""))):
backup_too_small = True
good_backup = restic_result and not backup_too_small