Checkmk git commits November 2017

checkmk-commits@lists.checkmk.com

10 participants
325 discussions

User connections persistance is now using generic store functions

by Lars Michelsen

Module: check_mk Branch: master Commit: 7d9467cbb35808d2524384fa90c8faf083c6fc3c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7d9467cbb35808… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:24:36 2017 +0100 User connections persistance is now using generic store functions Change-Id: I29118e7bd06e0e82a1d1c82f33c5d7601e611ba9 --- web/htdocs/userdb.py | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/web/htdocs/userdb.py b/web/htdocs/userdb.py index bcaa025..f863e8d 100644 --- a/web/htdocs/userdb.py +++ b/web/htdocs/userdb.py @@ -1061,35 +1061,16 @@ def declare_custom_user_attrs(): # '----------------------------------------------------------------------' def load_connection_config(lock=False): - user_connections = [] - - filename = multisite_dir + "user_connections.mk" - if not os.path.exists(filename): - return user_connections - - try: - context = { - "user_connections": user_connections, - } - execfile(filename, context, context) - return context["user_connections"] - - except Exception, e: - if config.debug: - raise MKGeneralException(_("Cannot read configuration file %s: %s") % - (filename, e)) - return user_connections + filename = os.path.join(multisite_dir, "user_connections.mk") + return store.load_from_mk_file(filename, "user_connections", default=[], lock=lock) def save_connection_config(connections, base_dir=None): if not base_dir: base_dir = multisite_dir - - output = "# Written by Multisite UserDB\n# encoding: utf-8\n\n" - output += "user_connections = \\\n%s\n\n" % pprint.pformat(connections) - make_nagios_directory(base_dir) - store.save_file(os.path.join(base_dir, "user_connections.mk"), output) + store.save_to_mk_file(os.path.join(base_dir, "user_connections.mk"), + "user_connections", connections) #. # .--ConnectorAPI--------------------------------------------------------.

6 years, 7 months

5544 LDAP: It is now possible to clone LDAP connections

by Lars Michelsen

Module: check_mk Branch: master Commit: 9f709516c721a8885eb13f3b5c87e18d0f0b2be3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9f709516c721a8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:33:11 2017 +0100 5544 LDAP: It is now possible to clone LDAP connections Change-Id: Ibcf67dfe63878ff0afef0b4b868362d814b6bd2a --- .werks/5544 | 10 ++++++++++ web/htdocs/wato.py | 20 ++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/.werks/5544 b/.werks/5544 new file mode 100644 index 0000000..eb6ce1d --- /dev/null +++ b/.werks/5544 @@ -0,0 +1,10 @@ +Title: LDAP: It is now possible to clone LDAP connections +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511778771 +Class: feature + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 14f0c61..5990984 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6097,7 +6097,7 @@ def add_ldap_change(action_name, text): def mode_ldap_config(phase): - title = _("LDAP Connections") + title = _("LDAP connections") if phase == "title": return title @@ -6148,8 +6148,10 @@ def mode_ldap_config(phase): edit_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("id", connection["id"])]) delete_url = make_action_link([("mode", "ldap_config"), ("_delete", nr)]) drag_url = make_action_link([("mode", "ldap_config"), ("_move", nr)]) + clone_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("clone", connection["id"])]) html.icon_button(edit_url, _("Edit this LDAP connection"), "edit") + html.icon_button(clone_url, _("Create a copy of this LDAP connection"), "clone") html.element_dragger("tr", base_url=drag_url) html.icon_button(delete_url, _("Delete this LDAP connection"), "delete") @@ -6185,18 +6187,24 @@ class ModeEditLDAPConnection(WatoMode): self._connections = userdb.load_connection_config(lock=html.is_transaction()) if self._connection_id == None: + clone_id = html.var("clone") + if clone_id is not None: + self._connection_cfg = self._get_connection_cfg_and_index(clone_id)[0] + self._new = True return self._new = False + self._connection_cfg, self._connection_nr = self._get_connection_cfg_and_index(self._connection_id) + - for nr, c in enumerate(self._connections): - if c['id'] == self._connection_id: - self._connection_cfg = c - self._connection_nr = nr + def _get_connection_cfg_and_index(self, connection_id): + for index, cfg in enumerate(self._connections): + if cfg['id'] == connection_id: + return cfg, index if not self._connection_cfg: - raise MKUserError(None, _("The given connection does not exist.")) + raise MKUserError(None, _("The requested connection does not exist.")) def title(self):

