Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64361 discussions

Check_MK Git: check_mk: Fixed syntax of zypper check output

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 718b409871dfa13a8d283139157b362010c3e7de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=718b409871dfa1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 13:57:10 2012 +0200 Fixed syntax of zypper check output --- checks/zypper | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/checks/zypper b/checks/zypper index f5cb3c4..ae27d81 100644 --- a/checks/zypper +++ b/checks/zypper @@ -56,7 +56,7 @@ def check_zypper(_no_item, _no_params, info): state = 0 - infotext = nagios_state_names[state] + " - %d updates" % updates + infotext = " - %d updates" % updates if updates: patch_items = patch_types.items() patch_items.sort() @@ -77,12 +77,9 @@ def check_zypper(_no_item, _no_params, info): state = max(1, state) infotext += ", %d locks(!)" % len(locks) - return state, infotext + return state, nagios_state_names[state] + infotext - - return 3, "Hirni" - check_info['zypper'] = { "check_function" : check_zypper, "inventory_function" : inventory_zypper,

12 years

Check_MK Git: check_mk: FIX: zypper: deal with output with only 5 columns

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 24cb171473ec0a2238503072e5cf4135f40fff58 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=24cb171473ec0a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 13:54:36 2012 +0200 FIX: zypper: deal with output with only 5 columns --- checks/zypper | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/checks/zypper b/checks/zypper index 49a6a4c..f5cb3c4 100644 --- a/checks/zypper +++ b/checks/zypper @@ -46,7 +46,7 @@ def check_zypper(_no_item, _no_params, info): locks = [] for line in info: # 5 patches needed (2 security patches) - if len(line) >= 6 and line[4].strip() == 'needed': + if len(line) >= 5 and line[4].strip() == 'needed': patch_type = line[3].strip() patch_types.setdefault(patch_type, 0) patch_types[patch_type] += 1 @@ -54,12 +54,7 @@ def check_zypper(_no_item, _no_params, info): elif len(line) == 4: locks.append(line[1]) - if patch_types.get('security'): - state = 2 - elif updates: - state = 1 - else: - state = 0 + state = 0 infotext = nagios_state_names[state] + " - %d updates" % updates if updates: @@ -67,7 +62,15 @@ def check_zypper(_no_item, _no_params, info): patch_items.sort() infos = [] for t,c in patch_items: - infos.append("%s: %d(%s)" % (t, c, t == "security" and '!!' or '!')) + if t == "security": + marker = '(!!)' + state = 2 + elif t == "recommended": + marker = '(!)' + state = max(state, 1) + else: + marker = '' + infos.append("%s: %d%s" % (t, c, marker)) infotext += " (" + ", ".join(infos) + ")" if locks:

12 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 4d33d44c9e8ed12d159700f1244bd4e7f0124c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d33d44c9e8ed1… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Sep 13 13:54:40 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: Merge branch 'master' of mathias-kettner.de: check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 947fdd560406c46187d2f38d9c85fe03fa652b3f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=947fdd560406c4… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Sep 13 13:50:50 2012 +0200 Merge branch 'master' of mathias-kettner.de:check_mk ---

12 years

Check_MK Git: check_mk: aironet checks: support more access point types

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 2d089e95e26952e320a8302609b51748227d447a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d089e95e26952… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Thu Sep 13 13:50:43 2012 +0200 aironet checks: support more access point types --- ChangeLog | 2 ++ checks/aironet_clients | 4 +++- checks/aironet_errors | 4 +++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dff937..80594d3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -52,6 +52,8 @@ * Added Checks for UPS devices * cisco_hsrp: New Check for monitoring HSRP groups on Cisco Routers. (SMIv2 version) * zypper: new check and plugin mk_zypper for checking zypper updates. + * aironet_clients: Added support for further Cisco WLAN APs (Thanks to Stefan Eriksson for OIDs) + * aironet_errors: Added support for further Cisco WLAN APs WATO: * Added permission to control the "clone host" feature in WATO diff --git a/checks/aironet_clients b/checks/aironet_clients index 67adbd6..7bda2ec 100644 --- a/checks/aironet_clients +++ b/checks/aironet_clients @@ -91,8 +91,10 @@ snmp_info['aironet_clients'] = ( ".1.3.6.1.4.1.9.9.273.1.3.1.1", [ 3, 4 ]) snmp_scan_functions['aironet_clients'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ - ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525", + ".1.3.6.1.4.1.9.1.618", + ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.758", + ".1.3.6.1.4.1.9.1.1034", ".1.3.6.1.4.1.9.1.1247", ] diff --git a/checks/aironet_errors b/checks/aironet_errors index 0db145d..d58d366 100644 --- a/checks/aironet_errors +++ b/checks/aironet_errors @@ -55,8 +55,10 @@ snmp_info['aironet_errors'] = ( ".1.3.6.1.4.1.9.9.272.1.2.1.1.1", [0, 2] ) snmp_scan_functions['aironet_errors'] \ = lambda oid: oid(".1.3.6.1.2.1.1.2.0") in [ - ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.525", + ".1.3.6.1.4.1.9.1.618", + ".1.3.6.1.4.1.9.1.685", ".1.3.6.1.4.1.9.1.758", + ".1.3.6.1.4.1.9.1.1034", ".1.3.6.1.4.1.9.1.1247", ]

12 years

Check_MK Git: check_mk: Fix typo in man page

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 1889fcc9c1a58043fe15725d4320e33d356880d8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1889fcc9c1a580… Author: Florian Heigl <fh(a)mathias-kettner.de> Date: Wed Sep 12 16:09:15 2012 +0200 Fix typo in man page --- checkman/cisco_hsrp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/checkman/cisco_hsrp b/checkman/cisco_hsrp index 77457f5..f9c70ef 100644 --- a/checkman/cisco_hsrp +++ b/checkman/cisco_hsrp @@ -19,7 +19,7 @@ description: to {WARN}, assuming that HSRP is doing it's job. Should the status ever be a different one that for example points to HSRP - still initializing, the check will return {CRIT} as HSRP is assumet to be + still initializing, the check will return {CRIT} as HSRP is assumed to be inoperable in these states. perfdata:

12 years

Check_MK Git: check_mk: ValueSpec ListOf: fixed complaining

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: a539e10bcdd339564563fe8a7836e5d2d97e46f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a539e10bcdd339… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 12 10:01:08 2012 +0200 ValueSpec ListOf: fixed complaining --- ChangeLog | 2 ++ web/htdocs/valuespec.py | 7 +++++++ 2 files changed, 9 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 16248b1..41b4198 100644 --- a/ChangeLog +++ b/ChangeLog @@ -76,6 +76,8 @@ * FIX: Fixed double hook execution when using localized multisite * FIX: User list shows names of contactgroups when no alias given * FIX: Remove also user settings and event console rule on factory reset + * FIX: complex list widgets (ListOf) failed back to old value when + complaining BI: * Great speed up of rule compilation in large environments diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 85b7590..afff6b0 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -592,6 +592,13 @@ class ListOf(ValueSpec): # numbering in labels, etc. possible). The current number # of entries is stored in the hidden variable 'varprefix' def render_input(self, varprefix, value): + + # In the 'complain' phase, where the user already saved the + # form but the validation failed, we must not display the + # original 'value' but take the value from the HTML variables. + if html.has_var("%s_count" % varprefix): + value = self.from_html_vars(varprefix) + html.write('<input type=hidden name="%s_count" value="%d" id="%s_count">\n' % (varprefix, len(value), varprefix))

12 years

Check_MK Git: check_mk: ValueSpec Filename: set default size to 60 chars

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 03a95ba411398aa4cd3e071778ddcde83308495e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=03a95ba411398a… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Sep 12 09:53:11 2012 +0200 ValueSpec Filename: set default size to 60 chars --- web/htdocs/valuespec.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 76630d4..85b7590 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -476,6 +476,8 @@ class TextAreaUnicode(TextUnicode): class Filename(TextAscii): def __init__(self, **kwargs): TextAscii.__init__(self, **kwargs) + if "size" not in kwargs: + self._size = 60 if "default" in kwargs: self._default_path = kwargs["default"] else:

12 years

Check_MK Git: check_mk: Merge branch 'master' of ssh://mathias-kettner.de/ check_mk

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 5fa144e062b022e4f45f04185bf9007acd0fb42a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5fa144e062b022… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 11 11:11:45 2012 +0200 Merge branch 'master' of ssh://mathias-kettner.de/check_mk ---

12 years

Check_MK Git: check_mk: SNMP scan: fixed case where = was contained in SNMP info

by git＠mathias-kettner.de

Module: check_mk Branch: master Commit: 42c67e7ffdcae951146e505bb0941df505c19571 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=42c67e7ffdcae9… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Sep 11 11:11:42 2012 +0200 SNMP scan: fixed case where = was contained in SNMP info --- ChangeLog | 1 + modules/check_mk.py | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dff937..16248b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ * Allow subcheck to be in a separate file (e.g. foo.bar) * Contacts can now define *_notification_commands attributes which can now override the default notification command check-mk-notify + * SNMP scan: fixed case where = was contained in SNMP info Checks & Agents: * New Checks for Siemens Blades (BX600) diff --git a/modules/check_mk.py b/modules/check_mk.py index 46e01d2..230cfeb 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -710,7 +710,7 @@ def get_single_oid(hostname, ipaddress, oid): snmp_process = os.popen(command, "r") line = snmp_process.readline().strip() - item, value = line.split("=") + item, value = line.split("=", 1) value = value.strip() if opt_debug: sys.stdout.write("SNMP answer: ==> [%s]\n" % value)

12 years

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits