From 2392bc8390cffc6ce98dc95872147e477409526b Mon Sep 17 00:00:00 2001 From: George Pochiscan Date: Mon, 13 Dec 2021 11:40:14 +0200 Subject: [PATCH] Fixed service output for warn/crit states, cleared mixed indentation. --- check_mk-infoblox/infoblox_dns-1.0.0.mkp | Bin 3031 -> 0 bytes check_mk-infoblox/infoblox_dns-1.0.1.mkp | Bin 0 -> 3066 bytes .../share/check_mk/checks/infoblox_aat5_count | 8 ++++---- .../share/check_mk/checks/infoblox_aat5_latency | 10 ++++------ .../share/check_mk/checks/infoblox_nonaat5_count | 8 ++++---- .../check_mk/checks/infoblox_nonaat5_latency | 9 ++++----- 6 files changed, 16 insertions(+), 19 deletions(-) delete mode 100644 check_mk-infoblox/infoblox_dns-1.0.0.mkp create mode 100644 check_mk-infoblox/infoblox_dns-1.0.1.mkp diff --git a/check_mk-infoblox/infoblox_dns-1.0.0.mkp b/check_mk-infoblox/infoblox_dns-1.0.0.mkp deleted file mode 100644 index d38b54c996a573c33bc17c574492950f436d6c70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3031 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 warn: if count > crit: state = 2 - count_info = "(crit above %s)" % crit + count_info = "Number of AAT5 Requests is %s (crit above %s requests)" % (count, crit) else: state = 1 - count_info = "(warn above %s)" % warn + count_info = "Number of AAT5 Requests is %s (warn above %s requests)" % (count, warn) else: - count_info = "Count is is %s" % count + count_info = "Number of AAT5 Requests is %s" % count yield state, count_info, [('Count', count, warn, crit)] check_info['infoblox_aat5_count'] = { diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency index b77f57f..bf4b3e0 100644 --- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency +++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_aat5_latency @@ -33,24 +33,22 @@ def inventory_infoblox_aat5_latency(info): yield item, {} def check_infoblox_aat5_latency(item, params, info): - print item latency=int(info[0][0]) - print params if params: warn, crit = params['infoblox_latency'] else: - warn, crit = (50, 100) + warn, crit = (50, 100) state = 0 latency_info = "" if latency > warn: if latency > crit: state = 2 - latency_info = "(crit above %s)" % crit + latency_info = "Latency is %s ms (crit above %s ms)" % (latency, crit) else: state = 1 - latency_info = "(warn above %s)" % warn + latency_info = "Latency is %s ms (warn above %s ms)" % (latency, warn) else: - latency_info = "Latency is %s" % latency + latency_info = "Latency is %s ms" % latency yield state, latency_info, [('Latency', latency, warn, crit)] check_info['infoblox_aat5_latency'] = { diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count index 809647b..e5b14a9 100644 --- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count +++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_count @@ -38,18 +38,18 @@ def check_infoblox_nonaat5_count(item, params, info): if params: warn, crit = params['infoblox_count'] else: - warn, crit = (50, 100) + warn, crit = (50, 100) state = 0 count_info = "" if count > warn: if count > crit: state = 2 - count_info = "(crit above %s)" % crit + count_info = "Number of NonAAT5 Requests is %s (crit above %s requests)" % (count, crit) else: state = 1 - count_info = "(warn above %s)" % warn + count_info = "Number of NonAAT5 Requests is %s (warn above %s requests)" % (count, warn) else: - count_info = "Count is is %s" % count + count_info = "Number of NonAAT5 Requests is %s" % count yield state, count_info, [('Count', count, warn, crit)] check_info['infoblox_nonaat5_count'] = { diff --git a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency index 6b62d61..e499e3a 100644 --- a/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency +++ b/check_mk-infoblox/local/share/check_mk/checks/infoblox_nonaat5_latency @@ -35,22 +35,21 @@ def inventory_infoblox_nonaat5_latency(info): def check_infoblox_nonaat5_latency(item, params, info): latency=int(info[0][0]) - print params if params: warn, crit = params['infoblox_latency'] else: - warn, crit = (50, 100) + warn, crit = (50, 100) state = 0 latency_info = "" if latency > warn: if latency > crit: state = 2 - latency_info = "(crit above %s)" % crit + latency_info = "Latency is %s ms (crit above %s ms)" % (latency, crit) else: state = 1 - latency_info = "(warn above %s)" % warn + latency_info = "Latency is %s ms (warn above %s ms)" % (latency, warn) else: - latency_info = "Latency is %s" % latency + latency_info = "Latency is %s ms" % latency yield state, latency_info, [('Latency', latency, warn, crit)] check_info['infoblox_nonaat5_latency'] = {