Checkmk git commits May 2016

checkmk-commits@lists.checkmk.com

6 participants
231 discussions

3568 FIX Fixed broken link in "Access to event status via TCP" help text

by Lars Michelsen

Module: check_mk Branch: master Commit: ad12671d0603cdc9cb157bad72d034bde3cd26de URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad12671d0603cd… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 6 16:14:04 2016 +0200 3568 FIX Fixed broken link in "Access to event status via TCP" help text --- .werks/3568 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/mkeventd.py | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/3568 b/.werks/3568 new file mode 100644 index 0000000..390686c --- /dev/null +++ b/.werks/3568 @@ -0,0 +1,10 @@ +Title: Fixed broken link in "Access to event status via TCP" help text +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462544020 + + diff --git a/ChangeLog b/ChangeLog index 11285ac..c925215 100644 --- a/ChangeLog +++ b/ChangeLog @@ -399,6 +399,7 @@ * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC * 3026 FIX: Event console: The "Add comment" option of a rule is now able to add the original text (\0) * 3566 FIX: Fixed exception on SNMP MIB management page when MIB directory is missing + * 3568 FIX: Fixed broken link in "Access to event status via TCP" help text Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index f02329f..13e18be 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -2240,7 +2240,8 @@ if mkeventd_enabled: "live on a remote site you need to activate remote access to the event status socket " "via TCP. This allows to query the current event status via TCP. If you do not restrict " "this to queries also event actions are possible from remote. This feature is not used " - "by the event status checks nor by Multisite so we propose not allowing commands via TCP."), + "by the event status checks nor by Multisite so we propose not allowing commands via TCP.") % \ + "wato.py?mode=edit_ruleset&varname=active_checks%3Amkevents", none_label = _("no access via TCP"), ), domain = "mkeventd",

8 years, 2 months

Fixed broken link in werk (when viewing from Check_MK)

by Lars Michelsen

Module: check_mk Branch: master Commit: 80b23bfc648dc62f9949180db6de9b417f0d7ec6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=80b23bfc648dc6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 6 16:09:22 2016 +0200 Fixed broken link in werk (when viewing from Check_MK) --- .werks/714 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/714 b/.werks/714 index 0e728c1..aa71387 100644 --- a/.werks/714 +++ b/.werks/714 @@ -6,5 +6,5 @@ Date: 1395072515 Class: feature A BI aggregate now also aggregates the additional information wether it is -in a scheduled downtime or not. Please refer to the updated <a href="checkmk_bi.html">documentation +in a scheduled downtime or not. Please refer to the updated <a href="http://mathias-kettner.de/checkmk_bi.html">documentation about BI</a> for details.

8 years, 2 months

mssql_datafiles, mssql_transactionlogs: summarize now summarizes per database, not per instance. Also a few wording fixes

by Sebastian Herbord

Module: check_mk Branch: master Commit: 0a4e28a0c0f1bd4206687d18127b745fffbf2c93 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0a4e28a0c0f1bd… Author: Sebastian Herbord <sh(a)mathias-kettner.de> Date: Fri May 6 15:44:28 2016 +0200 mssql_datafiles, mssql_transactionlogs: summarize now summarizes per database, not per instance. Also a few wording fixes --- checkman/mssql_datafiles | 4 +-- checkman/mssql_transactionlogs | 4 +-- checks/mssql.include | 50 ++++++++++++++++------------------ web/plugins/wato/check_parameters.py | 42 ++++++++++++++-------------- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/checkman/mssql_datafiles b/checkman/mssql_datafiles index 835bb1b..e6e1438 100644 --- a/checkman/mssql_datafiles +++ b/checkman/mssql_datafiles @@ -14,8 +14,8 @@ description: for how to install that plugin. item: - A combination of the instance-, database- and table-name. + A combination of the instance-, database- and (logical) file-name. inventory: One separate check for each datafile will be created. Alternatively - there is a rule to summarize all files in one service. + there is a rule to summarize files per database. diff --git a/checkman/mssql_transactionlogs b/checkman/mssql_transactionlogs index 003eb56..72f8852 100644 --- a/checkman/mssql_transactionlogs +++ b/checkman/mssql_transactionlogs @@ -14,8 +14,8 @@ description: for how to install that plugin. item: - A combination of the instance-, database- and table-name. + A combination of the instance-, database- and (logical) file-name. inventory: One separate check for each transactionlog will be created. - Alternatively there is a rule to summarize all files in one service. + Alternatively there is a rule to summarize files per database. diff --git a/checks/mssql.include b/checks/mssql.include index 4846b36..ed4ece6 100644 --- a/checks/mssql.include +++ b/checks/mssql.include @@ -28,26 +28,30 @@ mssql_transactionlogs_discovery = [] -def format_item_mssql_datafiles(inst, database, table): +def format_item_mssql_datafiles(inst, database, file_name): if inst is None: - return "%s.%s" % (database, table) + return "%s.%s" % (database, file_name) + elif file_name is None: + return "%s.%s" % (inst, database) else: - return "%s.%s.%s" % (inst, database, table) + return "%s.%s.%s" % (inst, database, file_name) def inventory_mssql_datafiles(mode, info): settings = host_extra_conf(g_hostname, mssql_transactionlogs_discovery) + summarize = settings and settings[0].get("summarize_%s" % mode, False) - if settings and settings[0].get("summarize_%s" % mode, False): - yield "SUMMARY", {} - else: - for line in info: - if len(line) == 8: - inst, database, table = line[0:3] - else: - inst = None - database, table = line[0:2] - yield format_item_mssql_datafiles(inst, database, table), {} + for line in info: + if len(line) == 8: + inst, database, file_name = line[0:3] + else: + inst = None + database, file_name = line[0:2] + + if summarize: + yield format_item_mssql_datafiles(inst, database, None), {} + else: + yield format_item_mssql_datafiles(inst, database, file_name), {} def mssql_datafiles_process_sizes(params, used_size, allocated_size, max_size, unlimited): @@ -117,29 +121,23 @@ def check_mssql_datafiles(item, params, info): for row in info: if len(row) == 8: - inst, database, table, physical_name, max_size, allocated_size, used_size, unlimited = row + inst, database, file_name, physical_name, max_size, allocated_size, used_size, unlimited = row unlimited = unlimited == '1' else: - database, table, physical_name, max_size, allocated_size, used_size = row + database, file_name, physical_name, max_size, allocated_size, used_size = row inst = None unlimited = False - if item == "SUMMARY": + if format_item_mssql_datafiles(inst, database, file_name) == item or\ + format_item_mssql_datafiles(inst, database, None) == item: + max_size, allocated_size, used_size = map(lambda x: float(x) * 1024 * 1024, (max_size, allocated_size, used_size)) max_size_sum += max_size allocated_size_sum += allocated_size used_size_sum += used_size unlimited_sum = unlimited_sum or unlimited - elif format_item_mssql_datafiles(inst, database, table) == item: - # these values are returned from the db in number of 8KB blocks and divided by - # 128 by the plugin to get MB. - max_size, allocated_size, used_size = map(lambda x: float(x) * 1024 * 1024, - (max_size, allocated_size, used_size)) - return mssql_datafiles_process_sizes(params, used_size, allocated_size, - max_size, unlimited) - if item == "SUMMARY": - return mssql_datafiles_process_sizes(params, used_size_sum, allocated_size_sum, - max_size_sum, unlimited_sum) + return mssql_datafiles_process_sizes(params, used_size_sum, allocated_size_sum, + max_size_sum, unlimited_sum) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index bf61c59..002eae8 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -6321,29 +6321,29 @@ register_check_parameters( title = _("Page Activity Levels"), elements = [ ("page_reads/sec", - Tuple( - title = _("Read"), - elements = [ - Filesize(title = _("Warning at")), - Filesize(title = _("Critical at")), - ] - )), + Tuple( + title = _("Reads/sec"), + elements = [ + Float(title = _("warning at"), unit = _("/sec") ), + Float(title = _("critical at"), unit = _("/sec") ), + ]) + ), ("page_writes/sec", - Tuple( - title = _("Write"), - elements = [ - Filesize(title = _("Warning at")), - Filesize(title = _("Critical at")), - ] - )), + Tuple( + title = _("Writes/sec"), + elements = [ + Float(title = _("warning at"), unit = _("/sec") ), + Float(title = _("critical at"), unit = _("/sec") ), + ]) + ), ("page_lookups/sec", - Tuple( - title = _("Lookup"), - elements = [ - Filesize(title = _("Warning at")), - Filesize(title = _("Critical at")), - ] - )), + Tuple( + title = _("Lookups/sec"), + elements = [ + Float(title = _("warning at"), unit = _("/sec") ), + Float(title = _("critical at"), unit = _("/sec") ), + ]) + ), ] ), TextAscii(

