Checkmk git commits April 2015

checkmk-commits@lists.checkmk.com

7 participants
246 discussions

Check_MK Git: check_mk: Moveing and deleting graphs in a collection

by Mathias Kettner

Module: check_mk Branch: master Commit: a6901cf1ce7b37f04bb8b9ae72c6bf8e130a2a35 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a6901cf1ce7b37… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Tue Apr 28 14:04:04 2015 +0200 Moveing and deleting graphs in a collection --- web/htdocs/pagetypes.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/web/htdocs/pagetypes.py b/web/htdocs/pagetypes.py index fe06056..3a30c68 100644 --- a/web/htdocs/pagetypes.py +++ b/web/htdocs/pagetypes.py @@ -204,6 +204,12 @@ class PageRenderer: # | Examples: views, dashboards, graphs collections | # '----------------------------------------------------------------------' class Overridable: + def page_header(self): + header = self.type_title() + " - " + self.title() + if not self.is_mine(): + header += " (%s)" % self.owner() + return header + # Checks wether a page is publicly visible. This does not only need a flag # in the page itself, but also the permission from its owner to publish it. def is_public(self): @@ -351,6 +357,8 @@ class Overridable: foreign = None for page in self.instances(): + if page.name() != name: + continue if page.is_mine() and config.may("general.edit_" + self.type_name()): mine = page @@ -613,6 +621,11 @@ class Container(Overridable): def add_element(self, element): self._.setdefault("elements", []).append(element) + def move_element(self, nr, whither): + el = self._["elements"][nr] + del self._["elements"][nr] + self._["elements"][whither:whither] = [ el ] + def is_empty(self): return not self.elements() @@ -659,11 +672,13 @@ class Container(Overridable): if not page.is_mine(): page = page.clone() if isinstance(page, PageRenderer) and not page.is_hidden(): - need_sidebar_reload + need_sidebar_reload = True page.add_element(create_info) # can be overridden self.save_user_instances() - return page, need_sidebar_reload + return None, need_sidebar_reload + # With a redirect directly to the page afterwards do it like this: + # return page, need_sidebar_reload #.

9 years, 4 months

Check_MK Git: check_mk: Next step in pagetypes.py: Edit properties

by Mathias Kettner

Module: check_mk Branch: master Commit: 794e135ea345b53815b9cd9208cb0b16e69b3bb5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=794e135ea345b5… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Apr 29 14:14:55 2015 +0200 Next step in pagetypes.py: Edit properties --- web/htdocs/forms.py | 45 ++++++- web/htdocs/metrics.py | 2 +- web/htdocs/pagetypes.py | 300 ++++++++++++++++++++++++++++++++++++++++++----- web/htdocs/valuespec.py | 15 ++- 4 files changed, 326 insertions(+), 36 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=794e135ea3…

9 years, 4 months

Check_MK Git: check_mk: Removed debug output

by Lars Michelsen

Module: check_mk Branch: master Commit: 0b80e99ff7fe793abec2bf8be80d31cb6e35dd7f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0b80e99ff7fe79… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 27 15:46:13 2015 +0200 Removed debug output --- mkeventd/bin/mkeventd | 2 -- 1 file changed, 2 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 9871a8b..69eb4c6 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1176,8 +1176,6 @@ class EventServer: builder.setMibSources(*[DirMibSource(g_compiled_mibs_dir)] + list(builder.getMibSources())) - log(repr(list(builder.getMibSources()))) - # Indicate we wish to load DESCRIPTION and other texts from MIBs builder.loadTexts = True

9 years, 4 months

Check_MK Git: check_mk: Started implementing SNMP trap support in mkeventd

by Lars Michelsen

Module: check_mk Branch: master Commit: 96ca91f6eea26bd8d98c6ad0ffda5d125f5e7a28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=96ca91f6eea26b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Apr 24 13:11:43 2015 +0200 Started implementing SNMP trap support in mkeventd --- mkeventd/bin/mkeventd | 128 ++++++++++++++++++++++---------- mkeventd/web/htdocs/mkeventd.py | 32 +++++--- mkeventd/web/plugins/wato/mkeventd.py | 129 ++++++++++++++++++++++++++------- 3 files changed, 214 insertions(+), 75 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=96ca91f6ee…

9 years, 4 months

Check_MK Git: check_mk: Made mib translation configurable

by Lars Michelsen

Module: check_mk Branch: master Commit: 9dd71752d223cc56c4d34f533610ce4096846da4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9dd71752d223cc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 29 13:42:43 2015 +0200 Made mib translation configurable --- mkeventd/bin/mkeventd | 57 +++++++++++++++++++++++---------- mkeventd/web/plugins/wato/mkeventd.py | 14 ++++++-- 2 files changed, 52 insertions(+), 19 deletions(-) diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 07975bb..635d2a0 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1150,6 +1150,22 @@ class EventServer: return os.open(g_pipe_path, os.O_RDWR | os.O_NONBLOCK) + def load_mibs(self): + builder = MibBuilder() # manages python MIB modules + + # load MIBs from our compiled MIB and default MIB paths + builder.setMibSources(*[DirMibSource(g_compiled_mibs_dir)] + + list(builder.getMibSources())) + + # Indicate we wish to load DESCRIPTION and other texts from MIBs + builder.loadTexts = True + + # This loads all or specified pysnmp MIBs into memory + builder.loadModules() + + # This object maintains various indices built from MIBs data + self._mib_resolver = MibViewController(builder) + # Format time difference seconds into approximated # human readable value def fmt_timeticks(self, ticks): @@ -1168,26 +1184,28 @@ class EventServer: days, hours = divmod(hours, 24) return "%d days, %d hours, %d min" % (days, hours, mins) + # Convert pysnmp datatypes to simply handable ones + def snmptrap_convert_var_binds(self, var_bind_list): + var_binds = [] + for oid, value in var_bind_list: + key = str(oid) - def load_mibs(self): - builder = MibBuilder() # manages python MIB modules - - # load MIBs from our compiled MIB and default MIB paths - builder.setMibSources(*[DirMibSource(g_compiled_mibs_dir)] - + list(builder.getMibSources())) - - # Indicate we wish to load DESCRIPTION and other texts from MIBs - builder.loadTexts = True - - # This loads all or specified pysnmp MIBs into memory - builder.loadModules() + if value.__class__.__name__ == 'ObjectIdentifier': + val = str(value) + elif value.__class__.__name__ == 'TimeTicks': + val = self.fmt_timeticks(value._value) + else: + val = value._value - # This object maintains various indices built from MIBs data - self._mib_resolver = MibViewController(builder) + # Translate some standard SNMPv2 oids + if key == '1.3.6.1.2.1.1.3.0': + key = 'Uptime' + var_binds.append((key, val)) + return var_binds # Convert pysnmp datatypes to simply handable ones - def snmptrap_convert_var_binds(self, var_bind_list): + def snmptrap_translate_varbinds(self, var_bind_list): var_binds = [] for oid, value in var_bind_list: mib_var = MibVariable(oid).resolveWithMib(self._mib_resolver) @@ -1240,7 +1258,11 @@ class EventServer: else: break # Skip unhandled version - trap = self.snmptrap_convert_var_binds(proto.apiPDU.getVarBinds(pdu)) + if g_config['translate_snmptraps']: + trap = self.snmptrap_translate_varbinds(proto.apiPDU.getVarBinds(pdu)) + else: + trap = self.snmptrap_convert_var_binds(proto.apiPDU.getVarBinds(pdu)) + # Use the trap sender IP address as host name host = ipaddress @@ -3514,6 +3536,7 @@ def load_configuration(): "hostname_translation" : {}, "archive_orphans" : False, "archive_mode" : "file", + "translate_snmptraps" : False, } main_file = g_config_dir + "/mkeventd.mk" if not os.path.exists(main_file): @@ -3778,7 +3801,7 @@ try: g_event_status.load_status() g_status_server = StatusServer() g_event_server = EventServer() - if opt_snmptrap: + if opt_snmptrap and g_config['translate_snmptraps']: g_event_server.load_mibs() g_event_server.compile_rules(g_config["rules"]) diff --git a/mkeventd/web/plugins/wato/mkeventd.py b/mkeventd/web/plugins/wato/mkeventd.py index a337f81..37d1620 100644 --- a/mkeventd/web/plugins/wato/mkeventd.py +++ b/mkeventd/web/plugins/wato/mkeventd.py @@ -1894,8 +1894,6 @@ if mkeventd_enabled: domain = "mkeventd", ) - - register_configvar(group, "retention_interval", Age(title = _("State Retention Interval"), @@ -2079,6 +2077,18 @@ if mkeventd_enabled: domain = "mkeventd", ) + register_configvar(group, + "translate_snmptraps", + Checkbox(title = _("Translate SNMP traps"), + label = _("Use the available SNMP MIBs to translate contents of the SNMP traps"), + help = _("When this option is enabled all available SNMP MIB files will be used " + "to translate the incoming SNMP traps. Information which can not be " + "translated, e.g. because a MIB is missing, are written untouched to " + "the event message."), + default_value = False), + domain = "mkeventd", + ) + # A few settings for Multisite and WATO register_configvar(_("Status GUI (Multisite)"), "mkeventd_connect_timeout",

9 years, 4 months

Check_MK Git: check_mk: Trap translation is now working

by Lars Michelsen

Module: check_mk Branch: master Commit: 06d2dc8823dbc63f5a0dae1955ac9b21a8928b90 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06d2dc8823dbc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 29 13:25:12 2015 +0200 Trap translation is now working --- mkeventd/.f12 | 2 -- mkeventd/bin/mkeventd | 25 ++++++++----------------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/mkeventd/.f12 b/mkeventd/.f12 index 55f0725..37ab83e 100644 --- a/mkeventd/.f12 +++ b/mkeventd/.f12 @@ -23,5 +23,3 @@ sudo chown -R $SITE.$SITE $OMD_ROOT/{etc,local,var} sudo omd restart $SITE apache echo "Starte EC neu..." sudo omd status $SITE mkeventd && sudo omd restart $SITE mkeventd - - diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd index 69eb4c6..07975bb 100755 --- a/mkeventd/bin/mkeventd +++ b/mkeventd/bin/mkeventd @@ -1199,15 +1199,20 @@ class EventServer: # MIB node object (like OBJECT-TYPE or other SMI MACROs) node = mib_var.getMibNode() + mod, sym, indices = mib_var.getMibSymbol() + # Only care about the first indice reported. Why should we care about multiple? + # Do we have such cases here? + translated_oid = '%s::%s.%s' % (mod, sym, indices[0].prettyPrint()) + # This MACRO supports SYNTAX clause? if hasattr(node, 'getSyntax'): # Cast value to MIB SYNTAX type (TEXTUAL-CONVENTION) value = node.getSyntax().clone(value) units = node.getUnits() - var_binds.append((oid.prettyPrint(), value.prettyPrint() + ' ' + units)) + var_binds.append((translated_oid, value.prettyPrint() + ' ' + units)) else: - var_binds.append((oid.prettyPrint(), value)) + var_binds.append((translated_oid, value)) return var_binds def process_snmptrap(self, (whole_msg, (ipaddress, port))): @@ -1235,20 +1240,6 @@ class EventServer: else: break # Skip unhandled version - #if proto_version == pysnmp_api.protoVersion1: - # # These fields are available by specification in v1, but not in v2. - - # # use the enterprise oid as application - # application = proto.apiTrapPDU.getEnterprise(req_pdu).prettyPrint() - # # Get the host name from the trap - # host = proto.apiTrapPDU.getAgentAddr(req_pdu).prettyPrint() - - # trap = [] - # trap.append(('Generic-Trap', proto.apiTrapPDU.getGenericTrap(req_pdu)._value)) - # trap.append(('Specific-Trap', proto.apiTrapPDU.getSpecificTrap(req_pdu)._value)) - # trap.append(('Uptime', self.fmt_timeticks(proto.apiTrapPDU.getTimeStamp(req_pdu)._value))) - # trap += self.snmptrap_convert_var_binds(proto.apiTrapPDU.getVarBinds(req_pdu)) - trap = self.snmptrap_convert_var_binds(proto.apiPDU.getVarBinds(pdu)) # Use the trap sender IP address as host name host = ipaddress @@ -1256,7 +1247,7 @@ class EventServer: # use the trap-oid as application application = '' for index, (oid, val) in enumerate(trap): - if oid == '1.3.6.1.6.3.1.1.4.1.0': + if oid in ['1.3.6.1.6.3.1.1.4.1.0', 'SNMPv2-MIB::snmpTrapOID.0']: application = trap.pop(index)[1] break

9 years, 4 months

Check_MK Git: check_mk: #2248 The Event Console can now translate incoming SNMP traps

by Lars Michelsen

Module: check_mk Branch: master Commit: 4d6ea87d7fc0fb53b5a205ed551d52fd73f45a8c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4d6ea87d7fc0fb… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Apr 29 13:48:03 2015 +0200 #2248 The Event Console can now translate incoming SNMP traps The Event Console can be configured to receive SNMP traps. In the past it only extracted all raw OIDs and values from the incoming trap and putting them together in the event message as they come in. Now it is possible to use SNMP MIB files to let the Event Console translate the OIDs, values and units contained in the traps. This feature is disabled by default. You need to enable the Event Console and the SNMP trap handling by using <tt>omd config</tt> in OMD environments. Then you need to enable the trap translation in Event Console > Settings by setting Translate SNMP traps to on. Finally you need to activate the pending EC-Change. Now all available MIBs will be used to translate the incoming traps. You can now upload custom MIB files using the MIB management page at Event Console > SNMP MIBs which will be used for translation after reloading the Event Console. --- .werks/2248 | 27 +++++++++++++++++++++++++++ ChangeLog | 1 + 2 files changed, 28 insertions(+) diff --git a/.werks/2248 b/.werks/2248 new file mode 100644 index 0000000..85c6909 --- /dev/null +++ b/.werks/2248 @@ -0,0 +1,27 @@ +Title: The Event Console can now translate incoming SNMP traps +Level: 2 +Component: ec +Compatible: compat +Version: 1.2.7i1 +Date: 1430307780 +Class: feature + +The Event Console can be configured to receive SNMP traps. In the past it +only extracted all raw OIDs and values from the incoming trap and putting +them together in the event message as they come in. + +Now it is possible to use SNMP MIB files to let the Event Console translate +the OIDs, values and units contained in the traps. + +This feature is disabled by default. You need to enable the Event Console +and the SNMP trap handling by using <tt>omd config</tt> in OMD environments. + +Then you need to enable the trap translation in Event Console > Settings +by setting Translate SNMP traps to on. Finally you need to +activate the pending EC-Change. + +Now all available MIBs will be used to translate the incoming traps. + +You can now upload custom MIB files using the MIB management page at +Event Console > SNMP MIBs which will be used for translation after +reloading the Event Console. diff --git a/ChangeLog b/ChangeLog index bcdb9e5..8e94594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -515,6 +515,7 @@ * 2099 Allow replication of Event Console rule and settings... * 2107 mkeventd: can now handle syslog format of Sophos firewalls * 2223 Allow cancelling actions to be omitted of the cancelled event is not (yet) open... + * 2248 The Event Console can now translate incoming SNMP traps... * 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...

9 years, 4 months

Check_MK Git: check_mk: #2074 FIX pnptemplate netapp_api_volume: fixed title

by Andreas Boesl

Module: check_mk Branch: master Commit: ab00ffcc020bb11ca3cc6f54c32202e0ac94a2c1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab00ffcc020bb1… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 13:21:50 2015 +0200 #2074 FIX pnptemplate netapp_api_volume: fixed title --- .werks/2074 | 10 ++++++++++ ChangeLog | 1 + pnp-templates/check_mk-netapp_api_volumes.php | 9 ++------- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.werks/2074 b/.werks/2074 new file mode 100644 index 0000000..62decac --- /dev/null +++ b/.werks/2074 @@ -0,0 +1,10 @@ +Title: pnptemplate netapp_api_volume: fixed title +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430306491 + + diff --git a/ChangeLog b/ChangeLog index b798887..bcdb9e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -418,6 +418,7 @@ * 2177 FIX: Host/Service statistics dashlets honor the site filter correctly now * 1957 FIX: Fixed default value for text input fields in notification plugins... * 2233 FIX: Fixed WATO folder view and Host Tags search with HTML Entity encoding... + * 2074 FIX: pnptemplate netapp_api_volume: fixed title WATO: * 1760 Added search form to manual checks page diff --git a/pnp-templates/check_mk-netapp_api_volumes.php b/pnp-templates/check_mk-netapp_api_volumes.php index c61f1f7..0efac99 100644 --- a/pnp-templates/check_mk-netapp_api_volumes.php +++ b/pnp-templates/check_mk-netapp_api_volumes.php @@ -41,14 +41,9 @@ foreach ($NAME as $i => $n) { # RRDtool Options #$servicedes=$NAGIOS_SERVICEDESC -$fsname = str_replace("_", "/", substr($servicedesc, 3)); +$fsname = substr($servicedesc, 7); $fstitle = $fsname; -# Hack for windows: replace C// with C:\ -if (strlen($fsname) == 3 && substr($fsname, 1, 2) == '//') { - $fsname = $fsname[0] . "\:\\\\"; - $fstitle = $fsname[0] . ":\\"; -} $sizegb = sprintf("%.1f", $MAX[1] / 1024.0); $maxgb = $MAX[1] / 1024.0; @@ -57,7 +52,7 @@ $critgb = $CRIT[1] / 1024.0; $warngbtxt = sprintf("%.1f", $warngb); $critgbtxt = sprintf("%.1f", $critgb); -$opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Filesystem $fstitle ($sizegb GB)' "; +$opt[1] = "--vertical-label GB -l 0 -u $maxgb --title '$hostname: Volume $fstitle ($sizegb GB)' "; # First graph show current filesystem usage $def[1] = "DEF:mb=$RRDFILE[1]:$DS[1]:MAX ";

