Checkmk git commits March 2015

checkmk-commits@lists.checkmk.com

7 participants
320 discussions

Check_MK Git: check_mk: #2107 mkeventd: can now handle syslog format of Sophos firewalls

by Goetz Golla

Module: check_mk Branch: master Commit: 60b683cab25543fb779acdba87cafa72c0e32f0e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=60b683cab25543… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 25 15:16:02 2015 +0100 #2107 mkeventd: can now handle syslog format of Sophos firewalls --- .werks/2107 | 9 +++++++++ ChangeLog | 1 + mkeventd/bin/mkeventd | 12 +++++++++++- 3 files changed, 21 insertions(+), 1 deletion(-) diff --git a/.werks/2107 b/.werks/2107 new file mode 100644 index 0000000..506b6a3 --- /dev/null +++ b/.werks/2107 @@ -0,0 +1,9 @@ +Title: mkeventd: can now handle syslog format of Sophos firewalls +Level: 1 +Component: ec +Compatible: compat +Version: 1.2.7i1 +Date: 1427292924 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index e1d1140..babe25f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -417,6 +417,7 @@ * 1672 Now able to reclassify logwatch messages before forwarding them to the event console... * 1878 SEC: Fixed possible shell injection when filtering the EC archive... * 2099 Allow replication of Event Console rule and settings... + * 2107 mkeventd: can now handle syslog format of Sophos firewalls * 1839 FIX: Fix exception when notifying EC alert into monitoring for traps (because PID is missing) * 1813 FIX: Fixed bug in event console rule editor when no contact groups configured * 1974 FIX: Event console views were randomly ignoring host filters... diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index d6f3b98..255666e 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2147,12 +2147,15 @@ class EventServer: #Varian 7: logwatch.ec event forwarding # <78>@1341847712 Klapprechner /var/log/syslog: message.... + # Variant 8: syslog message from sophos firewall + # <84>2015:03:25-12:02:06 gw pluto[7122]: listening for IKE messages + # FIXME: Would be better to parse the syslog messages in another way: # Split the message by the first ":", then split the syslog header part # and detect which information are present. Take a look at the syslog RFCs # for details. - # Variant 2,3,4,5,6,7 + # Variant 2,3,4,5,6,7,8 if line.startswith('<'): i = line.find('>') prio = int(line[1:i]) @@ -2184,6 +2187,13 @@ class EventServer: event['time'] = time.mktime(time.strptime(rfc3339_part[:19], '%Y-%m-%dT%H:%M:%S')) event.update(self.parse_syslog_info(line)) + # Variant 8 + elif line[10] == '-' and line[19] == ' ': + event['host'] = line.split(' ')[1] + event['time'] = time.mktime(time.strptime(line.split(' ')[0], '%Y:%m:%d-%H:%M:%S')) + rest = line.split(' ')[2:] + event.update(self.parse_syslog_info(rest)) + # Variant 6 elif len(line.split(': ', 1)[0].split(' ')) == 1: event.update(self.parse_syslog_info(line))

9 years, 3 months

Check_MK Git: check_mk: mkeventd: another small fix of exception code to correctly print original ip address

by Goetz Golla

Module: check_mk Branch: master Commit: 59919b36c8181cf779eb8fe7f50d21e7a63f7a3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=59919b36c8181c… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 25 15:13:29 2015 +0100 mkeventd: another small fix of exception code to correctly print original ip address --- mkeventd/bin/mkeventd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 72ec19f..d6f3b98 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2235,7 +2235,7 @@ class EventServer: "priority" : 0, "text" : line, "host" : "", - "ipaddress" : address or "", + "ipaddress" : address and address[0] or "", "application" : "", "pid" : 0, "time" : time.time(),

9 years, 3 months

Check_MK Git: check_mk: mkeventd: fixed determination of original source ip address

by Goetz Golla