8 years, 2 months

Removed manpages for missing (mostly renamed) checks

by Lars Michelsen

Module: check_mk Branch: master Commit: 47b473767f2a20657cad14d08d857e11dd82f581 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47b473767f2a20… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 6 14:39:11 2016 +0200 Removed manpages for missing (mostly renamed) checks --- checkman/avaya_88xx_fan | 14 -------------- checkman/dell_poweredge_amperage.current | 31 ------------------------------ checkman/masterguard_out_voltage | 26 ------------------------- checkman/mbg_lantime_mbg_fan | 17 ---------------- checkman/netapp_api_vf_stats.cpu_util | 25 ------------------------ checkman/rsa_health | 11 ----------- checks/dell_poweredge_amperage | 9 --------- 7 files changed, 133 deletions(-) diff --git a/checkman/avaya_88xx_fan b/checkman/avaya_88xx_fan deleted file mode 100644 index ae63bcd..0000000 --- a/checkman/avaya_88xx_fan +++ /dev/null @@ -1,14 +0,0 @@ -title: Avaya 88xx Chassis Fans -agents: snmp -catalog: hw/network/avaya -license: GPL -distribution: check_mk -description: - This check monitors the fan status of Avaya 88xx devices. - Depending on the reported state it can go OK, UNKNOWN or DOWN. - -item: - The index of the chassis fan. - -inventory: - Creates one service for each chassis fan. diff --git a/checkman/dell_poweredge_amperage.current b/checkman/dell_poweredge_amperage.current deleted file mode 100644 index 4672edb..0000000 --- a/checkman/dell_poweredge_amperage.current +++ /dev/null @@ -1,31 +0,0 @@ -title: Dell PowerEdge Server: Current -agents: snmp -catalog: hw/server/dell -license: GPL -distribution: check_mk -description: - This check monitors the electrical current going through power units of - Dell PowerEdge Servers. - - No limits are set in the check, since limits are configured in the device - itself. The state given by the device is taken as the state of the check - as follows: If the device returns {OK}, the check is {OK}. If the device returns - {other}, {unknown}, {nonCriticalUpper} and {nonCriticalLower} a state of {WARN} - is returned. Otherwise the check is {CRIT}. - - The check displays the upper warning and critical limits as configured in the device. - Further limits are {not} displayed, even though they may be configured. These are - UpperNonRecoverable, LowerCritical, LowerNonCritical and LowerNonRecoverable. - These limits yet may lead to state changes, the corresponding states are honoured - as outlined above. - -item: - The name of the location variable configured for the power unit - -perfdata: - One variable: the electrical current in Ampere - -inventory: - All power units - - diff --git a/checkman/masterguard_out_voltage b/checkman/masterguard_out_voltage deleted file mode 100644 index 997d582..0000000 --- a/checkman/masterguard_out_voltage +++ /dev/null @@ -1,26 +0,0 @@ -title: Masterguard UPS Devices: Out voltage -agents: snmp -catalog: hw/power/emerson -license: GPL -distribution: check_mk -description: - Checks the Out Voltage of Masterguard UPS Devices - -item: - ID of the phase - -perfdata: - One value: The current Voltage - -inventory: - One service per phase will be created - -[parameters] -parameters (tuple): A pair of numbers for warning and critical level - - warning (int): The lower limit which triggers an WARNING state - - critical (int): The lower limit which triggers an CRITICAL state - -[configuration] -masterguard_out_voltage_default_levels (tuple): Default warning and critical level diff --git a/checkman/mbg_lantime_mbg_fan b/checkman/mbg_lantime_mbg_fan deleted file mode 100644 index b1aa62f..0000000 --- a/checkman/mbg_lantime_mbg_fan +++ /dev/null @@ -1,17 +0,0 @@ -title: Meinberg LANTIME devices: Fans (NG MIB) -agents: snmp -catalog: hw/time/meinberg -license: GPL -distribution: check_mk -description: - This check monitors the state of fans of Meinberg LANTIME clocks supporting the - new MBG-LANTIME-NG-MIB. - - The state of the service is CRIT when the status extracted from the device is "off" or - when errors have been detected. - -inventory: - One check per fan is created. - -item: - The ID of the fan diff --git a/checkman/netapp_api_vf_stats.cpu_util b/checkman/netapp_api_vf_stats.cpu_util deleted file mode 100644 index b4fe170..0000000 --- a/checkman/netapp_api_vf_stats.cpu_util +++ /dev/null @@ -1,25 +0,0 @@ -title: NetApp Filers: vFiler CPU Utilization -agents: netapp -catalog: hw/storagehw/netapp -license: GPL -distribution: check_mk -description: - Checks the CPU utilization (in percent) of a vFiler. - - {WARN} or {CRIT} is returned, if the usage in the last 60 sec was above - given thresholds. {OK} is returned otherwise. - -perfdata: - One value: The vFilers CPU utilization in percent. - -inventory: - Creates one check for each vFiler. - -examples: - # set default levels to 70 and 80 percent: - netapp_api_vf_stats_cpu_util_default_levels = { "levels": (70.0, 80.0) } - -[parameters] -parameters (dict): with the element -{"levels"}: (float, float): levels of vFiler CPU utilization for {WARN} and {CRIT} in percent - diff --git a/checkman/rsa_health b/checkman/rsa_health deleted file mode 100644 index 04013d5..0000000 --- a/checkman/rsa_health +++ /dev/null @@ -1,11 +0,0 @@ -title: System health via IBM Remote Supervisor Adapter (RSA) -agents: snmp -catalog: hw/server/ibm -license: GPL -distribution: check_mk -description: - This check monitors the overall system health of a server - via a IBM Remote Supervisor Adapter (RSA). - -inventory: - The inventory will find one check per RSA board. diff --git a/checks/dell_poweredge_amperage b/checks/dell_poweredge_amperage index 2f55c71..7dcefe6 100644 --- a/checks/dell_poweredge_amperage +++ b/checks/dell_poweredge_amperage @@ -104,12 +104,3 @@ check_info["dell_poweredge_amperage.power"] = { ]), "snmp_scan_function" : lambda oid: oid('.1.3.6.1.2.1.1.2.0') == ".1.3.6.1.4.1.674.10892.5", } - -#check_info["dell_poweredge_amperage.current"] = { -# "check_function" : check_dell_poweredge_amperage, -# "inventory_function" : inventory_dell_poweredge_amperage_current, -# "service_description" : "%s", -# "has_perfdata" : True, -# "snmp_info" : dell_poweredge_amperage_info, -# "snmp_scan_function" : dell_poweredge_amperage_scan, -#}

