Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64518 discussions

Check_MK Git: check_mk: FIX Added HTML escaping to several global settings attributes

by Mathias Kettner

Module: check_mk Branch: master Commit: e96b390633a0eb0ec0a4b83f476b9b2b4225eb2d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e96b390633a0eb… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 21 16:50:39 2013 +0100 FIX Added HTML escaping to several global settings attributes This fixes problems when display settings the contain characters like <tt><</tt> and <tt>></tt>. One example is the setting for the email command, which might contain strings like <tt>-r '<Hirni Baldi> hirni@baldi'</tt>. --- .werks/220 | 4 +++- ChangeLog | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.werks/220 b/.werks/220 index bfadf2f..b25de65 100644 --- a/.werks/220 +++ b/.werks/220 @@ -5,4 +5,6 @@ Version: 1.2.3i7 Date: 1384955251 Class: fix - +This fixes problems when display settings the contain characters +like <tt><</tt> and <tt>></tt>. One example is the setting +for the email command, which might contain strings like <tt>-r '<Hirni Baldi> hirni@baldi'</tt>. diff --git a/ChangeLog b/ChangeLog index 50cda46..246bf18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,7 +59,7 @@ * 0213 FIX: LDAP: Various small improvements for handling the LDAP user connector * 0039 FIX: Encoding bug on rendering global settings... * 0219 FIX: Improved output of long contact group names in WATO folders - * 0220 FIX: Added HTML escaping to several global settings attributes + * 0220 FIX: Added HTML escaping to several global settings attributes... * 0234 FIX: Improved handling of interface inventory states / types... Notifications:

10 years, 10 months

Check_MK Git: check_mk: arc_raid_status: New check for Areca RAID controllers

by Mathias Kettner

Module: check_mk Branch: master Commit: 22f3a5b70ba18b95e35ea7acc4f16c8b4780cb34 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=22f3a5b70ba18b… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 21 16:52:40 2013 +0100 arc_raid_status: New check for Areca RAID controllers --- .werks/97 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/97 b/.werks/97 index 0471348..93f376b 100644 --- a/.werks/97 +++ b/.werks/97 @@ -1,4 +1,4 @@ -Title: New Check for Areca Raid Controllers +Title: arc_raid_status: New check for Areca RAID controllers Level: 1 Component: checks Version: 1.2.3i7 diff --git a/ChangeLog b/ChangeLog index 246bf18..5c92551 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,7 +19,7 @@ * 0069 veeam_client: limits for time since last backup introduced * 0214 Logwatch: context lines can now be disabled using nocontext=1... * 0038 New checks for casa: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power - * 0097 New Check for Areca Raid Controllers + * 0097 arc_raid_status: New check for Areca RAID controllers * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress * 0066 FIX: veeam_jobs: check behaviour improved when backup is in progress

10 years, 10 months

Check_MK Git: check_mk: FIX Fixed display problems in WATO folders with long contact group names

by Mathias Kettner

Module: check_mk Branch: master Commit: 747e8034987b70a6e1ec9e99d43c441ba6b569f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=747e8034987b70… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 21 16:55:27 2013 +0100 FIX Fixed display problems in WATO folders with long contact group names --- .werks/219 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/219 b/.werks/219 index 6b82a0d..384348a 100644 --- a/.werks/219 +++ b/.werks/219 @@ -1,4 +1,4 @@ -Title: Improved output of long contact group names in WATO folders +Title: Fixed display problems in WATO folders with long contact group names Level: 1 Component: wato Version: 1.2.3i7 diff --git a/ChangeLog b/ChangeLog index 5c92551..82ae496 100644 --- a/ChangeLog +++ b/ChangeLog @@ -58,7 +58,7 @@ * 0095 FIX: Fixed problem with portnumber in Wato Distributed Monitoring dialog * 0213 FIX: LDAP: Various small improvements for handling the LDAP user connector * 0039 FIX: Encoding bug on rendering global settings... - * 0219 FIX: Improved output of long contact group names in WATO folders + * 0219 FIX: Fixed display problems in WATO folders with long contact group names * 0220 FIX: Added HTML escaping to several global settings attributes... * 0234 FIX: Improved handling of interface inventory states / types...

10 years, 10 months

Check_MK Git: check_mk: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa

by Mathias Kettner

Module: check_mk Branch: master Commit: a6b9374414518d602958c5faa139727f389128f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6b9374414518d… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Nov 21 17:01:24 2013 +0100 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa --- .werks/38 | 2 +- ChangeLog | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/38 b/.werks/38 index 4a48160..68b7330 100644 --- a/.werks/38 +++ b/.werks/38 @@ -1,4 +1,4 @@ -Title: New checks for casa: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power +Title: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa Level: 2 Component: checks Version: 1.2.3i7 diff --git a/ChangeLog b/ChangeLog index 51cbb46..511b9a3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,7 +18,7 @@ * 0004 df: dynamic filesystem levels now reorder levels automatically... * 0069 veeam_client: limits for time since last backup introduced * 0214 Logwatch: context lines can now be disabled using nocontext=1... - * 0038 New checks for casa: casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power + * 0038 casa_cpu_mem casa_cpu_temp casa_cpu_util casa_fan casa_power: New checks for casa * 0097 arc_raid_status: New check for Areca RAID controllers * 0024 FIX: cisco_wlc: removed configuration parameter ap_model * 0065 FIX: veeam_client: check behaviour improved when backup is in progress

