Checkmk git commits February 2015

checkmk-commits@lists.checkmk.com

8 participants
297 discussions

Check_MK Git: check_mk: #2019 FIX heartbeat_crm: Be compatible to yet unknown crm_mon output format

by Lars Michelsen

Module: check_mk Branch: master Commit: af1690fcc19b948100cdbf832c06aa89928a39ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=af1690fcc19b94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 25 16:07:10 2015 +0100 #2019 FIX heartbeat_crm: Be compatible to yet unknown crm_mon output format --- .werks/2019 | 10 ++++++++++ ChangeLog | 1 + checks/heartbeat_crm | 23 ++++++++++------------- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.werks/2019 b/.werks/2019 new file mode 100644 index 0000000..eb4862c --- /dev/null +++ b/.werks/2019 @@ -0,0 +1,10 @@ +Title: heartbeat_crm: Be compatible to yet unknown crm_mon output format +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424876750 + + diff --git a/ChangeLog b/ChangeLog index c61ca69..f3bee00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -195,6 +195,7 @@ * 1890 FIX: cisco_temperature: Replaces cisco_temp_perf and cisco_temp_sensor... NOTE: Please refer to the migration notes! * 2018 FIX: ibm_imm_health: Fixed exception when host does provides empty SNMP data + * 2019 FIX: heartbeat_crm: Be compatible to yet unknown crm_mon output format Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/heartbeat_crm b/checks/heartbeat_crm index 4d71bf0..db0b302 100644 --- a/checks/heartbeat_crm +++ b/checks/heartbeat_crm @@ -78,9 +78,9 @@ def heartbeat_crm_parse_general(info): last_updated = ' '.join(line[2:]) elif ' '.join(line[0:2]) == 'Current DC:': dc = line[2] - elif ' '.join(line[1:3])[:-1] == 'Nodes configured': + elif ' '.join(line[1:3]).rstrip('.,') == 'Nodes configured': num_nodes = int(line[0]) - elif ' '.join(line[1:3]) == 'Resources configured.': + elif ' '.join(line[1:3]).rstrip('.,') == 'Resources configured': num_resources = int(line[0]) return (last_updated, dc, num_nodes, num_resources) @@ -97,17 +97,14 @@ def inventory_heartbeat_crm(info): # - Check the number of nodes/resources # - Check the age of "last updated" settings = host_extra_conf_merged(g_hostname, inventory_heartbeat_crm_rules) - try: - last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) - params = { - 'num_nodes' : num_nodes, - 'num_resources' : num_resources, - } - if settings.get('naildown_dc', False): - params['dc'] = dc - return [(None, params)] - except: - return # No useful information found + last_updated, dc, num_nodes, num_resources = heartbeat_crm_parse_general(info) + params = { + 'num_nodes' : num_nodes, + 'num_resources' : num_resources, + } + if settings.get('naildown_dc', False): + params['dc'] = dc + return [(None, params)] def check_heartbeat_crm(item, params, info): if len(info) > 0:

9 years, 4 months

Check_MK Git: check_mk: #2018 FIX ibm_imm_health: Fixed exception when host does provides empty SNMP data

by Lars Michelsen

Module: check_mk Branch: master Commit: 16436405d35a89255556e7e0953f455263147cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=16436405d35a89… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Feb 25 15:33:19 2015 +0100 #2018 FIX ibm_imm_health: Fixed exception when host does provides empty SNMP data --- .werks/2018 | 9 +++++++++ ChangeLog | 1 + checks/ibm_imm_health | 12 ++++-------- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.werks/2018 b/.werks/2018 new file mode 100644 index 0000000..79aae76 --- /dev/null +++ b/.werks/2018 @@ -0,0 +1,9 @@ +Title: ibm_imm_health: Fixed exception when host does provides empty SNMP data +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.7i1 +Date: 1424874548 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 53b1d87..aab5204 100644 --- a/ChangeLog +++ b/ChangeLog @@ -191,6 +191,7 @@ * 2034 FIX: netapp_api_volumes: added Perf-O-Meter * 2035 FIX: check_mk-netapp_api_if, check_mk-if_brocade: added missing Perf-O-Meters * 2017 FIX: Solaris-Agent: Prevent hanging agent in uptime section... + * 2018 FIX: ibm_imm_health: Fixed exception when host does provides empty SNMP data Multisite: * 1758 Improved exception hander: Shows details without additional debug request, added mailto link for error report... diff --git a/checks/ibm_imm_health b/checks/ibm_imm_health index 82a901a..35e5c93 100644 --- a/checks/ibm_imm_health +++ b/checks/ibm_imm_health @@ -24,18 +24,14 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -def ibm_imm_health_scan(oid): - if oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" mips") or \ - oid('.1.3.6.1.2.1.1.1.0').lower().endswith(" sh4a"): - return True - else: - return False - def inventory_ibm_imm_health(info): - if len(info) > 0: + if info: return [(None, None)] def check_ibm_imm_health(_no_item, _no_params, info): + if not info: + return 3, 'Health info not found in SNMP data' + num_alerts = (len(info) - 1) / 3 infotext = "" for i in range(0, num_alerts):

9 years, 4 months

Check_MK Git: check_mk: New helper function for getting list of all configured hosts

by Mathias Kettner

Module: check_mk Branch: master Commit: 9bf52fd4e3c0121e74b9d015582125ee8be2c3e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bf52fd4e3c012… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 15:11:15 2015 +0100 New helper function for getting list of all configured hosts --- modules/check_mk.py | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/modules/check_mk.py b/modules/check_mk.py index abe2248..e74d557 100755 --- a/modules/check_mk.py +++ b/modules/check_mk.py @@ -1250,6 +1250,12 @@ def output_conf_header(outfile): """) +# Returns a list of all host names, regardless if currently +# disabled or monitored on a remote site. Does not return +# cluster hosts. +def all_configured_physical_hosts(): + return strip_tags(all_hosts) + def all_active_hosts(): return filter_active_hosts(all_hosts) @@ -1278,8 +1284,11 @@ def host_is_member_of_site(hostname, site): # hosts without a site: tag belong to all sites return True -def parse_hostname_list(args, with_clusters = True): - valid_hosts = all_active_hosts() +def parse_hostname_list(args, with_clusters = True, with_foreign_hosts = False): + if with_foreign_hosts: + valid_hosts = all_configured_physical_hosts() + else: + valid_hosts = all_active_hosts() if with_clusters: valid_hosts += all_active_clusters() hostlist = [] @@ -5673,7 +5682,7 @@ try: if 'do_bake_agents' not in globals(): bail_out("Agent baking is not implemented in your version of Check_MK. Sorry.") if args: - hostnames = parse_hostname_list(args, with_clusters = False) + hostnames = parse_hostname_list(args, with_clusters = False, with_foreign_hosts = True) else: hostnames = None do_bake_agents(hostnames)

9 years, 4 months

Check_MK Git: check_mk: 1890 FIX cisco_temperature: Replaces cisco_temp_perf and cisco_temp_sensor

by Konstantin Büttner

Module: check_mk Branch: master Commit: 566629ffd5e11bfe867396f84d24bd5669fa3012 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=566629ffd5e11b… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Feb 25 14:59:17 2015 +0100 1890 FIX cisco_temperature: Replaces cisco_temp_perf and cisco_temp_sensor This fixes an old issue with certain sensors not being detected on some Cisco devices. All services of cisco_temp_perf and cisco_temp_sensor will go unknown, these hosts will need to be re-inventorized. Rules set to configure cisco_temp_sensor will no longer apply to cisco_temperature, so these services will need to be reconfigured. Conflicts: ChangeLog checks/cisco_temp_sensor checks/cisco_temperature --- .werks/1890 | 15 ++++++++++ ChangeLog | 2 ++ checkman/cisco_temperature | 45 ++++++++++++++++++++++++++++++ checks/cisco_temp_perf | 50 ++++++++++++++++++---------------- checks/cisco_temp_sensor | 53 ++++++++++++++++++------------------ checks/cisco_temperature | 24 ++++++++-------- web/plugins/perfometer/check_mk.py | 1 + 7 files changed, 128 insertions(+), 62 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=566629ffd5…

9 years, 4 months

Check_MK Git: check_mk: add check_mk-ucs_bladecenter_psu.switch_power,

by Andreas Boesl

check_mk-ucs_bladecenter_psu.chassis_temp, check_mk-ucs_bladecenter_fans.temp to metrics Message-ID: <54edd051.2WM5le5dtzbS+e5k%ab(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: 8276b1afb139f6095d0ed0ebf757a7f2b248bfa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8276b1afb139f6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 14:36:37 2015 +0100 add check_mk-ucs_bladecenter_psu.switch_power, check_mk-ucs_bladecenter_psu.chassis_temp, check_mk-ucs_bladecenter_fans.temp to metrics --- web/plugins/metrics/check_mk.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/plugins/metrics/check_mk.py b/web/plugins/metrics/check_mk.py index 644a742..b292830 100644 --- a/web/plugins/metrics/check_mk.py +++ b/web/plugins/metrics/check_mk.py @@ -467,6 +467,8 @@ check_metrics["check_mk-smart.temp"] = {} check_metrics["check_mk-viprinet_temp"] = {} check_metrics["check_mk-wagner_titanus_topsense.temp"] = {} check_metrics["check_mk-cmciii.phase"] = {} +check_metrics["check_mk-ucs_bladecenter_fans.temp"] = {} +check_metrics["check_mk-ucs_bladecenter_psu.chassis_temp"] = {} check_metrics["check_mk-kernel"] = { "processes" : { "name" : "proc_creat", } } @@ -500,7 +502,7 @@ check_metrics["check_mk-apc_ats_output"] = { "volt" : { " check_metrics["check_mk-raritan_pdu_inlet"] = {} check_metrics["check_mk-raritan_pdu_inlet_summary"] = {} check_metrics["check_mk-ups_socomec_outphase"] = {} - +check_metrics["check_mk-ucs_bladecenter_psu.switch_power"] = {} check_metrics["check_mk-bluecoat_sensors"] = {}

9 years, 4 months

Check_MK Git: check_mk: #2038 FIX Log complete Email address into monitoring history when notifying explicity addresses

by Mathias Kettner

Module: check_mk Branch: master Commit: c3ca57c3abce421cca84628183b31c21412020e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c3ca57c3abce42… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 14:19:14 2015 +0100 #2038 FIX Log complete Email address into monitoring history when notifying explicity addresses --- .werks/2038 | 10 ++++++++++ ChangeLog | 1 + modules/notify.py | 4 ++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/2038 b/.werks/2038 new file mode 100644 index 0000000..4b3c32e --- /dev/null +++ b/.werks/2038 @@ -0,0 +1,10 @@ +Title: Log complete Email address into monitoring history when notifying explicity addresses +Level: 1 +Component: notifications +Class: fix +Compatible: compat +State: unknown +Version: 1.2.7i1 +Date: 1424870328 + + diff --git a/ChangeLog b/ChangeLog index 8f16166..ef96ff2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -282,6 +282,7 @@ * 1810 FIX: Rule based notifications: Fixed output of non contact mail recipient address in analyze table... * 1988 FIX: Gracefully handle invalid empty bulk notification files from previous buggy versions * 2015 FIX: Fixed sending notifications for services with umlauts in names... + * 2038 FIX: Log complete Email address into monitoring history when notifying explicity addresses BI: * 1784 FIX: Fix exception in BI Boxes when parents are being used diff --git a/modules/notify.py b/modules/notify.py index 7ae330f..c3b4e6b 100644 --- a/modules/notify.py +++ b/modules/notify.py @@ -571,7 +571,7 @@ def user_notification_rules(): def rbn_fake_email_contact(email): return { - "name" : email.split("@")[0], + "name" : email, "alias" : "Explicit email adress " + email, "email" : email, "pager" : "", @@ -588,7 +588,7 @@ def rbn_add_contact_information(plugin_context, contact): else: if contact.startswith("mailto:"): # Fake contact contact_dict = { - "name" : contact[7:].split("@")[0], + "name" : contact[7:], "alias" : "Email address " + contact, "email" : contact[7:], "pager" : "" }

9 years, 4 months

Check_MK Git: check_mk: fixed another typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 79e90b83b1301370f16f8cadc8cd4f4ad4bf3aa1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e90b83b13013… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 13:38:00 2015 +0100 fixed another typo --- .werks/1947 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/1947 b/.werks/1947 index 1256e1e..14dafe3 100644 --- a/.werks/1947 +++ b/.werks/1947 @@ -17,7 +17,7 @@ The following checks are currently supported <tr><td>ucs_bladecenter_fans</td><td>Operate status of fans</td></tr> <tr><td>ucs_bladecenter_fans.temp</td><td>Temperature at fans sensors</td></tr> <tr><td>ucs_bladecenter_psu.chassis_temp</td><td>Temperature at chassis sensors</td></tr> -<tr><td>ucs_bladecenter_psu.switch_power</td><td>Switch Voltage, Current and Power.</td></tr> +<tr><td>ucs_bladecenter_psu.switch_power</td><td>Switch Voltage, Current and Power</td></tr> <tr><td>ucs_bladecenter_psu</td><td>Chassis voltage levels</td></tr> <tr><td>ucs_bladecenter_if</td><td>Traffic and bandwidth for Ethernet, Interconnect and Fibrechannel Ports. Automatically groups portchannel interfaces.</td></tr>

9 years, 4 months

Check_MK Git: check_mk: fixed typo

by Andreas Boesl

Module: check_mk Branch: master Commit: 292441342921cd0befe0eeb7a04dc14cba0b7c92 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=292441342921cd… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 13:37:14 2015 +0100 fixed typo --- .werks/1947 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.werks/1947 b/.werks/1947 index 6fc2f14..1256e1e 100644 --- a/.werks/1947 +++ b/.werks/1947 @@ -16,9 +16,9 @@ The following checks are currently supported <tr><th>Check</th><th>Description</th></tr> <tr><td>ucs_bladecenter_fans</td><td>Operate status of fans</td></tr> <tr><td>ucs_bladecenter_fans.temp</td><td>Temperature at fans sensors</td></tr> -<tr><td>ucs_bladecenter_fans.temp</td><td>Temperature at chassis sensors</td></tr> -<tr><td>ucs_bladecenter_psu</td><td>Chassis voltage levels</td></tr> +<tr><td>ucs_bladecenter_psu.chassis_temp</td><td>Temperature at chassis sensors</td></tr> <tr><td>ucs_bladecenter_psu.switch_power</td><td>Switch Voltage, Current and Power.</td></tr> +<tr><td>ucs_bladecenter_psu</td><td>Chassis voltage levels</td></tr> <tr><td>ucs_bladecenter_if</td><td>Traffic and bandwidth for Ethernet, Interconnect and Fibrechannel Ports. Automatically groups portchannel interfaces.</td></tr> </table>

9 years, 4 months

Check_MK Git: check_mk: The new agent_ucs_bladecenter allows you to collect data from a

by Andreas Boesl

Module: check_mk Branch: master Commit: bfae4f8beec75ae4c64598982857bfae00ba301f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bfae4f8beec75a… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Wed Feb 25 13:23:26 2015 +0100 The new agent_ucs_bladecenter allows you to collect data from a UCS Bladecenter via its web-API. The following checks are currently supported <table> <tr><th>Check</th><th>Description</th></tr> <tr><td>ucs_bladecenter_fans</td><td>Operate status of fans</td></tr> <tr><td>ucs_bladecenter_fans.temp</td><td>Temperature at fans sensors</td></tr> <tr><td>ucs_bladecenter_fans.temp</td><td>Temperature at chassis sensors</td></tr> <tr><td>ucs_bladecenter_psu</td><td>Chassis voltage levels</td></tr> <tr><td>ucs_bladecenter_psu.switch_power</td><td>Switch Voltage, Current and Power.</td></tr> <tr><td>ucs_bladecenter_if</td><td>Traffic and bandwidth for Ethernet, Interconnect and Fibrechannel Ports. Automatically groups portchannel interfaces.</td></tr> </table> Conflicts: ChangeLog web/plugins/perfometer/check_mk.py --- .werks/1947 | 26 ++ ChangeLog | 1 + agents/special/agent_ucs_bladecenter | 240 +++++++++++++++ checkman/ucs_bladecenter_fans | 16 + checkman/ucs_bladecenter_fans.temp | 38 +++ checkman/ucs_bladecenter_if | 192 ++++++++++++ checkman/ucs_bladecenter_psu | 42 +++ checkman/ucs_bladecenter_psu.chassis_temp | 37 +++ checkman/ucs_bladecenter_psu.switch | 28 ++ checks/agent_ucs_bladecenter | 36 +++ checks/ucs_bladecenter.include | 36 +++ checks/ucs_bladecenter_fans | 141 +++++++++ checks/ucs_bladecenter_if | 320 ++++++++++++++++++++ checks/ucs_bladecenter_psu | 196 ++++++++++++ .../check_mk-ucs_bladecenter_fans.temp.php | 1 + pnp-templates/check_mk-ucs_bladecenter_if.php | 1 + .../check_mk-ucs_bladecenter_psu.chassis_temp.php | 1 + .../check_mk-ucs_bladecenter_psu.switch_power.php | 1 + web/plugins/perfometer/check_mk.py | 4 + web/plugins/wato/check_parameters.py | 48 +++ web/plugins/wato/datasource_programs.py | 23 ++ 21 files changed, 1428 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=bfae4f8bee…

9 years, 4 months

Check_MK Git: check_mk: Updated bug entries #2306

by Mathias Kettner

Module: check_mk Branch: master Commit: e2cd4410a6b6767e1fcd507006e6bb34f90f9d7a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e2cd4410a6b676… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Wed Feb 25 12:10:36 2015 +0100 Updated bug entries #2306 --- .bugs/2306 | 8 ++++++++ .bugs/config | 23 ++++++++++++----------- 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/.bugs/2306 b/.bugs/2306 new file mode 100644 index 0000000..ff23d11 --- /dev/null +++ b/.bugs/2306 @@ -0,0 +1,8 @@ +Title: Notification bulking seems to sometimes duplicate notification emails +Component: notifcation +State: open +Date: 2015-02-25 12:07:45 +Targetversion: 1.2.6 +Class: bug + +A logfile is in git/zeug_cmk/notify_duplicate_bulk.log. diff --git a/.bugs/config b/.bugs/config index d155ffb..15cf33c 100644 --- a/.bugs/config +++ b/.bugs/config @@ -8,17 +8,18 @@ states = { } components = [ - ( "core", "Core Modules, Setup, etc." ), - ( "checks", "Checks and Agent plugins" ), - ( "multisite", "Multisite GUI" ), - ( "livestatus", "Livestatus" ), - ( "ec", "Event Console" ), - ( "inv", "Hardware/Software-Inventory" ), - ( "livecheck", "Livecheck part in Livestatus, livecheck helper" ), - ( "wato", "Check_MK's Web Administration Tool" ), - ( "bi", "BI - Business Intelligence" ), - ( "mobile", "Multisite Mobile GUI" ), - ( "docu", "Documentation "), + ( "core", "Core Modules, Setup, etc." ), + ( "checks", "Checks and Agent plugins" ), + ( "notifcation", "Notification system" ), + ( "multisite", "Multisite GUI" ), + ( "livestatus", "Livestatus" ), + ( "ec", "Event Console" ), + ( "inv", "Hardware/Software-Inventory" ), + ( "livecheck", "Livecheck part in Livestatus, livecheck helper" ), + ( "wato", "Check_MK's Web Administration Tool" ), + ( "bi", "BI - Business Intelligence" ), + ( "mobile", "Multisite Mobile GUI" ), + ( "docu", "Documentation "), ] classes = [

9 years, 4 months

← Newer
1
2
3
4
5
6
7
8
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2015