8 years, 2 months

3469 Show type of rule match of a rule (first, per-parameter, all) in WATO

by Mathias Kettner

Module: check_mk Branch: master Commit: 89f1ab85f0a9da5568a03216f96ef4a32e80daa5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=89f1ab85f0a9da… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri May 6 11:25:36 2016 +0200 3469 Show type of rule match of a rule (first, per-parameter, all) in WATO This additional information makes it clearer to the user whether a just the first matching rule defines the parameter, or further matching rules can have influence, too. --- .werks/3469 | 11 +++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 16 ++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/.werks/3469 b/.werks/3469 new file mode 100644 index 0000000..69c66a2 --- /dev/null +++ b/.werks/3469 @@ -0,0 +1,11 @@ +Title: Show type of rule match of a rule (first, per-parameter, all) in WATO +Level: 2 +Component: wato +Compatible: compat +Version: 1.2.9i1 +Date: 1462526650 +Class: feature + +This additional information makes it clearer to the user whether a just the +first matching rule defines the parameter, or further matching rules can +have influence, too. diff --git a/ChangeLog b/ChangeLog index 0323c05..11285ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -287,6 +287,7 @@ * 3304 Bulk deleting users is now available * 3239 The delay and the period of notifications can be fractions of a minute now. * 3116 Timerange buttons for downtimes can now be configured... + * 3469 Show type of rule match of a rule (first, per-parameter, all) in WATO... * 3060 FIX: Folder properties: Fixed exception when a user has no alias set... * 3062 FIX: Git integration: Fixed not adding files in WATO folders to git control * 3203 FIX: Distributed WATO: Fixed exception in remote host service discovery... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index f00c0e5..de6392a 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -12302,6 +12302,8 @@ def mode_edit_ruleset(phase): html.help(rulespec["help"]) + explain_ruleset_match_type(rulespec) + # Collect all rulesets all_rulesets = load_all_rulesets() ruleset = all_rulesets.get(varname) @@ -12432,6 +12434,20 @@ def mode_edit_ruleset(phase): create_new_rule_form(rulespec, hostname, item, varname) + +def explain_ruleset_match_type(rulespec): + match_type = rulespec["match"] + html.write("<b>%s:</b> " % _("Matching")) + if match_type == "first": + html.write(_("The first matching rule defines the parameter.")) + elif match_type == "dict": + html.write(_("Each parameter is defined by the first matching rule where that parameter is set (checked).")) + elif match_type == "all": + html.write(_("All matching rules will add to the resulting list.")) + else: + html.write(_("Unknown match type: %s") % match_type) + + def show_rule_in_table(rulespec, tag_specs, host_list, item_list, varname, value, folder, rule_options): # Conditions

8 years, 2 months

Fixed broken login after recent cleanup

by Lars Michelsen

Module: check_mk Branch: master Commit: d622b849f9d8835035e2fb45bfdb1e371fcbc556 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d622b849f9d883… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri May 6 09:06:34 2016 +0200 Fixed broken login after recent cleanup --- web/htdocs/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/config.py b/web/htdocs/config.py index f9484d1..205c664 100644 --- a/web/htdocs/config.py +++ b/web/htdocs/config.py @@ -318,7 +318,7 @@ def set_user_confdir(user_id): make_nagios_directory(user_confdir) def get_language(default = None): - if "language" in user: + if user and "language" in user: return user["language"] elif default == None: return default_language

8 years, 2 months

3529 FIX agent_netapp: fixed problem with older netapp versions ( 7Mode - Version 8.0)

by Andreas Boesl

Module: check_mk Branch: master Commit: 55cfc236c62b57f355fa867638c7532acc102538 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=55cfc236c62b57… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 6 08:57:31 2016 +0200 3529 FIX agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0) The agent was unable to determine if the machine is running in 7-mode or cluster-mode. --- .werks/3529 | 10 ++++++++++ ChangeLog | 1 + agents/special/agent_netapp | 8 +++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/.werks/3529 b/.werks/3529 new file mode 100644 index 0000000..d3092ec --- /dev/null +++ b/.werks/3529 @@ -0,0 +1,10 @@ +Title: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0) +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462517694 + +The agent was unable to determine if the machine is running in 7-mode or cluster-mode. diff --git a/ChangeLog b/ChangeLog index cc8dabc..0323c05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -209,6 +209,7 @@ * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" * 3565 FIX: wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output * 3528 FIX: netapp_api_protocol: fixed service discovery problem with older 7mode versions + * 3529 FIX: agent_netapp: fixed problem with older netapp versions (7Mode - Version 8.0)... Multisite: * 3187 notification view: new filter for log command via regex diff --git a/agents/special/agent_netapp b/agents/special/agent_netapp index f6b8091..a8d1b5b 100755 --- a/agents/special/agent_netapp +++ b/agents/special/agent_netapp @@ -404,7 +404,13 @@ if not version_info: sys.stderr.write(",".join(section_errors)) sys.exit(1) -netapp_mode = version_info.child_get_string("is-clustered").lower() == "false" and "7mode" or "clustermode" +clustered_info = version_info.child_get_string("is-clustered") +if clustered_info: + netapp_mode = clustered_info.lower() == "false" and "7mode" or "clustermode" +else: + # Looks like the is-clustered attribute is not set, e.g. NetApp 7-Mode Version 8.0 + netapp_mode = "7-mode" in version_info.child_get_string("version").lower() and "7mode" or "clustermode" + #. # .--Clustermode Settings------------------------------------------------.

8 years, 2 months

3528 FIX netapp_api_protocol: fixed service discovery problem with older 7mode versions

by Andreas Boesl

Module: check_mk Branch: master Commit: 17ccf05a9f6eeae392b8a2c9e66a4becf2c4a836 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17ccf05a9f6eea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Fri May 6 08:51:33 2016 +0200 3528 FIX netapp_api_protocol: fixed service discovery problem with older 7mode versions --- .werks/3528 | 10 ++++++++++ ChangeLog | 1 + checks/netapp_api_protocol | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3528 b/.werks/3528 new file mode 100644 index 0000000..15ad8cc --- /dev/null +++ b/.werks/3528 @@ -0,0 +1,10 @@ +Title: netapp_api_protocol: fixed service discovery problem with older 7mode versions +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.9i1 +Date: 1462517440 +Class: fix + + + diff --git a/ChangeLog b/ChangeLog index 08ef33a..cc8dabc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -208,6 +208,7 @@ * 3563 FIX: fortigate_sslvpn: Fixed broken manpage * 3564 FIX: logwatch_ec: Fixed discovery when Logwatch Event Console Forwarding rule is set to "No forwarding" * 3565 FIX: wmi checks: Fixed deprecation warning when WMI keys can not be found in agent output + * 3528 FIX: netapp_api_protocol: fixed service discovery problem with older 7mode versions Multisite: * 3187 notification view: new filter for log command via regex diff --git a/checks/netapp_api_protocol b/checks/netapp_api_protocol index f72f48f..05d3353 100644 --- a/checks/netapp_api_protocol +++ b/checks/netapp_api_protocol @@ -34,8 +34,8 @@ def inventory_netapp_api_protocol(parsed): for key, values in parsed.items(): - if len(values) > 2: # only report instances which actuall have infos - yield values["instance_name"], None + if len(values) > 2: # only create checks for protocols with infos + yield values["protocol"], None def check_netapp_api_protocol(item, _no_params, parsed): counter_data = parsed.get(item)

8 years, 2 months

3567 FIX Werk list: Fixed link to not existing check man pages in some cases

by Lars Michelsen

Module: check_mk Branch: master Commit: a46bff6c9123e0546c5c6520ca37c8bd0c5fa9ad URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a46bff6c9123e0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 17:03:46 2016 +0200 3567 FIX Werk list: Fixed link to not existing check man pages in some cases --- .werks/3567 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/werks.py | 7 ++++--- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/3567 b/.werks/3567 new file mode 100644 index 0000000..d941e23 --- /dev/null +++ b/.werks/3567 @@ -0,0 +1,10 @@ +Title: Werk list: Fixed link to not existing check man pages in some cases +Level: 1 +Component: multisite +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462374161 + + diff --git a/ChangeLog b/ChangeLog index e933f4a..08ef33a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -276,6 +276,7 @@ * 3454 FIX: Fixed scaling of numbers in graphs (e.g. inodes of filesystems) * 3462 FIX: Fixed ineffective localizations on werk page after language change * 3468 FIX: Fix changing a user's language back to English if the default is German... + * 3567 FIX: Werk list: Fixed link to not existing check man pages in some cases WATO: * 3244 WATO BI Module: swap order of aggregation function and child node selection... diff --git a/web/htdocs/werks.py b/web/htdocs/werks.py index b70e53d..31ff1f0 100644 --- a/web/htdocs/werks.py +++ b/web/htdocs/werks.py @@ -28,6 +28,7 @@ # log import defaults, config, os, table +import re from lib import * from valuespec import * @@ -587,10 +588,10 @@ def render_werk_description(werk): def insert_manpage_links(text): parts = text.replace(",", " ").split() new_parts = [] + check_regex = re.compile("[-_\.a-z0-9]") for part in parts: - if os.path.exists(defaults.check_manpages_dir + "/" + part): - part = '<a href="wato.py?mode=check_manpage&check_type=%s">%s</a>' % ( - part, part) + if check_regex.match(part) and os.path.exists(defaults.check_manpages_dir + "/" + part): + part = '<a href="wato.py?mode=check_manpage&check_type=%s">%s</a>' % (part, part) new_parts.append(part) return " ".join(new_parts)

8 years, 2 months

3566 FIX Fixed exception on SNMP MIB management page when MIB directory is missing

by Lars Michelsen

Module: check_mk Branch: master Commit: abd8a81ec4166219bb7c900a54cafa384cbde0fa URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=abd8a81ec41662… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed May 4 16:49:46 2016 +0200 3566 FIX Fixed exception on SNMP MIB management page when MIB directory is missing --- .werks/3566 | 10 ++++++++++ ChangeLog | 1 + web/plugins/wato/mkeventd.py | 10 +++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/3566 b/.werks/3566 new file mode 100644 index 0000000..2a986da --- /dev/null +++ b/.werks/3566 @@ -0,0 +1,10 @@ +Title: Fixed exception on SNMP MIB management page when MIB directory is missing +Level: 1 +Component: ec +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1462373346 + + diff --git a/ChangeLog b/ChangeLog index 9b49ac1..e933f4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -394,6 +394,7 @@ * 3350 FIX: Merged source of Event Console with Check_MK... * 3240 FIX: Fixed various quotation issues in GUI parts related to the EC * 3026 FIX: Event console: The "Add comment" option of a rule is now able to add the original text (\0) + * 3566 FIX: Fixed exception on SNMP MIB management page when MIB directory is missing Livestatus: * 3233 FIX: Fixed shutdown of Nagios core with Livestatus module... diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 6ed8890..f02329f 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1946,7 +1946,15 @@ def delete_mib(filename, mib_name): def load_snmp_mibs(path): found = {} - for fn in os.listdir(path): + try: + file_names = os.listdir(path) + except OSError, e: + if e.errno == 2: # not existing directories are ok + return found + else: + raise + + for fn in file_names: if fn[0] != '.': mib = parse_snmp_mib_header(path + "/" + fn) found[fn] = mib

8 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits May 2016