6 years, 7 months

Refactored LDAP connection list to WatoMode

by Lars Michelsen

Module: check_mk Branch: master Commit: 68acfb51baa23f36618119083f5cc3a92f3f8998 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68acfb51baa23f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 11:40:35 2017 +0100 Refactored LDAP connection list to WatoMode Change-Id: I4c8ddf1cb9b8f14517d1a99352850001e3f8e77b --- web/htdocs/wato.py | 120 +++++++++++++++++++++++++++-------------------------- 1 file changed, 62 insertions(+), 58 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 5990984..9bfbd83 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -6091,35 +6091,35 @@ class MainMenu(object): # | LDAP configuration and diagnose page | # '----------------------------------------------------------------------' -def add_ldap_change(action_name, text): - add_change(action_name, text, domains=[watolib.ConfigDomainGUI], - sites=config.get_login_sites()) +class LDAPMode(WatoMode): + def _add_change(self, action_name, text): + add_change(action_name, text, domains=[watolib.ConfigDomainGUI], + sites=config.get_login_sites()) -def mode_ldap_config(phase): - title = _("LDAP connections") - if phase == "title": - return title +class ModeLDAPConfig(LDAPMode): + def title(self): + return _("LDAP connections") - elif phase == "buttons": + def buttons(self): global_buttons() html.context_button(_("Users"), watolib.folder_preserving_link([("mode", "users")]), "users") html.context_button(_("New Connection"), watolib.folder_preserving_link([("mode", "edit_ldap_connection")]), "new") - return - connections = userdb.load_connection_config() - if phase == "action": + + def action(self): + connections = userdb.load_connection_config(lock=True) if html.has_var("_delete"): - nr = int(html.var("_delete")) - connection = connections[nr] + index = int(html.var("_delete")) + connection = connections[index] c = wato_confirm(_("Confirm deletion of LDAP connection"), _("Do you really want to delete the LDAP connection <b>%s</b>?") % (connection["id"])) if c: - add_ldap_change("delete-ldap-connection", + self._add_change("delete-ldap-connection", _("Deleted LDAP connection %s") % (connection["id"])) - del connections[nr] + del connections[index] userdb.save_connection_config(connections) elif c == False: return "" @@ -6127,56 +6127,60 @@ def mode_ldap_config(phase): return elif html.has_var("_move"): - if html.check_transaction(): - from_pos = html.get_integer_input("_move") - to_pos = html.get_integer_input("_index") - connection = connections[from_pos] - add_ldap_change("move-ldap-connection", - _("Changed position of LDAP connection %s to %d") % (connection["id"], to_pos)) - del connections[from_pos] # make to_pos now match! - connections[to_pos:to_pos] = [connection] - userdb.save_connection_config(connections) - return + if not html.check_transaction(): + return - userdb.ldap_test_module() + from_pos = html.get_integer_input("_move") + to_pos = html.get_integer_input("_index") + connection = connections[from_pos] + self._add_change("move-ldap-connection", + _("Changed position of LDAP connection %s to %d") % (connection["id"], to_pos)) + del connections[from_pos] # make to_pos now match! + connections[to_pos:to_pos] = [connection] + userdb.save_connection_config(connections) - table.begin() - for nr, connection in enumerate(connections): - table.row() - table.cell(_("Actions"), css="buttons") - edit_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("id", connection["id"])]) - delete_url = make_action_link([("mode", "ldap_config"), ("_delete", nr)]) - drag_url = make_action_link([("mode", "ldap_config"), ("_move", nr)]) - clone_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("clone", connection["id"])]) - - html.icon_button(edit_url, _("Edit this LDAP connection"), "edit") - html.icon_button(clone_url, _("Create a copy of this LDAP connection"), "clone") - html.element_dragger("tr", base_url=drag_url) - html.icon_button(delete_url, _("Delete this LDAP connection"), "delete") - - table.cell("", css="narrow") - if connection.get("disabled"): - html.icon(_("This connection is currently not being used for synchronization."), "disabled") - else: - html.empty_icon_button() + def page(self): + userdb.ldap_test_module() - table.cell(_("ID"), connection["id"]) + table.begin() + for index, connection in enumerate(userdb.load_connection_config()): + table.row() - if cmk.is_managed_edition(): - table.cell(_("Customer"), managed.get_customer_name(connection)) + table.cell(_("Actions"), css="buttons") + edit_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("id", connection["id"])]) + delete_url = make_action_link([("mode", "ldap_config"), ("_delete", index)]) + drag_url = make_action_link([("mode", "ldap_config"), ("_move", index)]) + clone_url = watolib.folder_preserving_link([("mode", "edit_ldap_connection"), ("clone", connection["id"])]) - table.cell(_("Description")) - url = connection.get("docu_url") - if url: - html.icon_button(url, _("Context information about this connection"), "url", target="_blank") - html.write(" ") - html.write_text(connection["description"]) + html.icon_button(edit_url, _("Edit this LDAP connection"), "edit") + html.icon_button(clone_url, _("Create a copy of this LDAP connection"), "clone") + html.element_dragger("tr", base_url=drag_url) + html.icon_button(delete_url, _("Delete this LDAP connection"), "delete") + + table.cell("", css="narrow") + if connection.get("disabled"): + html.icon(_("This connection is currently not being used for synchronization."), "disabled") + else: + html.empty_icon_button() + + table.cell(_("ID"), connection["id"]) + + if cmk.is_managed_edition(): + table.cell(_("Customer"), managed.get_customer_name(connection)) + + table.cell(_("Description")) + url = connection.get("docu_url") + if url: + html.icon_button(url, _("Context information about this connection"), "url", target="_blank") + html.write(" ") + html.write_text(connection["description"]) + + table.end() - table.end() -class ModeEditLDAPConnection(WatoMode): +class ModeEditLDAPConnection(LDAPMode): def __init__(self): super(ModeEditLDAPConnection, self).__init__() self._from_vars() @@ -6240,7 +6244,7 @@ class ModeEditLDAPConnection(WatoMode): else: log_what = "edit-ldap-connection" log_text = _("Changed LDAP connection %s") % self._connection_id - add_ldap_change(log_what, log_text) + self._add_change(log_what, log_text) userdb.save_connection_config(self._connections) config.user_connections = self._connections # make directly available on current page @@ -17582,7 +17586,7 @@ modes = { "globalvars" : (["global"], ModeEditGlobals), "edit_configvar" : (["global"], ModeEditGlobalSetting), "edit_site_configvar": (["global"], ModeEditSiteGlobalSetting), - "ldap_config" : (["global"], mode_ldap_config), + "ldap_config" : (["global"], ModeLDAPConfig), "edit_ldap_connection": (["global"], ModeEditLDAPConnection), "static_checks" : (["rulesets"], ModeStaticChecksRulesets), "check_plugins" : ([], ModeCheckPlugins),

6 years, 7 months

Fixed wrong import statement

by Simon Betz

Module: check_mk Branch: master Commit: 95dd9648ea62ebb9737fb85f914d344b001a9215 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95dd9648ea62eb… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 27 11:39:37 2017 +0100 Fixed wrong import statement Change-Id: Icee10dcff181f9d8909fbec492f2d815ca91203f --- cmk_base/classic_snmp.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index db708cd..e11524a 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -30,11 +30,11 @@ import signal import cmk.debug import cmk.tty as tty -from cmk.exceptions import MKGeneralException, MKTimeout +from cmk.exceptions import MKGeneralException import cmk_base.console as console import cmk_base.config as config -from cmk_base.exceptions import MKSNMPError +from cmk_base.exceptions import MKSNMPError, MKTimeout #.

6 years, 7 months

Fixed forgotten imports

by Simon Betz

Module: check_mk Branch: master Commit: 2f173eeccb1d89cb146a07822a357a3b07299388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2f173eeccb1d89… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 27 11:27:18 2017 +0100 Fixed forgotten imports Change-Id: I7c42d17f9575182ea5169b453425328caa05cc50 --- cmk_base/classic_snmp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index f24f404..db708cd 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -26,10 +26,11 @@ import os import subprocess +import signal import cmk.debug import cmk.tty as tty -from cmk.exceptions import MKGeneralException +from cmk.exceptions import MKGeneralException, MKTimeout import cmk_base.console as console import cmk_base.config as config

6 years, 7 months

test_df: Test cases for inventory involving btrfs

by Konstantin Büttner

Module: check_mk Branch: master Commit: a98cde3d77be59ec88a6b91bc07836f82dafb900 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a98cde3d77be59… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Mon Nov 27 11:17:55 2017 +0100 test_df: Test cases for inventory involving btrfs Change-Id: I3fd2aaebdb1ea39d77b47f47dc054c94695a2e7f --- tests/checks/test_df.py | 176 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 176 insertions(+) diff --git a/tests/checks/test_df.py b/tests/checks/test_df.py index 031c006..bd8208a 100644 --- a/tests/checks/test_df.py +++ b/tests/checks/test_df.py @@ -4,6 +4,22 @@ import sys pytestmark = pytest.mark.checks + +# .--Test info sections--------------------------------------------------. +# | _____ _ _ __ | +# | |_ _|__ ___| |_ (_)_ __ / _| ___ | +# | | |/ _ \/ __| __| | | '_ \| |_ / _ \ | +# | | | __/\__ \ |_ | | | | | _| (_) | | +# | |_|\___||___/\__| |_|_| |_|_| \___/ | +# | | +# | _ _ | +# | ___ ___ ___| |_(_) ___ _ __ ___ | +# | / __|/ _ \/ __| __| |/ _ \| '_ \/ __| | +# | \__ \ __/ (__| |_| | (_) | | | \__ \ | +# | |___/\___|\___|\__|_|\___/|_| |_|___/ | +# | | +# '----------------------------------------------------------------------' + info_df_lnx = [[u'/dev/sda4', u'ext4', u'143786696', @@ -25,12 +41,172 @@ info_df_win = [[u'C:\\', u'NTFS', u'8192620', u'7724268', u'468352', u'95%', u'C u'41%', u'F:\\']] +# NOTE: This gargantuan test info section is uncritically used data from an archived agent output. +# I suspect that our handling of btrfs is not really adequate, test cases using this data +# serve the sole purpose of not inadvertenty breaking the status quo. Thus: +# TODO: Replace this monstrosity with something more concise. +info_df_btrfs = \ +[[u'/dev/sda1', u'btrfs', u'20970496', u'4169036', u'16539348', u'21%', u'/'], + [u'devtmpfs', u'devtmpfs', u'497396', u'0', u'497396', u'0%', u'/dev'], + [u'tmpfs', u'tmpfs', u'506312', u'0', u'506312', u'0%', u'/dev/shm'], + [u'tmpfs', u'tmpfs', u'506312', u'6980', u'499332', u'2%', u'/run'], + [u'tmpfs', u'tmpfs', u'506312', u'0', u'506312', u'0%', u'/sys/fs/cgroup'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/.snapshots'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/tmp'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/spool'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/opt'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/log'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/lib/pgsql'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/lib/named'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/lib/mailman'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/var/crash'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/usr/local'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/tmp'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/srv'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/opt'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/home'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/boot/grub2/x86_64-efi'], + [u'/dev/sda1', + u'btrfs', + u'20970496', + u'4169036', + u'16539348', + u'21%', + u'/boot/grub2/i386-pc'], + [u'[df_inodes_start]'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/'], + [u'devtmpfs', u'devtmpfs', u'124349', u'371', u'123978', u'1%', u'/dev'], + [u'tmpfs', u'tmpfs', u'126578', u'1', u'126577', u'1%', u'/dev/shm'], + [u'tmpfs', u'tmpfs', u'126578', u'481', u'126097', u'1%', u'/run'], + [u'tmpfs', u'tmpfs', u'126578', u'12', u'126566', u'1%', u'/sys/fs/cgroup'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/.snapshots'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/tmp'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/spool'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/opt'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/log'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/lib/pgsql'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/lib/named'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/lib/mailman'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/var/crash'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/usr/local'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/tmp'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/srv'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/opt'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/home'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/boot/grub2/x86_64-efi'], + [u'/dev/sda1', u'btrfs', u'0', u'0', u'0', u'-', u'/boot/grub2/i386-pc'], + [u'[df_inodes_end]']] + + + +#. +# .--Test functions------------------------------------------------------. +# | _____ _ __ _ _ | +# | |_ _|__ ___| |_ / _|_ _ _ __ ___| |_(_) ___ _ __ ___ | +# | | |/ _ \/ __| __| | |_| | | | '_ \ / __| __| |/ _ \| '_ \/ __| | +# | | | __/\__ \ |_ | _| |_| | | | | (__| |_| | (_) | | | \__ \ | +# | |_|\___||___/\__| |_| \__,_|_| |_|\___|\__|_|\___/|_| |_|___/ | +# | | +# '----------------------------------------------------------------------' + @pytest.mark.parametrize("info,result,include_volume_name", [ ([], [], False), (info_df_lnx, [(u'/', {})], False), (info_df_lnx, [(u'/dev/sda4 /', {})], True), (info_df_win, [(u'E:/', {}), (u'F:/', {}), (u'C:/', {})], False), (info_df_win, [(u'New_Volume E:/', {}), (u'New_Volume F:/', {}), (u'C:\\ C:/', {})], True), + (info_df_btrfs, [(u'/sys/fs/cgroup', {}), (u'btrfs /dev/sda1', {})], False), + (info_df_btrfs, [(u'/dev/sda1 /sys/fs/cgroup', {}), (u'/dev/sda1 btrfs /dev/sda1', {})], True), ]) def test_df_discovery_with_parse(check_manager, monkeypatch, info, result, include_volume_name): import cmk_base.checks

6 years, 7 months

5444 FIX SNMP commands: Prevent zombie processes in case of timeouts

by Simon Betz

Module: check_mk Branch: master Commit: 6fb0b9e1c104913d5031091b2c3981a2ff9eb54b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6fb0b9e1c10491… Author: Simon Betz <si(a)mathias-kettner.de> Date: Mon Nov 27 11:08:14 2017 +0100 5444 FIX SNMP commands: Prevent zombie processes in case of timeouts Change-Id: I7366ceaefa9b68ddb85388c943a87a4e8b6aac1e --- .werks/5444 | 20 +++++++++++ cmk_base/classic_snmp.py | 87 +++++++++++++++++++++++++++++++----------------- 2 files changed, 76 insertions(+), 31 deletions(-) diff --git a/.werks/5444 b/.werks/5444 new file mode 100644 index 0000000..0c3852f --- /dev/null +++ b/.werks/5444 @@ -0,0 +1,20 @@ +Title: SNMP commands: Prevent zombie processes in case of timeouts +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i2 +Date: 1510582108 + +This concerns the RAW edition or users which use CEE/CME edition of Check_MK +with deactivated inline SNMP. + +When executing SNMP commands like get, getnext, walk or bulkwalk to get agent data +from hosts it may happen that these commands remain open as zombie processes. +Check_MK has been extended to deal with this situation and clean up these processes. + +Details: When the command execution takes too long Check_MK sends a SIGTERM to the +process group of the executed program. After sending the signal Check_MK is now +waiting for the process to finish. diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index fa4a5d9..f24f404 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -57,9 +57,40 @@ def walk(hostname, ip, oid, hex_plain=False, context_name=None): debug_cmd = [ "''" if a == "" else a for a in command ] console.vverbose("Running '%s'\n" % " ".join(debug_cmd)) - snmp_process = subprocess.Popen(command, close_fds=True, stdin=open(os.devnull), - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + snmp_process = None + exitstatus = None + rowinfo = [] + try: + snmp_process = subprocess.Popen(command, close_fds=True, stdin=open(os.devnull), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + rowinfo = _get_rowinfo_from_snmp_process(snmp_process, hex_plain) + + except MKTimeout: + # On timeout exception try to stop the process to prevent child process "leakage" + if snmp_process: + os.kill(snmp_process.pid, signal.SIGTERM) + snmp_process.wait() + raise + + finally: + # The stdout and stderr pipe are not closed correctly on a MKTimeout + # Normally these pipes getting closed after p.communicate finishes + # Closing them a second time in a OK scenario won't hurt neither.. + if snmp_process: + exitstatus = snmp_process.wait() + error = snmp_process.stderr.read() + snmp_process.stdout.close() + snmp_process.stderr.close() + + if exitstatus: + console.verbose(tty.red + tty.bold + "ERROR: " + tty.normal + "SNMP error: %s\n" % error.strip()) + raise MKSNMPError("SNMP Error on %s: %s (Exit-Code: %d)" % (ip, error.strip(), exitstatus)) + return rowinfo + +def _get_rowinfo_from_snmp_process(snmp_process, hex_plain): + line_iter = snmp_process.stdout.xreadlines() # Ugly(1): in some cases snmpwalk inserts line feed within one # dataset. This happens for example on hexdump outputs longer # than a few bytes. Those dumps are enclosed in double quotes. @@ -67,36 +98,30 @@ def walk(hostname, ip, oid, hex_plain=False, context_name=None): # does not end with a double quote, we take the next line(s) as # a continuation line. rowinfo = [] - try: - line_iter = snmp_process.stdout.xreadlines() - while True: + while True: + try: line = line_iter.next().strip() - parts = line.split('=', 1) - if len(parts) < 2: - continue # broken line, must contain = - oid = parts[0].strip() - value = parts[1].strip() - # Filter out silly error messages from snmpwalk >:-P - if value.startswith('No more variables') or value.startswith('End of MIB') \ - or value.startswith('No Such Object available') or value.startswith('No Such Instance currently exists'): - continue - - if value == '"' or (len(value) > 1 and value[0] == '"' and (value[-1] != '"')): # to be continued - while True: # scan for end of this dataset - nextline = line_iter.next().strip() - value += " " + nextline - if value[-1] == '"': - break - rowinfo.append((oid, strip_snmp_value(value, hex_plain))) - - except StopIteration: - pass - - error = snmp_process.stderr.read() - exitstatus = snmp_process.wait() - if exitstatus: - console.verbose(tty.red + tty.bold + "ERROR: " + tty.normal + "SNMP error: %s\n" % error.strip()) - raise MKSNMPError("SNMP Error on %s: %s (Exit-Code: %d)" % (ip, error.strip(), exitstatus)) + except StopIteration: + break + + parts = line.split('=', 1) + if len(parts) < 2: + continue # broken line, must contain = + oid = parts[0].strip() + value = parts[1].strip() + # Filter out silly error messages from snmpwalk >:-P + if value.startswith('No more variables') or value.startswith('End of MIB') \ + or value.startswith('No Such Object available') \ + or value.startswith('No Such Instance currently exists'): + continue + + if value == '"' or (len(value) > 1 and value[0] == '"' and (value[-1] != '"')): # to be continued + while True: # scan for end of this dataset + nextline = line_iter.next().strip() + value += " " + nextline + if value[-1] == '"': + break + rowinfo.append((oid, strip_snmp_value(value, hex_plain))) return rowinfo

6 years, 7 months

5543 Host rename: Reduced duration of core downtime during host renamings

by Lars Michelsen

Module: check_mk Branch: master Commit: 18b19b2a6e2bc575df46781da17c4b1f8a69eae0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18b19b2a6e2bc5… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 10:50:59 2017 +0100 5543 Host rename: Reduced duration of core downtime during host renamings The most time consuming action during renaming of hosts, the rewrite of the monitoring history, is now done while the core is running. After this is done, the core is being stopped and the remaining history files (current one) is updated. Change-Id: I35b166a3bcc9b43cd3be910335b0335bbe9824d7 --- .werks/5543 | 13 +++++ cmk_base/automations/check_mk.py | 110 ++++++++++++++++++++++++++++----------- 2 files changed, 94 insertions(+), 29 deletions(-) diff --git a/.werks/5543 b/.werks/5543 new file mode 100644 index 0000000..0800024 --- /dev/null +++ b/.werks/5543 @@ -0,0 +1,13 @@ +Title: Host rename: Reduced duration of core downtime during host renamings +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511776151 +Class: feature + +The most time consuming action during renaming of hosts, the rewrite of the +monitoring history, is now done while the core is running. After this is done, +the core is being stopped and the remaining history files (current one) is +updated. diff --git a/cmk_base/automations/check_mk.py b/cmk_base/automations/check_mk.py index bccaa61..8e2099e 100644 --- a/cmk_base/automations/check_mk.py +++ b/cmk_base/automations/check_mk.py @@ -192,6 +192,10 @@ class AutomationRenameHosts(Automation): needs_config = True needs_checks = True + def __init__(self): + super(AutomationRenameHosts, self).__init__() + self._finished_history_files = {} + # WATO calls this automation when hosts have been renamed. We need to change # several file and directory names. This function has no argument but reads # Python pair-list from stdin: @@ -201,6 +205,17 @@ class AutomationRenameHosts(Automation): actions = [] + # The history archive can be renamed with running core. We need to keep + # the list of already handled history archive files, because a new history + # file may be created by the core during this step. All unhandled files, + # including the current history files will be handled later when the core + # is stopped. + for oldname, newname in renamings: + self._finished_history_files[(oldname, newname)] = \ + self._rename_host_in_core_history_archive(oldname, newname) + if self._finished_history_files[(oldname, newname)]: + actions.append("history") + # At this place WATO already has changed it's configuration. All further # data might be changed by the still running core. So we need to stop # it now. @@ -338,7 +353,7 @@ class AutomationRenameHosts(Automation): # This functions could be moved out of Check_MK. def _omd_rename_host(self, oldname, newname): - oldregex = oldname.replace(".", "[.]") + oldregex = self._escape_name_for_regex_matching(oldname) actions = [] # Temporarily stop processing of performance data @@ -386,34 +401,7 @@ class AutomationRenameHosts(Automation): if npcd_running: os.system("omd start npcd >/dev/null 2>&1 </dev/null") - # Logfiles and history files of CMC and Nagios. Problem - # here: the exact place of the hostname varies between the - # various log entry lines - sed_commands = r''' -s/(INITIAL|CURRENT) (HOST|SERVICE) STATE: %(old)s;/\1 \2 STATE: %(new)s;/ -s/(HOST|SERVICE) (DOWNTIME |FLAPPING |)ALERT: %(old)s;/\1 \2ALERT: %(new)s;/ -s/PASSIVE (HOST|SERVICE) CHECK: %(old)s;/PASSIVE \1 CHECK: %(new)s;/ -s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ -''' % { "old" : oldregex, "new" : newname } - path_patterns = [ - "var/check_mk/core/history", - "var/check_mk/core/archive/*", - "var/nagios/nagios.log", - "var/nagios/archive/*", - ] - one_matched = False - for path_pattern in path_patterns: - command = ["sed", "-ri", "--file=/dev/fd/0"] - files = glob.glob("%s/%s" % (cmk.paths.omd_root, path_pattern)) - p = subprocess.Popen(command + files, stdin=subprocess.PIPE, - stdout=open(os.devnull, "w"), stderr=subprocess.STDOUT, - close_fds=True) - p.communicate(sed_commands) - if files: - one_matched = True - - if one_matched: - actions.append("history") + self._rename_host_in_remaining_core_history_files(oldname, newname) # State retention (important for Downtimes, Acknowledgements, etc.) if config.monitoring_core == "nagios": @@ -440,6 +428,65 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ return actions + def _rename_host_in_remaining_core_history_files(self, oldname, newname): + """Perform the rename operation in all history archive files that have not been handled yet""" + finished_file_paths = self._finished_history_files[(oldname, newname)] + all_file_paths = set(self._get_core_history_files(only_archive=True)) + todo_file_paths = list(all_file_paths.difference(finished_file_paths)) + return self._rename_host_in_core_history_files(todo_file_paths, oldname, newname) + + + def _rename_host_in_core_history_archive(self, oldname, newname): + """Perform the rename operation in all history archive files""" + file_paths = self._get_core_history_files(only_archive=True) + return self._rename_host_in_core_history_files(file_paths, oldname, newname) + + + def _get_core_history_files(self, only_archive): + path_patterns = [ + "var/check_mk/core/archive/*", + "var/nagios/archive/*", + ] + + if not only_archive: + path_patterns += [ + "var/check_mk/core/history", + "var/nagios/nagios.log", + ] + + file_paths = [] + for path_pattern in path_patterns: + file_paths += glob.glob("%s/%s" % (cmk.paths.omd_root, path_pattern)) + return file_paths + + + def _rename_host_in_core_history_files(self, file_paths, oldname, newname): + oldregex = self._escape_name_for_regex_matching(oldname) + + # Logfiles and history files of CMC and Nagios. Problem + # here: the exact place of the hostname varies between the + # various log entry lines + sed_commands = r''' +s/(INITIAL|CURRENT) (HOST|SERVICE) STATE: %(old)s;/\1 \2 STATE: %(new)s;/ +s/(HOST|SERVICE) (DOWNTIME |FLAPPING |)ALERT: %(old)s;/\1 \2ALERT: %(new)s;/ +s/PASSIVE (HOST|SERVICE) CHECK: %(old)s;/PASSIVE \1 CHECK: %(new)s;/ +s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ +''' % { "old" : oldregex, "new" : newname } + + handled_files = [] + + command = ["sed", "-ri", "--file=/dev/fd/0"] + p = subprocess.Popen(command + file_paths, stdin=subprocess.PIPE, + stdout=open(os.devnull, "w"), stderr=subprocess.STDOUT, + close_fds=True) + p.communicate(sed_commands) + # TODO: error handling? + + handled_files += file_paths + + return handled_files + + # Returns True in case files were found, otherwise False def rename_host_in_files(self, path_pattern, old, new, extended_regex=False): paths = glob.glob(path_pattern) @@ -452,6 +499,11 @@ s/(HOST|SERVICE) NOTIFICATION: ([^;]+);%(old)s;/\1 NOTIFICATION: \2;%(new)s;/ return False + def _escape_name_for_regex_matching(self, name): + return name.replace(".", "[.]") + + + automations.register(AutomationRenameHosts())

6 years, 7 months

5357 Title: cmctc_state, cmctc_config, cmctc_ports, cmctc_output, cmctc_lcp.current, cmctc_lcp.humidity, cmctc_lcp.position, cmctc_lcp.status, cmctc_lcp.user cmctc_lcp.leakage: make output for CMC-TC devices more consistent and add additional sensors

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 3afd9534769b2e46cdaab5ac3b5854b4051a3d51 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3afd9534769b2e… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Nov 15 16:34:09 2017 +0100 5357 Title: cmctc_state, cmctc_config, cmctc_ports, cmctc_output, cmctc_lcp.current, cmctc_lcp.humidity, cmctc_lcp.position, cmctc_lcp.status, cmctc_lcp.user cmctc_lcp.leakage: make output for CMC-TC devices more consistent and add additional sensors Change-Id: I0f835baf616295d0cf78bcaa9f89f055988bef32 --- .werks/5357 | 10 + checkman/cmcii.input | 16 - checkman/cmcii.output | 16 - checkman/cmcii.position_psm | 14 - checkman/cmcii.psm_onoff | 14 - checkman/cmcii.status_psm | 14 - checkman/cmcii.temp | 14 - checkman/{cmcii.config => cmctc_config} | 6 +- checkman/{cmcii.access => cmctc_lcp.access} | 6 +- checkman/cmctc_lcp.current | 20 + checkman/cmctc_lcp.humidity | 20 + checkman/cmctc_lcp.position | 20 + checkman/cmctc_lcp.status | 20 + checkman/cmctc_lcp.user | 20 + checkman/cmctc_output | 16 + checkman/{cmcii.ports => cmctc_ports} | 6 +- checkman/{cmcii => cmctc_state} | 5 +- checks/cmcii | 564 ---------------------------- checks/cmcii.include | 238 ------------ checks/cmctc | 3 +- checks/cmctc.include | 3 + checks/cmctc_config | 95 +++++ checks/cmctc_lcp | 97 ++++- checks/cmctc_output | 223 +++++++++++ checks/cmctc_ports | 148 ++++++++ checks/cmctc_psm_m | 4 +- checks/cmctc_state | 58 +++ 27 files changed, 753 insertions(+), 917 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3afd953476…

6 years, 7 months

Fixed discovery of cmctc_lcp.* checks ( and others that do not have a main check)

by Lars Michelsen

Module: check_mk Branch: master Commit: 0cef30abdf7d02ca204e833a8f9517ef0064b978 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0cef30abdf7d02… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Nov 27 10:00:45 2017 +0100 Fixed discovery of cmctc_lcp.* checks (and others that do not have a main check) Change-Id: Iee9cd29bffce003d2a99ecd6cfa49f712a03fd44 --- cmk_base/data_sources/snmp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 5d70573..45fea0f 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -193,7 +193,7 @@ class SNMPDataSource(DataSource): else: check_info = snmp.get_snmp_table(hostname, ipaddress, check_plugin_name, oid_info, self._use_snmpwalk_cache) - info[check_plugin_name] = check_info + info[section_name] = check_info return info

6 years, 7 months

← Newer
1
...
4
5
6
7
8
9
10
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2017