Module: check_mk Branch: master Commit: c73bb0baf8a381d796724800a79c317103eb4012 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c73bb0baf8a381… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Wed Mar 25 14:57:14 2015 +0100 mkeventd: fixed determination of original source ip address --- mkeventd/bin/mkeventd | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index d505460..72ec19f 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -2118,7 +2118,8 @@ class EventServer: def parse_event(self, line, address): event = { - "ipaddress" : address or "", + # address is either None or a tuple of (ipaddress, port) + "ipaddress" : address and address[0] or "", } try: # Variant 1: plain syslog message without priority/facility:

9 years, 3 months

Check_MK Git: check_mk: #2160 FIX Fixed rename of hosts where a host with this name did exist before

by Lars Michelsen

Module: check_mk Branch: master Commit: 4f55fc54de4b16fd52930e6cb0708aaae25a1803 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4f55fc54de4b16… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 25 14:49:43 2015 +0100 #2160 FIX Fixed rename of hosts where a host with this name did exist before --- .werks/2160 | 10 ++++++++++ ChangeLog | 1 + modules/automation.py | 1 + 3 files changed, 12 insertions(+) diff --git a/.werks/2160 b/.werks/2160 new file mode 100644 index 0000000..c9d4b30 --- /dev/null +++ b/.werks/2160 @@ -0,0 +1,10 @@ +Title: Fixed rename of hosts where a host with this name did exist before +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427291362 + + diff --git a/ChangeLog b/ChangeLog index d661268..e1d1140 100644 --- a/ChangeLog +++ b/ChangeLog @@ -386,6 +386,7 @@ * 2047 FIX: Allow overriding existing WATO rules by own files in local/ hierarchy... * 2146 FIX: In distributed environments user notification rules trigger a profile synchronisation now... * 2158 FIX: Condition column in WATO rule tables has now a flexible width... + * 2160 FIX: Fixed rename of hosts where a host with this name did exist before Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/modules/automation.py b/modules/automation.py index f2044c7..294bac6 100644 --- a/modules/automation.py +++ b/modules/automation.py @@ -717,6 +717,7 @@ def automation_rename_host(args): def rename_host_dir(basedir, oldname, newname): + import shutil if os.path.exists(basedir + "/" + oldname): if os.path.exists(basedir + "/" + newname): shutil.rmtree(basedir + "/" + newname)

9 years, 3 months

Check_MK Git: check_mk: #2159 FIX netapp_api_disk.summary:

by Lars Michelsen

Changed default thresholds to WARN on the first broken disk, CRIT on 50% Message-ID: <5512a1fb.eDGTW+6a0KC3+qmY%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: d83e023eeabb4a73f199d58123c85231517f0a67 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d83e023eeabb4a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 25 12:54:30 2015 +0100 #2159 FIX netapp_api_disk.summary: Changed default thresholds to WARN on the first broken disk, CRIT on 50% The thresholds are configured using percentage levels on the broken to spare disk ratio. Previous versions of the check simply did not apply levels on the number of broken disks except you configured the ratio. We have added a default ratio of 1% for WARN and 50% for CRIT. --- .werks/2159 | 13 +++++++++++++ ChangeLog | 1 + checks/netapp_api_disk | 6 +++--- web/plugins/wato/check_parameters.py | 4 ++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/.werks/2159 b/.werks/2159 new file mode 100644 index 0000000..8bab418 --- /dev/null +++ b/.werks/2159 @@ -0,0 +1,13 @@ +Title: netapp_api_disk.summary: Changed default thresholds to WARN on the first broken disk, CRIT on 50% +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427284350 + +The thresholds are configured using percentage levels on the broken to spare disk ratio. +Previous versions of the check simply did not apply levels on the number of broken disks +except you configured the ratio. We have added a default ratio of 1% for WARN and 50% for +CRIT. diff --git a/ChangeLog b/ChangeLog index d3db00f..d661268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -280,6 +280,7 @@ * 1896 FIX: ups_socomec_capacity: Now no longer critical when device reports -1 minutes left on battery... * 1238 FIX: check_mk_agent.linux: Do not execute the multipath section if no /etc/multipath.conf exsist. * 1240 FIX: multipath: improved detection for not installed multipath + * 2159 FIX: netapp_api_disk.summary: Changed default thresholds to WARN on the first broken disk, CRIT on 50%... Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/netapp_api_disk b/checks/netapp_api_disk index 19b154a..a7001e5 100644 --- a/checks/netapp_api_disk +++ b/checks/netapp_api_disk @@ -113,8 +113,8 @@ def check_netapp_api_disk_summary(_no_item, params, info): else: yield 0, "%s: %s" % (text, len(disks)) - if params.get("broken_spare_ratio") and len(broken_disks): - warn, crit = params["broken_spare_ratio"] + if broken_disks: + warn, crit = params.get("broken_spare_ratio", (1.0, 50.0)) ratio = float(len(broken_disks)) / (len(broken_disks) + spare_count) * 100 state = 0 if ratio >= crit: @@ -122,7 +122,7 @@ def check_netapp_api_disk_summary(_no_item, params, info): elif ratio >= warn: state = 1 if state: - yield state, "Too much broken disks (levels at %.1f%%/%.1f%%)" % (warn, crit) + yield state, "Too many broken disks (levels at %.1f%%/%.1f%%)" % (warn, crit) check_info["netapp_api_disk.summary"] = { 'check_function' : check_netapp_api_disk_summary, diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 1da968f..1c3afa8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -5592,8 +5592,8 @@ register_check_parameters( Tuple( title = _("Broken to spare ratio"), elements = [ - Percentage(title = _("Warning at or above")), - Percentage(title = _("Critical at or above")), + Percentage(title = _("Warning at or above"), default_value = 1.0), + Percentage(title = _("Critical at or above"), default_value = 50.0), ] )), ],

9 years, 3 months

Check_MK Git: check_mk: siemens_plc: Fixed decreased counters not recovering

by Lars Michelsen

Module: check_mk Branch: master Commit: aa65469d9def298bae6f3a1d37078f964b22b20f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa65469d9def29… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 25 09:17:44 2015 +0100 siemens_plc: Fixed decreased counters not recovering --- checks/siemens_plc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/checks/siemens_plc b/checks/siemens_plc index 913e4ea..db8dad6 100644 --- a/checks/siemens_plc +++ b/checks/siemens_plc @@ -146,9 +146,11 @@ def check_siemens_plc_duration(item, params, info): key = 'siemens_plc.duration.%s' % item if key in g_counters and g_counters[key] < seconds: + g_counters[key] = seconds return 2, 'Reduced from %s to %s' % (get_age_human_readable(g_counters[key]), get_age_human_readable(seconds)) - g_counters[key] = seconds + else: + g_counters[key] = seconds state = 0 warn, crit = params.get('duration', (None, None)) @@ -191,8 +193,10 @@ def check_siemens_plc_counter(item, params, info): key = 'siemens_plc.counter.%s' % item if key in g_counters and g_counters[key] < value: + g_counters[key] = value return 2, 'Reduced from %s to %s' % (g_counters[key], value) - g_counters[key] = value + else: + g_counters[key] = value state = 0 warn, crit = params.get('levels', (None, None))

9 years, 3 months

Check_MK Git: check_mk: #2158 FIX Condition column in WATO rule tables has now a flexible width

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c19d2457a2d90d48ae497afebe07729d0518dfa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c19d2457a2d90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 14:34:57 2015 +0100 #2158 FIX Condition column in WATO rule tables has now a flexible width In previous versions this column had a fixed width, which could lead to strange layout problems where this column is filled up and others would have space for being shrunk to give the condition column more space. --- .werks/2158 | 13 +++++++++++++ ChangeLog | 1 + web/htdocs/wato.css | 4 ---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.werks/2158 b/.werks/2158 new file mode 100644 index 0000000..369a245 --- /dev/null +++ b/.werks/2158 @@ -0,0 +1,13 @@ +Title: Condition column in WATO rule tables has now a flexible width +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1427204010 + +In previous versions this column had a fixed width, which could lead +to strange layout problems where this column is filled up and others +would have space for being shrunk to give the condition column more +space. diff --git a/ChangeLog b/ChangeLog index ca85263..d3db00f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -384,6 +384,7 @@ * 2045 FIX: Avoid fetching SNMP data when showing service list in WATO - unless Full Scan is pressed * 2047 FIX: Allow overriding existing WATO rules by own files in local/ hierarchy... * 2146 FIX: In distributed environments user notification rules trigger a profile synchronisation now... + * 2158 FIX: Condition column in WATO rule tables has now a flexible width... Notifications: * 1662 notification plugin spectrum: finalized script. now able to handle host notications diff --git a/web/htdocs/wato.css b/web/htdocs/wato.css index 83ee1ea..60f4c5a 100644 --- a/web/htdocs/wato.css +++ b/web/htdocs/wato.css @@ -609,10 +609,6 @@ table.validationerror img { text-shadow: 0px 1px 0px #fff; } -.wato table.data.ruleset td.condition { - width: 360px; -} - /* Special styling for Timeperiods editor */ .wato table.timeperiod td.name { width: 195px;

9 years, 3 months

Check_MK Git: check_mk: #2157 FIX LDAP: Fixed group-to-role/

by Lars Michelsen

group-to-contactgroup sync with OpenLDAP (using posixGroup) Message-ID: <55116378.KdV7x+3Jp+0JvLvL%lm(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: e0e8a3b11565a6fd3c196d4489df1b3b74c071f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e0e8a3b11565a6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 14:10:56 2015 +0100 #2157 FIX LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) --- .werks/2157 | 9 +++++++++ ChangeLog | 1 + web/plugins/userdb/ldap.py | 12 ++++++++++-- 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/.werks/2157 b/.werks/2157 new file mode 100644 index 0000000..b73d703 --- /dev/null +++ b/.werks/2157 @@ -0,0 +1,9 @@ +Title: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) +Level: 1 +Component: multisite +Compatible: compat +Version: 1.2.7i1 +Date: 1427202535 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 2b2592d..ca85263 100644 --- a/ChangeLog +++ b/ChangeLog @@ -337,6 +337,7 @@ * 2149 FIX: LDAP: The diagnostic log has been changed to use a fixed path... * 2150 FIX: Reworked internal logging mechanism... * 1953 FIX: Fixed processing of html processing in input fields... + * 2157 FIX: LDAP: Fixed group-to-role/group-to-contactgroup sync with OpenLDAP (using posixGroup) WATO: * 1760 Added search form to manual checks page diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 9e074f6..e0c0ae0 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -868,6 +868,9 @@ def register_user_attribute_sync_plugins(): } def ldap_convert_groups_to_contactgroups(plugin, params, user_id, ldap_user, user): + # 0. Figure out how to check group membership. + user_cmp_val = ldap_member_attr().lower() == 'memberuid' and user_id or ldap_user['dn'] + # 1. Fetch all existing group names in WATO cg_names = load_group_information().get("contact", {}).keys() @@ -876,7 +879,7 @@ def ldap_convert_groups_to_contactgroups(plugin, params, user_id, ldap_user, use ldap_groups = ldap_group_members(cg_names, nested = params.get('nested', False)) # 3. Only add groups which the user is member of - return {'contactgroups': [ g['cn'] for dn, g in ldap_groups.items() if ldap_user['dn'] in g['members']]} + return {'contactgroups': [ g['cn'] for dn, g in ldap_groups.items() if user_cmp_val in g['members']]} ldap_attribute_plugins['groups_to_contactgroups'] = { 'title': _('Contactgroup Membership'), @@ -904,6 +907,11 @@ def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): ldap_groups = dict(ldap_group_members([ dn.lower() for role_id, dn in params.items() if isinstance(dn, str) ], filt_attr = 'distinguishedname', nested = params.get('nested', False))) + # posixGroup objects use the memberUid attribute to specify the group + # memberships. This is the username instead of the users DN. So the + # username needs to be used for filtering here. + user_cmp_val = ldap_member_attr().lower() == 'memberuid' and user_id or ldap_user['dn'] + roles = set([]) # Loop all roles mentioned in params (configured to be synchronized) @@ -913,7 +921,7 @@ def ldap_convert_groups_to_roles(plugin, params, user_id, ldap_user, user): dn = dn.lower() # lower case matching for DNs! # if group could be found and user is a member, add the role - if dn in ldap_groups and ldap_user['dn'] in ldap_groups[dn]['members']: + if dn in ldap_groups and user_cmp_val in ldap_groups[dn]['members']: roles.add(role_id) # Load default roles from default user profile when the user got no role

9 years, 3 months

Check_MK Git: check_mk: speedometer: Fixed wrong named javascript variable

by Lars Michelsen

Module: check_mk Branch: master Commit: 5b3e84e5ed52b1ceb39bc61f90d4e852b65152c4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5b3e84e5ed52b1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 14:02:18 2015 +0100 speedometer: Fixed wrong named javascript variable --- web/plugins/sidebar/shipped.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/plugins/sidebar/shipped.py b/web/plugins/sidebar/shipped.py index 06e90d7..b972aec 100644 --- a/web/plugins/sidebar/shipped.py +++ b/web/plugins/sidebar/shipped.py @@ -731,7 +731,7 @@ function show_speed(percentage) { context.shadowOffsetX = 2; context.shadowOffsetY = 2; context.shadowBlur = 2; - context.stroStyle = "#000000"; + context.strokeStyle = "#000000"; context.stroke(); context = null; }

9 years, 3 months

Check_MK Git: check_mk: For host graphs use PNP

by Lars Michelsen

Module: check_mk Branch: master Commit: 495a61df379cc4edfaf65948f2561b7be2f51da0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=495a61df379cc4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 24 13:02:46 2015 +0100 For host graphs use PNP --- web/plugins/views/painters.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/web/plugins/views/painters.py b/web/plugins/views/painters.py index 89054fb..f312bb5 100644 --- a/web/plugins/views/painters.py +++ b/web/plugins/views/painters.py @@ -780,16 +780,17 @@ multisite_painters["svc_group_memberlist"] = { "paint" : paint_service_group_memberlist, } -# PNP Graphs -def paint_pnpgraph(row): - try: - css, htmlcode = paint_svc_time_graph(row) - if htmlcode: - return css, htmlcode - except NameError: - if config.debug: - raise - pass +def paint_graph(row): + # For hosts graphs always use PNP + if row.get("service_description"): + try: + css, htmlcode = paint_svc_time_graph(row) + if htmlcode: + return css, htmlcode + except NameError: + if config.debug: + raise + pass sitename = row["site"] host = row["host_name"] @@ -822,7 +823,7 @@ multisite_painters["svc_pnpgraph" ] = { "title" : _("Service Graphs"), "columns" : [ "host_name", "service_description", "service_perf_data", "service_check_command" ], "options" : [ 'pnp_timerange' ], - "paint" : paint_pnpgraph, + "paint" : paint_graph, "printable" : False, } @@ -1175,7 +1176,7 @@ multisite_painters["host_pnpgraph" ] = { "short" : _("PNP graph"), "columns" : [ "host_name" ], "options" : [ 'pnp_timerange' ], - "paint" : paint_pnpgraph, + "paint" : paint_graph, "printable" : False, }

9 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2015