10 years, 10 months

Check_MK Git: check_mk: Cleaned up position of subprocess module

by Bastian Kuhn

Module: check_mk Branch: master Commit: 3521f5e79465dab0c62663b87d9267bbae9e713f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3521f5e79465da… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 21 15:54:19 2013 +0100 Cleaned up position of subprocess module --- modules/check_mk.py | 1 - modules/check_mk_base.py | 2 +- modules/snmp.py | 2 ++ 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index 019b829..331e462 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -3417,7 +3417,6 @@ def manpage_display_header(cat): return " -> ".join([manpage_catalog_titles.get(e,e) for e in cat ]) def run_dialog(args): - import subprocess env = { "TERM": os.getenv("TERM", "linux"), "LANG": "de_DE.UTF-8" diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index 74a2c09..a1a5f60 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, os, sys, time, re, signal, math, tempfile, subprocess +import socket, os, sys, time, re, signal, math, tempfile # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets' diff --git a/modules/snmp.py b/modules/snmp.py index 5f3a5f7..b44890d 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -26,6 +26,8 @@ # This module is needed only for SNMP based checks +import subprocess + OID_END = 0 OID_STRING = -1 OID_BIN = -2

10 years, 10 months

Check_MK Git: check_mk: brocade_mlx: fixed wording

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ed2064b84c943a78de89893ff1f13cbd93c19c5f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed2064b84c943a… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Nov 21 15:45:49 2013 +0100 brocade_mlx: fixed wording --- checks/brocade_mlx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/brocade_mlx b/checks/brocade_mlx index 582f920..025c73d 100644 --- a/checks/brocade_mlx +++ b/checks/brocade_mlx @@ -162,7 +162,7 @@ def check_brocade_mlx_module_mem(item, params, info): for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: if module_state != "10": - return 3, "Module is not in state 10 (running)" + return 3, "Module is not in state running" mem_avail = saveint(mem_avail) mem_total = saveint(mem_total) @@ -223,7 +223,7 @@ def check_brocade_mlx_module_cpu(item, params, info): for module_id, module_descr, module_state, mem_total, mem_avail in info[2]: if combine_item(module_id, module_descr) == item: if module_state != "10": - return 3, "Module is not in state 10 (running)" + return 3, "Module is not in state running" cpu_util1 = "" cpu_util5 = ""

10 years, 10 months

Check_MK Git: check_mk: FIX: Missing module subproccess in cmk_base

by Bastian Kuhn

Module: check_mk Branch: master Commit: c7f7d1a3852a6758dbdced792fb89cd59833e631 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c7f7d1a3852a67… Author: Bastian Kuhn <bk(a)mathias-kettner.de> Date: Thu Nov 21 15:27:16 2013 +0100 FIX: Missing module subproccess in cmk_base --- modules/check_mk_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/check_mk_base.py b/modules/check_mk_base.py index a1a5f60..74a2c09 100644 --- a/modules/check_mk_base.py +++ b/modules/check_mk_base.py @@ -24,7 +24,7 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -import socket, os, sys, time, re, signal, math, tempfile +import socket, os, sys, time, re, signal, math, tempfile, subprocess # Python 2.3 does not have 'set' in normal namespace. # But it can be imported from 'sets'

10 years, 10 months

Check_MK Git: check_mk: FIX stored snmpwalks now get correct encoding of binary values

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: ce56e57b1d23bab49d02a33c5941e175a535eb6a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ce56e57b1d23ba… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Nov 21 13:26:55 2013 +0100 FIX stored snmpwalks now get correct encoding of binary values In stored snmpwalks up to now binary values were stored in their binary representation which caused problems when reading them. Now they are stored in their ASCII representation. Furthermore for producing stored walks the inline snmp is never used. Storedwalks are allways created by the command line tools no regard what the Global Setting is set to. --- .werks/81 | 14 ++++++++++++++ ChangeLog | 1 + modules/check_mk.py | 5 +---- modules/snmp.py | 10 +++++----- 4 files changed, 21 insertions(+), 9 deletions(-) diff --git a/.werks/81 b/.werks/81 new file mode 100644 index 0000000..78126a5 --- /dev/null +++ b/.werks/81 @@ -0,0 +1,14 @@ +Title: stored snmpwalks now get correct encoding of binary values +Level: 2 +Component: checks +Version: 1.2.3i7 +Date: 1385036527 +Class: fix + +In stored snmpwalks up to now binary values were stored in their binary +representation which caused problems when reading them. Now they are +stored in their ASCII representation. + +Furthermore for producing stored walks the inline snmp is never used. +Storedwalks are allways created by the command line tools no regard what +the Global Setting is set to. diff --git a/ChangeLog b/ChangeLog index 2c3230a..60bc479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 0209 FIX: Cleaned up bad code in fileinfo.groups check * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman: alcatel power - now with correct classification... + * 0081 FIX: stored snmpwalks now get correct encoding of binary values... Multisite: * 0001 New filters for selecting several host/service-groups at once... diff --git a/modules/check_mk.py b/modules/check_mk.py index a1cefa8..019b829 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -4142,10 +4142,7 @@ def do_snmpwalk_on(hostname, filename): sys.stdout.write("Walk on \"%s\"..." % oid) sys.stdout.flush() - if has_inline_snmp and use_inline_snmp: - results = inline_snmpwalk_on_suboid(hostname, oid, strip_values = False) - else: - results = snmpwalk_on_suboid(hostname, ip, oid) + results = snmpwalk_on_suboid(hostname, ip, oid, hex_plain = True) for oid, value in results: out.write("%s %s\n" % (oid, value)) diff --git a/modules/snmp.py b/modules/snmp.py index b46d048..5f3a5f7 100644 --- a/modules/snmp.py +++ b/modules/snmp.py @@ -30,16 +30,16 @@ OID_END = 0 OID_STRING = -1 OID_BIN = -2 -def strip_snmp_value(value): +def strip_snmp_value(value, hex_plain = False): v = value.strip() if v.startswith('"'): v = v[1:-1] if len(v) > 2 and is_hex_string(v): - return convert_from_hex(v) + return not hex_plain and convert_from_hex(v) or value else: return v.strip() else: - return v.strip() + return v def is_hex_string(value): # as far as I remember, snmpwalk puts a trailing space within @@ -398,7 +398,7 @@ def snmp_decode_string(text): # | Non-inline SNMP handling code. Kept for compatibility. | # '----------------------------------------------------------------------' -def snmpwalk_on_suboid(hostname, ip, oid): +def snmpwalk_on_suboid(hostname, ip, oid, hex_plain = False): portspec = snmp_port_spec(hostname) command = snmp_walk_command(hostname) + \ " -OQ -OU -On -Ot %s%s %s" % (ip, portspec, oid) @@ -433,7 +433,7 @@ def snmpwalk_on_suboid(hostname, ip, oid): value += " " + nextline if value[-1] == '"': break - rowinfo.append((oid, strip_snmp_value(value))) + rowinfo.append((oid, strip_snmp_value(value, hex_plain))) except StopIteration: pass

10 years, 10 months

Check_MK Git: check_mk: ChangeLog: fixed merge conflict

by Bernd Stroessenreuther

Module: check_mk Branch: master Commit: 5abeaeead04c7741ef86cea13247d2d3ce938007 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5abeaeead04c77… Author: Bernd Stroessenreuther <bs(a)mathias-kettner.de> Date: Thu Nov 21 13:28:32 2013 +0100 ChangeLog: fixed merge conflict ---

10 years, 10 months

Check_MK Git: check_mk: FIX Interface Checks: Counters are now skipped when interface is down

by Lars Michelsen

Module: check_mk Branch: master Commit: bd79aed23bca3e3775d7df81154cd4a9b072ec48 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd79aed23bca3e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Nov 21 11:23:12 2013 +0100 FIX Interface Checks: Counters are now skipped when interface is down In most cases it was no problem to check the counter values, as they are reset to zero for most devices. But for some devices, the counters are still having values - and maybe also change. To handle this, we simply ignore the counter values for down interfaces. --- .werks/283 | 11 +++++++++++ ChangeLog | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/283 b/.werks/283 new file mode 100644 index 0000000..5c47ed9 --- /dev/null +++ b/.werks/283 @@ -0,0 +1,11 @@ +Title: Interface Checks: Counters are now skipped when interface is down +Level: 1 +Component: checks +Version: 1.2.3i7 +Date: 1385029361 +Class: fix + +In most cases it was no problem to check the counter values, as they +are reset to zero for most devices. But for some devices, the counters +are still having values - and maybe also change. To handle this, we +simply ignore the counter values for down interfaces. diff --git a/ChangeLog b/ChangeLog index 09e942e..19d0522 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,7 +26,7 @@ * 0209 FIX: Cleaned up bad code in fileinfo.groups check * 0003 FIX: ps: Remove exceeding [ and ] in service description when using process inventory... * 0037 FIX: checkman: alcatel power - now with correct classification... - * 0233 FIX: Interface Checks: Counters are now skipped when interface is down... + * 0283 FIX: Interface Checks: Counters are now skipped when interface is down... Multisite: * 0001 New filters for selecting several host/service-groups at once...

10 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits