Checkmk git commits

checkmk-commits@lists.checkmk.com

1 participants
64707 discussions

Check_MK Git: check_mk: Made description of WATO rule "users" more precise

by Goetz Golla

Module: check_mk Branch: master Commit: c259db63ececdbcf01d99e56010da5bcfaee2ac2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c259db63ececdb… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Dec 5 16:58:21 2014 +0100 Made description of WATO rule "users" more precise --- web/plugins/wato/check_parameters.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index 860c29a..890bbaa 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -4246,10 +4246,10 @@ register_check_parameters( "users", _("Number of Users Logged In"), Tuple( - help = _("This rule defines levels for the number of users logged in on a system."), + help = _("This rule defines upper limits for the number of users logged in on a system."), elements = [ - Integer(title = _("Warning if above"), unit = _("users"), default_value = 20), - Integer(title = _("Critical if above"), unit = _("users"), default_value = 30)]), + Integer(title = _("Warning at"), unit = _("users"), default_value = 20), + Integer(title = _("Critical at"), unit = _("users"), default_value = 30)]), None, None )

9 years, 10 months

Check_MK Git: check_mk: Updated bug entries #2232

by Goetz Golla

Module: check_mk Branch: master Commit: 5bcaa0e52cbae538feef256540e3798c84c80f03 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5bcaa0e52cbae5… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Dec 5 16:38:43 2014 +0100 Updated bug entries #2232 --- .bugs/2232 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.bugs/2232 b/.bugs/2232 new file mode 100644 index 0000000..dd38ff4 --- /dev/null +++ b/.bugs/2232 @@ -0,0 +1,8 @@ +Title: show icon when a delayed notification is active +Component: multisite +State: open +Date: 2014-12-05 16:36:50 +Targetversion: future +Class: feature + +idea of a customer: show an icon when a service is in a state "delayed notification"

9 years, 10 months

Check_MK Git: check_mk: #1455 FIX hp_proliant_mem: avoid a crash of the check when module_condition is empty

by Goetz Golla

Module: check_mk Branch: master Commit: 300b2711267c5bd59d9067dc1ed6dbb74794ba25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=300b2711267c5b… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Dec 5 16:04:46 2014 +0100 #1455 FIX hp_proliant_mem: avoid a crash of the check when module_condition is empty --- .werks/1455 | 9 +++++++++ ChangeLog | 3 ++- checks/hp_proliant_mem | 4 ++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.werks/1455 b/.werks/1455 new file mode 100644 index 0000000..fb1fd0c --- /dev/null +++ b/.werks/1455 @@ -0,0 +1,9 @@ +Title: hp_proliant_mem: avoid a crash of the check when module_condition is empty +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417791862 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index f82e5d0..f60ce66 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,9 +118,10 @@ * 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup * 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit... - * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent * 1702 FIX: Fix check_notify_count: notification had been counted twice... * 1703 FIX: ups_test: Fix computation of time since last self test... + * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent + * 1455 FIX: hp_proliant_mem: avoid a crash of the check when module_condition is empty Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/checks/hp_proliant_mem b/checks/hp_proliant_mem index c623b1b..16994d1 100644 --- a/checks/hp_proliant_mem +++ b/checks/hp_proliant_mem @@ -128,8 +128,8 @@ def check_hp_proliant_mem(item, params, info): detail_output += '(?) ' condition = 'n/a' - if int(module_condition) in hp_proliant_mem_condition_map: - condition = hp_proliant_mem_condition_map[int(module_condition)] + if saveint(module_condition) in hp_proliant_mem_condition_map: + condition = hp_proliant_mem_condition_map[saveint(module_condition)] condition_status = hp_proliant_mem_condition_status2nagios_map[condition] detail_output += ', Condition: %s ' % condition

9 years, 10 months

Check_MK Git: check_mk: #1454 FIX megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent

by Goetz Golla

Module: check_mk Branch: master Commit: 443e3e5de300a8f3d14cf43310231f19751cb491 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=443e3e5de300a8… Author: Goetz Golla <gg(a)mathias-kettner.de> Date: Fri Dec 5 15:22:18 2014 +0100 #1454 FIX megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent --- .werks/1454 | 9 +++++++++ ChangeLog | 1 + agents/check_mk_agent.linux | 2 ++ 3 files changed, 12 insertions(+) diff --git a/.werks/1454 b/.werks/1454 new file mode 100644 index 0000000..6e83e40 --- /dev/null +++ b/.werks/1454 @@ -0,0 +1,9 @@ +Title: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417789268 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 78f7ee5..359ab6c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -116,6 +116,7 @@ * 1681 FIX: cmciii_lcp_fans: Skipping non FAN units now; cleaned up check * 1682 FIX: cmciii_lcp_waterflow: Check can now deal with devices with a different setup * 1701 FIX: Correctly show absolute level for CPU load in case of warn/crit... + * 1454 FIX: megaraid checks: megacli binaries in lowercase (Ubuntu..) are now also detected by the linux agent Multisite: * 1508 Allow input of plugin output and perfdata when faking check results... diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index d381007..40d0b7e 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -355,6 +355,8 @@ if type MegaCli >/dev/null ; then MegaCli_bin="MegaCli" elif type MegaCli64 >/dev/null ; then MegaCli_bin="MegaCli64" +elif type megacli >/dev/null ; then + MegaCli_bin="megacli" else MegaCli_bin="unknown" fi

9 years, 10 months

Check_MK Git: check_mk: #1686 FIX Host renaming also updates explicit negated hosts in rules

by Lars Michelsen

Module: check_mk Branch: master Commit: b9c46db1545e5eb2ab00c03ffcfbf6530a18b1f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9c46db1545e5e… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 12:20:01 2014 +0100 #1686 FIX Host renaming also updates explicit negated hosts in rules --- .werks/1686 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/.werks/1686 b/.werks/1686 new file mode 100644 index 0000000..74775c5 --- /dev/null +++ b/.werks/1686 @@ -0,0 +1,9 @@ +Title: Host renaming also updates explicit negated hosts in rules +Level: 1 +Component: wato +Compatible: compat +Version: 1.2.5i7 +Date: 1417778380 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 53493b4..4a21bb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -210,6 +210,7 @@ * 1639 FIX: Interfaces with speed more than 10GBit/s can now be configured correctly * 1633 FIX: Fix problem that attributes of new WATO folders have not been saved... * 1634 FIX: Fix editing of cluster hosts in WATO: cluster-property no longer goes lost... + * 1686 FIX: Host renaming also updates explicit negated hosts in rules Notifications: * 1512 Bulk notification can now be grouped according to custom macro values... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 404c42e..1135dc6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -2229,6 +2229,7 @@ def mode_rename_host(phase): return _("Rename %s %s") % (is_cluster and _("Cluster") or _("Host"), hostname) elif phase == "buttons": + global_buttons() html.context_button(_("Host Properties"), make_link([("mode", "edithost"), ("host", hostname)]), "back") return @@ -2281,6 +2282,9 @@ def rename_host_in_list(thelist, oldname, newname): if element == oldname: thelist[nr] = newname did_rename = True + elif element == '!'+oldname: + thelist[nr] = '!'+newname + did_rename = True return did_rename def rename_host(host, newname):

9 years, 10 months

Check_MK Git: check_mk: #1704 FIX Fix notification analyser in case there are non-Ascii characters in the notification context

by Mathias Kettner

Module: check_mk Branch: master Commit: eca90b1a0e69c0d3927d4f834037c0d0dc371785 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca90b1a0e69c0… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 12:19:42 2014 +0100 #1704 FIX Fix notification analyser in case there are non-Ascii characters in the notification context --- .werks/1704 | 9 +++++++++ ChangeLog | 1 + web/htdocs/wato.py | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.werks/1704 b/.werks/1704 new file mode 100644 index 0000000..b17463c --- /dev/null +++ b/.werks/1704 @@ -0,0 +1,9 @@ +Title: Fix notification analyser in case there are non-Ascii characters in the notification context +Level: 2 +Component: notifications +Compatible: compat +Version: 1.2.5i7 +Date: 1417778357 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index 53493b4..6a9497e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -220,6 +220,7 @@ * 1583 FIX: Can use contact groups without hosts/services assigned in RBN rules now... * 1606 FIX: Moved notify.log to var/log/notify.log in OMD environments... * 1570 FIX: Fix notification of check_http active checks with Nagios core... + * 1704 FIX: Fix notification analyser in case there are non-Ascii characters in the notification context BI: * 1435 FIX: Saving BI aggregations: No longer reports 'Request-URI Too Large'... diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 404c42e..24c94ec 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -8865,8 +8865,8 @@ def mode_notifications(phase): analyse_url = html.makeuri([("analyse", str(nr))]) context = entry.items() context.sort() - tooltip = "".join("%s: %s\n" % e for e in context) - html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n" + tooltip), "analyze") + tooltip = "".join(("%s: %s\n" % e).decode('utf-8') for e in context) + html.icon_button(analyse_url, _("Anaylse ruleset with this notification:\n%s" % tooltip), "analyze") replay_url = html.makeactionuri([("_replay", str(nr))]) html.icon_button(replay_url, _("Replay this notification, send it again!"), "replay") if html.var("analyse") and nr == int(html.var("analyse")):

9 years, 10 months

Check_MK Git: check_mk: Remove print command in check

by Mathias Kettner

Module: check_mk Branch: master Commit: b9da8b9ce617ce0ca68cf16e7f8a13f21e3942d2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b9da8b9ce617ce… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Fri Dec 5 12:14:40 2014 +0100 Remove print command in check --- checks/ups_test | 1 - 1 file changed, 1 deletion(-) diff --git a/checks/ups_test b/checks/ups_test index 0324b58..b192efd 100644 --- a/checks/ups_test +++ b/checks/ups_test @@ -92,7 +92,6 @@ def check_ups_test(_no_item, params, info): # State of test state = 0 - print ResultsSummary if ResultsSummary in [ '3', '4' ]: state = 2 elif ResultsSummary in [ '2' ]:

9 years, 10 months

Check_MK Git: check_mk: Fixed merge conflict

by Lars Michelsen

Module: check_mk Branch: master Commit: 4553870e7e8234210ad6b7f80605cc289b8ca8c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4553870e7e8234… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 12:13:54 2014 +0100 Fixed merge conflict --- web/plugins/icons/builtin.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/web/plugins/icons/builtin.py b/web/plugins/icons/builtin.py index 23785d2..d25f979 100644 --- a/web/plugins/icons/builtin.py +++ b/web/plugins/icons/builtin.py @@ -123,26 +123,13 @@ def paint_rule_editor(what, row, tags, custom_vars): ("host", row["host_name"])] if what == 'service': -<<<<<<< HEAD - check_command = row["service_check_command"] - if check_command.startswith("check_mk-") or \ - check_command.startswith("check_mk_active-"): - url = html.makeuri_contextless( [("mode", "edit_ruleset"), - ("check_command", row["service_check_command"]), - ("service_description", row["service_description"]), - ("host", row["host_name"])], "wato.py") - title = _("Edit check parameters for this service") - return '<a href="%s">%s</a>' % (url, html.render_icon('rulesets', title)) -======= urlvars.append(("service", row["service_description"])) title = _("View and edit parameters for this service") else: title = _("View and edit parameters for this host") url = html.makeuri_contextless(urlvars, "wato.py") - return '<a href="%s"><img title="%s" class=icon src="images/icon_rulesets.png"></a>' % \ - (url, title) ->>>>>>> f3c8aaa68bdf43480870137cb3b76e647aa9a55f + return '<a href="%s">%s</a>' % (url, html.render_icon('rulesets', title)) multisite_icons.append({ 'service_columns': [ 'description', 'check_command', "host_name" ],

9 years, 10 months

Check_MK Git: check_mk: #1683 FIX Replaced a lot of old GIF images with better looking PNG images

by Lars Michelsen

Module: check_mk Branch: master Commit: ab04ca11ede5a85734eb524aa568564b053f2029 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ab04ca11ede5a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 11:30:46 2014 +0100 #1683 FIX Replaced a lot of old GIF images with better looking PNG images --- .werks/1683 | 9 ++++ ChangeLog | 1 + mkeventd/web/plugins/icons/mkeventd.py | 3 +- web/htdocs/htmllib.py | 8 ++- web/htdocs/images/icon_ack.gif | Bin 1116 -> 0 bytes web/htdocs/images/icon_action.gif | Bin 1023 -> 0 bytes web/htdocs/images/icon_action.png | Bin 0 -> 3381 bytes web/htdocs/images/icon_comment.gif | Bin 1134 -> 0 bytes web/htdocs/images/icon_detail.gif | Bin 2258 -> 0 bytes web/htdocs/images/icon_detail.png | Bin 0 -> 3246 bytes web/htdocs/images/icon_disabled.gif | Bin 1141 -> 0 bytes web/htdocs/images/icon_downtime.gif | Bin 1750 -> 0 bytes web/htdocs/images/icon_enabled.gif | Bin 991 -> 0 bytes web/htdocs/images/icon_enabled.png | Bin 0 -> 2855 bytes web/htdocs/images/icon_failed.gif | Bin 1141 -> 0 bytes web/htdocs/images/icon_failed.png | Bin 0 -> 3084 bytes web/htdocs/images/icon_nagios.gif | Bin 623 -> 0 bytes web/htdocs/images/icon_nagios.png | Bin 0 -> 618 bytes web/htdocs/images/icon_notes.gif | Bin 1770 -> 0 bytes web/htdocs/images/icon_notes.png | Bin 0 -> 5009 bytes web/htdocs/images/icon_npassive.gif | Bin 1071 -> 0 bytes web/htdocs/images/icon_npassive.png | Bin 0 -> 5552 bytes web/htdocs/images/icon_outofnot.gif | Bin 449 -> 0 bytes web/htdocs/images/icon_outofnot.png | Bin 0 -> 3209 bytes web/htdocs/images/icon_success.gif | Bin 991 -> 0 bytes web/htdocs/images/icon_success.png | Bin 0 -> 2217 bytes web/htdocs/wato.py | 4 +- web/plugins/icons/builtin.py | 92 ++++++++++++-------------------- web/plugins/icons/inventory.py | 4 +- web/plugins/icons/wato.py | 3 +- web/plugins/views/painters.py | 18 +++++-- 31 files changed, 69 insertions(+), 73 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ab04ca11ed…

9 years, 10 months

Check_MK Git: check_mk: #1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices

by Lars Michelsen

Module: check_mk Branch: master Commit: c8dc0010ae08197c87ffee2d898073f566387fb2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c8dc0010ae0819… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 5 11:44:44 2014 +0100 #1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices --- .werks/1684 | 9 +++++++++ ChangeLog | 1 + checks/cisco_vpn_tunnel | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/1684 b/.werks/1684 new file mode 100644 index 0000000..ee3222a --- /dev/null +++ b/.werks/1684 @@ -0,0 +1,9 @@ +Title: cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices +Level: 1 +Component: checks +Compatible: compat +Version: 1.2.5i7 +Date: 1417776280 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index 11d64e6..72c5ca9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -57,6 +57,7 @@ * 1597 bluecat_dhcp, bluecat_dns: Checks can now be used in Check_MK Cluster Mode * 1599 check_mk_agent.aix: Simple run_cached Feature for plugins... * 1699 Windows agent: new option "file" for writing output into a file... + * 1684 cisco_vpn_tunnel: Now supporting VPN 3000 Conncentrator devices * 1478 FIX: kernel.util, statgrab_cpu: fix computation of utilization... * 1480 FIX: brocade_vdx_status: disable check on some devices that do not support it... * 1485 FIX: dell_om_disks, dell_om_esmlog, dell_om_mem, dell_om_processors, dell_om_sensors: detect more devices... diff --git a/checks/cisco_vpn_tunnel b/checks/cisco_vpn_tunnel index 3b2e573..fb551b9 100644 --- a/checks/cisco_vpn_tunnel +++ b/checks/cisco_vpn_tunnel @@ -56,6 +56,7 @@ check_info["cisco_vpn_tunnel"] = { "service_description" : "VPN Tunnel %s", "has_perfdata" : False, "group" : "vpn_tunnel", - "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security"), + "snmp_scan_function" : lambda oid: oid(".1.3.6.1.2.1.1.1.0").lower().startswith("cisco adaptive security") \ + or "vpn 3000 concentrator" in oid(".1.3.6.1.2.1.1.1.0").lower(), "snmp_info" : ( ".1.3.6.1.4.1.9.9.171.1.2.3.1", [ 7 ] ), }

9 years, 10 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits