Checkmk git commits November 2016

checkmk-commits@lists.checkmk.com

9 participants
299 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 3491c6a254f645c7bb9f36e4b1bb1271306685af URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3491c6a254f645… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 15 15:40:35 2016 +0100 added missing agent and catalog entry --- checkman/netgear_fans | 4 ++-- checkman/netgear_powersupplies | 4 ++-- checkman/netgear_temp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/checkman/netgear_fans b/checkman/netgear_fans index 72c23cf..b93c3c0 100644 --- a/checkman/netgear_fans +++ b/checkman/netgear_fans @@ -1,6 +1,6 @@ title: Netgear Switches: Fans -agents: -catalog: +agents: snmp +catalog: hw/network/netgear license: GPL distribution: check_mk description: diff --git a/checkman/netgear_powersupplies b/checkman/netgear_powersupplies index bbcc76d..75767bd 100644 --- a/checkman/netgear_powersupplies +++ b/checkman/netgear_powersupplies @@ -1,6 +1,6 @@ title: Netgear Switches: Power supplies -agents: -catalog: +agents: snmp +catalog: hw/network/netgear license: GPL distribution: check_mk description: diff --git a/checkman/netgear_temp b/checkman/netgear_temp index ea1b729..78b0b6c 100644 --- a/checkman/netgear_temp +++ b/checkman/netgear_temp @@ -1,6 +1,6 @@ title: Netgear Switches: Temperature Sensors -agents: -catalog: +agents: snmp +catalog: hw/network/netgear license: GPL distribution: check_mk description:

7 years, 10 months

Fixed config change handling of EC settings

by Lars Michelsen

Module: check_mk Branch: master Commit: 830b80d19ed5d2ee5cc744f992eed075db608081 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=830b80d19ed5d2… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 15 15:26:33 2016 +0100 Fixed config change handling of EC settings --- tests/testlib/__init__.py | 2 +- web/htdocs/wato.py | 11 ++++++++++- web/plugins/wato/mkeventd.py | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 78391a0..2cfe8a0 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -812,7 +812,7 @@ class CMKEventConsole(CMKWebSession): time.sleep(1) new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") - print "Old config load time: %s" % old_t + print "New config load time: %s" % new_t assert new_t > old_t diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 94e023a..2cc9fe6 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6356,6 +6356,9 @@ def mode_edit_configvar(phase, what = 'globalvars'): msg = HTML(_("Changed global configuration variable %s to %s.") \ % (varname, valuespec.value_to_text(new_value))) + if what == 'mkeventd': + need_restart = None + if siteid: save_sites(configured_sites, activate=False) add_change("edit-configvar", msg, sites=[siteid], domains=[domain], need_restart=need_restart) @@ -6363,7 +6366,13 @@ def mode_edit_configvar(phase, what = 'globalvars'): return "edit_site_globals" else: save_configuration_settings(current_settings) - add_change("edit-configvar", msg, domains=[domain], need_restart=need_restart) + + + sites = None + if what == 'mkeventd': + sites = get_event_console_sync_sites() + + add_change("edit-configvar", msg, domains=[domain], need_restart=need_restart, sites=sites) if what == 'mkeventd': return 'mkeventd_config' diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 732fab7..3ff1666 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1777,7 +1777,7 @@ def mode_mkeventd_config(phase): save_configuration_settings(current_settings) - add_change("edit-configvar", msg, domains=[domain], need_restart=need_restart) + add_ec_change("edit-configvar", msg) if action == "_reset": return "mkeventd_config", msg

7 years, 10 months

4087 netgear_fans, netgear_powersupplies, netgear_temp: new checks for Netgear Switches which support the FASTPATH-BOXSERVICES-PRIVATE MIB

by Simon Betz

Module: check_mk Branch: master Commit: 8725ce69c0e471513546de73e5e20f33502a31c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8725ce69c0e471… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Nov 15 14:21:11 2016 +0100 4087 netgear_fans, netgear_powersupplies, netgear_temp: new checks for Netgear Switches which support the FASTPATH-BOXSERVICES-PRIVATE MIB --- .werks/4087 | 9 ++++ ChangeLog | 1 + checkman/netgear_fans | 16 +++++++ checkman/netgear_powersupplies | 16 +++++++ checkman/netgear_temp | 16 +++++++ checks/netgear_fans | 102 ++++++++++++++++++++++++++++++++++++++++ checks/netgear_powersupplies | 68 +++++++++++++++++++++++++++ checks/netgear_temp | 104 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 332 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8725ce69c0…

7 years, 10 months

Tests: Fixed broken free listen port detection

by Lars Michelsen

Module: check_mk Branch: master Commit: 415ca52244866975087fd0cbe0952b36ac5c0ab6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=415ca522448669… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 15 14:05:45 2016 +0100 Tests: Fixed broken free listen port detection --- .gitignore | 2 +- tests/mkeventd/test_mkeventd_status.py | 2 ++ tests/testlib/__init__.py | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 286015b..55dfa22 100644 --- a/.gitignore +++ b/.gitignore @@ -26,5 +26,5 @@ RemoteSystemsTempFiles .DS_Store .cache tags -mkeventd +mkeventd/ tests/web/data/* diff --git a/tests/mkeventd/test_mkeventd_status.py b/tests/mkeventd/test_mkeventd_status.py index 824657b..0d2fa5d 100644 --- a/tests/mkeventd/test_mkeventd_status.py +++ b/tests/mkeventd/test_mkeventd_status.py @@ -23,6 +23,7 @@ def test_command_reload(site, ec, core): live = ensure_core_and_get_connection(site, ec, core) old_t = live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + print "Old config load time: %s" % old_t assert old_t > time.time() - 86400 time.sleep(1) # needed to have at least one second after EC start @@ -30,6 +31,7 @@ def test_command_reload(site, ec, core): time.sleep(1) # needed to have at least one second after EC reload new_t = live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + print "New config load time: %s" % old_t assert new_t > old_t diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index cf68a03..78391a0 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -380,6 +380,7 @@ class Site(object): while sock.connect_ex(('127.0.0.1', port)) == 0: print "Port %d is already used, trying next" % port port += 1 + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) print "Using port %d" % port self._livestatus_port = port @@ -804,11 +805,14 @@ class CMKEventConsole(CMKWebSession): def activate_changes(self, web): old_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + print "Old config load time: %s" % old_t assert old_t > time.time() - 86400 super(CMKEventConsole, self).activate_changes(allow_foreign_changes=True) + time.sleep(1) new_t = web.site.live.query_value("GET eventconsolestatus\nColumns: status_config_load_time\n") + print "Old config load time: %s" % old_t assert new_t > old_t

7 years, 10 months

Fixed rendering of HTML code in change table on activate changes page

by Lars Michelsen

Module: check_mk Branch: master Commit: f18326f8d1dc4b42ff19d234768e26638f0eab8e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f18326f8d1dc4b… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 15 09:14:11 2016 +0100 Fixed rendering of HTML code in change table on activate changes page --- web/htdocs/wato.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 40bd57a..1c9f4c9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -4885,7 +4885,7 @@ class ModeActivateChanges(WatoMode, ActivateChanges): html.write_text(change["user_id"] if change["user_id"] else "") if self._is_foreign(change): html.icon(_("This change has been made by another user"), "foreign_changes") - table.cell(_("Change"), html.permissive_attrencode(change["text"])) + table.cell(_("Change"), change["text"]) table.cell(_("Affected sites")) if self._affects_all_sites(change):

7 years, 10 months

Added missing config domain class for mknotifyd

by Lars Michelsen

Module: check_mk Branch: master Commit: 2d21e051ee16ed8e4f34d75bf5e5109ad8622f6e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2d21e051ee16ed… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 15 09:11:59 2016 +0100 Added missing config domain class for mknotifyd --- web/htdocs/watolib.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f12a878..ae3046d 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -330,6 +330,18 @@ class ConfigDomainEventConsole(ConfigDomain): call_hook_mkeventd_activate_changes() + +class ConfigDomainMKNotifyd(ConfigDomain): + needs_sync = True + needs_activation = False + ident = "mknotifyd" + + def activate(self): + pass + + + + #. # .--Hosts & Folders-----------------------------------------------------. # | _ _ _ ___ _____ _ _ |

7 years, 10 months

Changed configvar domains to more generic config domains

by Lars Michelsen

Module: check_mk Branch: master Commit: 889dc0e4a4dc443045b5d6e2769d4fe22e93cf50 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=889dc0e4a4dc44… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Nov 15 10:15:01 2016 +0100 Changed configvar domains to more generic config domains --- web/htdocs/wato.py | 42 +++++------- web/htdocs/watolib.py | 154 ++++++++++++++++++------------------------- web/plugins/wato/mkeventd.py | 59 ++++++++--------- 3 files changed, 109 insertions(+), 146 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=889dc0e4a4…

7 years, 10 months

Added some debug output to test site setup code

by Lars Michelsen

Module: check_mk Branch: master Commit: c244f4ff04f7d8625a3aa2ac377abbd5e89b9771 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c244f4ff04f7d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 22:15:05 2016 +0100 Added some debug output to test site setup code --- tests/testlib/__init__.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 6e69283..cf68a03 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -375,9 +375,12 @@ class Site(object): port = int(self.get_config("LIVESTATUS_TCP_PORT")) else: port = 9123 + print "Trying port %d" % port sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) while sock.connect_ex(('127.0.0.1', port)) == 0: + print "Port %d is already used, trying next" % port port += 1 + print "Using port %d" % port self._livestatus_port = port

7 years, 10 months

3941 FIX zypper: fixed broken check for sections since agent OS SLES12

by Marcel Schulte

Module: check_mk Branch: master Commit: 9513cc8d7c99b6d64fccb08f6dfba3072125fed4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9513cc8d7c99b6… Author: Marcel Schulte <ms(a)mathias-kettner.de> Date: Tue Nov 15 08:12:21 2016 +0100 3941 FIX zypper: fixed broken check for sections since agent OS SLES12 eck was broken for agent sections generated at agent OS since SLES12. This has been fixed now. --- .werks/3941 | 10 ++++++++++ ChangeLog | 1 + checks/zypper | 35 +++++++++++++++++++++++++++++------ 3 files changed, 40 insertions(+), 6 deletions(-) diff --git a/.werks/3941 b/.werks/3941 new file mode 100644 index 0000000..738eae4 --- /dev/null +++ b/.werks/3941 @@ -0,0 +1,10 @@ +Title: zypper: fixed broken check for sections since agent OS SLES12 +Level: 1 +Component: checks +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479193781 + +eck was broken for agent sections generated at agent OS since SLES12. This has been fixed now. diff --git a/ChangeLog b/ChangeLog index 6b4c691..c1d671b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ * 3983 FIX: mssql_instance: Be more robust agains missing instance info in case of connection issues * 3963 FIX: check_mk_agent.linux: fixed strayed output of postfix status command * 3940 FIX: aix_hacmp_services: fixed broken check in case of agent section showing extra information before the "Status(...)" line... + * 3941 FIX: zypper: fixed broken check for sections since agent OS SLES12... Multisite: * 3974 FIX: Sorting comments in hover menu of comments icon by time now diff --git a/checks/zypper b/checks/zypper index 86a5384..d97a48a 100644 --- a/checks/zypper +++ b/checks/zypper @@ -24,6 +24,9 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. +# example agent output sections... +# +# ...for openSUSE 12: # <<<zypper:sep(124)>>> # 5 patches needed (2 security patches) # Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-326 | 1 | recommended | needed | Softwarestack update @@ -34,7 +37,22 @@ # Updates for openSUSE 12.1 12.1-1.4 | openSUSE-2012-324 | 1 | recommended | needed | util-linux: make mount honor 'noexec' and 'user' option # 1 | apache | package | (any) # 2 | mysql | package | (any) - +# +# ...for SLES11: +# <<<zypper:sep(124)>>> +# 4 patches needed (2 security patches) +# SLE11-SDK-SP4-Updates | sdksp4-apache2-mod_fcgid-12653 | 1 | security | needed +# SLES11-SP4-Updates | slessp4-mysql-12847 | 1 | security | needed +# SLES11-SP4-Updates | slessp4-timezone-12844 | 1 | recommended | needed +# SLES11-SP4-Updates | slessp4-wget-12826 | 1 | recommended | needed +# +# ...new since SLES12: +# <<<zypper:sep(124)>>> +# 4 patches needed (1 security patches) +# SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1141 | security | moderate | --- | needed | Security update for sqlite3 +# SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1147 | recommended | moderate | --- | needed | Recommended update for dracut +# SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1149 | recommended | low | --- | needed | Recommended update for gcc48 +# SLES12-SP1-Updates | SUSE-SLE-SERVER-12-SP1-2016-1150 | recommended | low | --- | needed | Recommended update for release-notes-sles def inventory_zypper(info): # the agent section is only present when the agent has @@ -51,11 +69,16 @@ def check_zypper(_no_item, _no_params, info): return 3, firstline for line in info: # 5 patches needed (2 security patches) - if len(line) >= 5 and line[4].lower().strip() == 'needed': - patch_type = line[3].strip() - patch_types.setdefault(patch_type, 0) - patch_types[patch_type] += 1 - updates += 1 + if len(line) >= 5: + patch_type = None + if len(line) >= 6 and line[5].lower().strip() == 'needed': # since SLES12 + patch_type = line[2].strip() + elif line[4].lower().strip() == 'needed': + patch_type = line[3].strip() + if patch_type: + patch_types.setdefault(patch_type, 0) + patch_types[patch_type] += 1 + updates += 1 elif len(line) == 4: locks.append(line[1])

7 years, 10 months

3918 FIX Inventory history: Fixed possible exception when renedering history tables

by Lars Michelsen

Module: check_mk Branch: master Commit: 34dadda3307be581f61aff8fe6e500aa1ac43bf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=34dadda3307be5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 14 20:37:58 2016 +0100 3918 FIX Inventory history: Fixed possible exception when renedering history tables Different kind of exceptions could occur, all in the inv_*() functions. For example in inv_paint_timestamp_as_age() the error "TypeError: unsupported operand type(s) for -: 'float' and 'tuple'" --- .werks/3918 | 11 +++++++++++ ChangeLog | 1 + web/plugins/views/inventory.py | 6 +++++- 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.werks/3918 b/.werks/3918 new file mode 100644 index 0000000..c6e77f2 --- /dev/null +++ b/.werks/3918 @@ -0,0 +1,11 @@ +Title: Inventory history: Fixed possible exception when renedering history tables +Level: 1 +Component: inv +Class: fix +Compatible: compat +State: unknown +Version: 1.4.0i3 +Date: 1479152226 + +Different kind of exceptions could occur, all in the inv_*() functions. For example +in inv_paint_timestamp_as_age() the error "TypeError: unsupported operand type(s) for -: 'float' and 'tuple'" diff --git a/ChangeLog b/ChangeLog index 0dbdeeb..6b4c691 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,7 @@ * 4066 FIX: Fixed broken titles of nodes in inventory views * 4067 FIX: Fixed broken inventory history view in current master... * 3917 FIX: Fixed broken dicttable rendering + * 3918 FIX: Inventory history: Fixed possible exception when renedering history tables... 1.4.0i2: diff --git a/web/plugins/views/inventory.py b/web/plugins/views/inventory.py index a2e79df..e953bed 100644 --- a/web/plugins/views/inventory.py +++ b/web/plugins/views/inventory.py @@ -263,7 +263,8 @@ def render_inv_subtree_leaf_value(hostname, tree_id, invpath, node): def render_inv_dicttable(hostname, tree_id, invpath, node): - # In delta mode node is a pair of (old_items, new_items) + # In delta mode where nodes have been added/removed, node is a pair of + # (old_items, new_items) if type(node) == tuple: if node[0]: html.write_text(_("Removed entries") + ":") @@ -331,7 +332,10 @@ def render_inv_dicttable(hostname, tree_id, invpath, node): invpath_sub += ":" hint = inv_display_hint(invpath_sub) + if "paint_function" in hint: + # The value is not really needed, but we need to deal with the delta mode + value = value[1] if type(value) == tuple else value td_class, text = hint["paint_function"](value) else: td_class = None

7 years, 10 months

← Newer
1
...
10
11
12
13
14
15
16
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2016