[checkmk-commits] sap_hana_{backup, license}: Fixed non matching ruleset {{SAP HANA Backup}} resp. {{SAP HANA License}}

Module: check_mk Branch: master Commit: 1e742f456859d0e38a0cadce6a3e27ddb2b77821 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1e742f456859d0… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 11 14:13:19 2019 +0200 sap_hana_{backup,license}: Fixed non matching ruleset {{SAP HANA Backup}} resp. {{SAP HANA License}} Change-Id: I26ce70d549198d5d385e89f354052c5b37e30170 --- checks/sap_hana_backup | 4 ++-- checks/sap_hana_license | 6 +++--- cmk/gui/plugins/metrics/check_mk.py | 2 +- cmk/gui/plugins/wato/check_parameters/sap_hana.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/checks/sap_hana_backup b/checks/sap_hana_backup index 73c94c0..5478814 100644 --- a/checks/sap_hana_backup +++ b/checks/sap_hana_backup @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. factory_settings['sap_hana_backup'] = { - 'backup_age_levels': (24 * 60 * 60, 2 * 24 * 60 * 60), + 'backup_age': (24 * 60 * 60, 2 * 24 * 60 * 60), } @@ -77,7 +77,7 @@ def check_sap_hana_backup(item, params, parsed): yield check_levels( time.time() - data['sys_end_time'], "backup_age", - params['backup_age_levels'], + params['backup_age'], human_readable_func=get_age_human_readable, infoname="Age") diff --git a/checks/sap_hana_license b/checks/sap_hana_license index 3aca5f1..1387222 100644 --- a/checks/sap_hana_license +++ b/checks/sap_hana_license @@ -25,7 +25,7 @@ # Boston, MA 02110-1301 USA. factory_settings['sap_hana_license_default_levels'] = { - 'license_usage_perc': (80.0, 90.0), + 'license_usage': (80.0, 90.0), } SAP_HANA_MAYBE = collections.namedtuple("SAP_HANA_MAYBE", ["bool", "value"]) @@ -119,8 +119,8 @@ def _check_product_usage(size, limit, params): else: yield check_levels( usage_perc, - "license_usage_perc", - params.get('license_usage_perc', (None, None)), + "license_usage", + params['license_usage'], human_readable_func=get_percent_human_readable, infoname="Usage") diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 6482bf8..21c1b0c 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -3124,7 +3124,7 @@ metric_info["license_size"] = { "color": "11/a", } -metric_info["license_usage_perc"] = { +metric_info["license_usage"] = { "title": _("License usage"), "unit": "%", "color": "13/a", diff --git a/cmk/gui/plugins/wato/check_parameters/sap_hana.py b/cmk/gui/plugins/wato/check_parameters/sap_hana.py index 1a5f837..cd838dc 100644 --- a/cmk/gui/plugins/wato/check_parameters/sap_hana.py +++ b/cmk/gui/plugins/wato/check_parameters/sap_hana.py @@ -64,7 +64,7 @@ class RulespecCheckgroupParametersSapHanaBackup(CheckParameterRulespecWithItem): @property def parameter_valuespec(self): return Dictionary(elements=[ - ('backup_age_levels', + ('backup_age', Alternative( title=_("Upper levels for the backup age"), style="dropdown",