9 years, 4 months

Check_MK Git: check_mk: update #2072: netapp_api_volumes raises WARN for non online volumes

by Andreas Boesl

Module: check_mk Branch: master Commit: bd0406a0c96087d881c38b97339f76d297f434e1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bd0406a0c96087… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 12:41:25 2015 +0200 update #2072: netapp_api_volumes raises WARN for non online volumes --- checks/netapp_api_volumes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/checks/netapp_api_volumes b/checks/netapp_api_volumes index 62616ee..c7514e9 100644 --- a/checks/netapp_api_volumes +++ b/checks/netapp_api_volumes @@ -64,8 +64,8 @@ def check_netapp_api_volumes(item, params, parsed): if not volume: return 3, "Volume not found in agent output" - if volume.get("state") == "offline": - return 1, "Volume is offline" + if volume.get("state") != "online": + return 1, "Volume is %s" % volume.get("state") mega = 1024.0 * 1024.0 size_total = int(volume.get("size-total")) / mega

9 years, 4 months

Check_MK Git: check_mk: #2073 FIX BI aggregation: fixed exception when showing clusters in BI boxes

by Andreas Boesl

Module: check_mk Branch: master Commit: 344766f2e6488853fea819323cc2500a0b441610 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=344766f2e64888… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Apr 29 10:09:43 2015 +0200 #2073 FIX BI aggregation: fixed exception when showing clusters in BI boxes --- .werks/2073 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/bi.py | 2 +- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/2073 b/.werks/2073 new file mode 100644 index 0000000..bc40c47 --- /dev/null +++ b/.werks/2073 @@ -0,0 +1,10 @@ +Title: BI aggregation: fixed exception when showing clusters in BI boxes +Level: 2 +Component: bi +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1430294914 + + diff --git a/ChangeLog b/ChangeLog index 4a2b5ba..b798887 100644 --- a/ChangeLog +++ b/ChangeLog @@ -499,6 +499,7 @@ * 2020 FIX: Fixed non working FOREACH_CHILD mechanism for BI rules * 2085 FIX: Host search for child nodes can now filter child nodes by tags or patterns... * 1897 FIX: Fixed exception in BI Availability view... + * 2073 FIX: BI aggregation: fixed exception when showing clusters in BI boxes Reporting & Availability: * 1990 FIX: Fix two exceptions in PDF exports of host group views diff --git a/web/htdocs/bi.py b/web/htdocs/bi.py index adb6e5a..65fb561 100644 --- a/web/htdocs/bi.py +++ b/web/htdocs/bi.py @@ -1229,7 +1229,7 @@ def get_status_info_filtered(filter_header, only_sites, limit, add_columns, fetc if fetch_parents: parent_filter = [] for row in data: - parent_filter += [ 'Filter: name = %s\n' % p for p in row[7] ] + parent_filter += [ 'Filter: name = %s\n' % p for p in row[8] ] parent_filter_txt = ''.join(parent_filter) parent_filter_txt += 'Or: %d\n' % len(parent_filter) for row in get_status_info_filtered(filter_header, only_sites, limit, add_columns, False, bygroup):

9 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2015