Checkmk git commits February 2018

checkmk-commits@lists.checkmk.com

11 participants
330 discussions

Improved management board output of "cmk -D HOST"

by Lars Michelsen

Module: check_mk Branch: master Commit: 67c006031c3e6f1764d571be7277f1f1af9f576b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=67c006031c3e6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 15:59:27 2018 +0100 Improved management board output of "cmk -D HOST" Change-Id: I46418cb63684e8919a400fbe435562ab977b2547 --- cmk_base/data_sources/snmp.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmk_base/data_sources/snmp.py b/cmk_base/data_sources/snmp.py index 2b539e8..0887e33 100644 --- a/cmk_base/data_sources/snmp.py +++ b/cmk_base/data_sources/snmp.py @@ -68,6 +68,10 @@ class SNMPDataSource(DataSource): return "snmp" + def title(self): + return "SNMP" + + def _cpu_tracking_id(self): return "snmp" @@ -96,8 +100,8 @@ class SNMPDataSource(DataSource): if portinfo == None: portinfo = 'default' - return "SNMP (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ - (cred, bulk, portinfo, inline) + return "%s (%s, Bulk walk: %s, Port: %s, Inline: %s)" % \ + (self.title(), cred, bulk, portinfo, inline) def _from_cache_file(self, raw_data): @@ -252,6 +256,10 @@ class SNMPManagementBoardDataSource(SNMPDataSource): return "mgmt_snmp" + def title(self): + return "Management board - SNMP" + + def _execute(self, hostname, ipaddress): # Do not use the (custom) ipaddress for the host. Use the management board # address instead

6 years, 7 months

5741 FIX isc_dhcpd: allow dynamic-bootp entries

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 8f387cf95c3c85cae7ec730a57ef9727eea3de20 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8f387cf95c3c85… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Feb 19 15:33:16 2018 +0100 5741 FIX isc_dhcpd: allow dynamic-bootp entries Change-Id: I5cd457fe263d8ca91c4ef8b24fe1c8e7575f5eaa --- .werks/5741 | 10 ++++++++++ checks/isc_dhcpd | 2 ++ 2 files changed, 12 insertions(+) diff --git a/.werks/5741 b/.werks/5741 new file mode 100644 index 0000000..1338f4c --- /dev/null +++ b/.werks/5741 @@ -0,0 +1,10 @@ +Title: isc_dhcpd: allow dynamic-bootp entries +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519050737 +Class: fix + + diff --git a/checks/isc_dhcpd b/checks/isc_dhcpd index 06f8f60..c6c95e8 100644 --- a/checks/isc_dhcpd +++ b/checks/isc_dhcpd @@ -75,6 +75,8 @@ def parse_isc_dhcpd(info): parsed["pids"] = map(int, line[1:]) elif mode == "pools": + if 'bootp' in line[0]: + line = line[1:] start, end = line[0], line[1] item = "%s-%s" % (start, end) parsed["pools"][item] = (ip_to_number(start), ip_to_number(end))

6 years, 7 months

Minor refactoring: Cleanup host/folder attribute transformations

by Lars Michelsen

Module: check_mk Branch: master Commit: 4ba68f2648db907a95fe99d826d8b3fd33ee5edb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=4ba68f2648db90… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:34:10 2018 +0100 Minor refactoring: Cleanup host/folder attribute transformations Change-Id: I687ae606c20c55e668eca48f63c9dd9eada771b9 --- web/htdocs/watolib.py | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index a1ed619..f6c8845 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1279,11 +1279,7 @@ class CREFolder(BaseFolder): if host_name in variables["host_attributes"]: attributes = variables["host_attributes"][host_name] - attributes = self._transform_old_agent_type_in_attributes(attributes) - - # Old WATO was saving "site" attribute with value of None. Skip this key. - if "site" in attributes and attributes["site"] == None: - del attributes["site"] + attributes = self._transform_old_attributes(attributes) else: host_tags = self._transform_old_agent_type_in_tag_list(host_tags) @@ -1333,6 +1329,13 @@ class CREFolder(BaseFolder): return host_tags + def _transform_old_attributes(self, attributes): + """Mangle all attribute structures read from the disk to prepare it for the current logic""" + attributes = self._transform_old_agent_type_in_attributes(attributes) + attributes = self._transform_none_value_site_attribute(attributes) + return attributes + + # Old tag group trans: #('agent', u'Agent type', # [ @@ -1375,6 +1378,13 @@ class CREFolder(BaseFolder): return attributes + def _transform_none_value_site_attribute(self, attributes): + # Old WATO was saving "site" attribute with value of None. Skip this key. + if "site" in attributes and attributes["site"] == None: + del attributes["site"] + return attributes + + def _load_hosts_file(self): variables = { "FOLDER_PATH" : "", @@ -1582,7 +1592,7 @@ class CREFolder(BaseFolder): def _load(self): wato_info = self._load_wato_info() self._title = wato_info.get("title", self._fallback_title()) - self._attributes = self._transform_old_agent_type_in_attributes(wato_info.get("attributes", {})) + self._attributes = self._transform_old_attributes(wato_info.get("attributes", {})) self._locked = wato_info.get("lock", False) self._locked_subfolders = wato_info.get("lock_subfolders", False)

6 years, 7 months

5849 FIX Fixed visibility of "Data sources" properties when editing folders

by Lars Michelsen

Module: check_mk Branch: master Commit: 2e57e0748b00ff68c8c565ecb564b8825d97d7c2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2e57e0748b00ff… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:26:36 2018 +0100 5849 FIX Fixed visibility of "Data sources" properties when editing folders Werk #5535 introduced a new way the data sources (agent, snmp, ...) of hosts are configured. The new attributes were not editable in WATO folders at all. Change-Id: I2ebab9f534d3e20d44b994bac0a4b6a90935236d --- .werks/5849 | 11 +++++++++++ web/htdocs/wato.py | 5 ++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/5849 b/.werks/5849 new file mode 100644 index 0000000..ee39c13 --- /dev/null +++ b/.werks/5849 @@ -0,0 +1,11 @@ +Title: Fixed visibility of "Data sources" properties when editing folders +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519046689 +Class: fix + +Werk #5535 introduced a new way the data sources (agent, snmp, ...) of hosts are configured. +The new attributes were not editable in WATO folders at all. diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index ee98de1..2d81fe9 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -17532,7 +17532,10 @@ def configure_attributes(new, hosts, for_what, parent, myself=None, without_attr if depends_on_roles: dependency_mapping_roles[attrname] = depends_on_roles - if not depends_on_tags and not depends_on_roles: + if for_what not in [ "host", "cluster" ]: + topic_is_volatile = False + + elif not depends_on_tags and not depends_on_roles: # One attribute is always shown -> topic is always visible topic_is_volatile = False else:

6 years, 7 months

5848 FIX Fixed broken inheritance of agent type set on folders ( regression in 1.5.0i2)

by Lars Michelsen

Module: check_mk Branch: master Commit: d0d1c2d44684f670433c7f19b54da66f1b676dc2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d0d1c2d44684f6… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 14:00:27 2018 +0100 5848 FIX Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) When the "agent type" property was set on a folder, this setting was not correctly inherited to the hosts. This broke with werk #5535. Change-Id: I0054882c070d4d2758c72395338a0dc9eb6aa081 --- .werks/5848 | 11 +++++++++++ web/htdocs/watolib.py | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/5848 b/.werks/5848 new file mode 100644 index 0000000..b4345d2 --- /dev/null +++ b/.werks/5848 @@ -0,0 +1,11 @@ +Title: Fixed broken inheritance of agent type set on folders (regression in 1.5.0i2) +Level: 1 +Component: wato +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1519045062 +Class: fix + +When the "agent type" property was set on a folder, this setting was not correctly +inherited to the hosts. This broke with werk #5535. diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index f650544..a1ed619 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -1582,7 +1582,7 @@ class CREFolder(BaseFolder): def _load(self): wato_info = self._load_wato_info() self._title = wato_info.get("title", self._fallback_title()) - self._attributes = wato_info.get("attributes", {}) + self._attributes = self._transform_old_agent_type_in_attributes(wato_info.get("attributes", {})) self._locked = wato_info.get("lock", False) self._locked_subfolders = wato_info.get("lock_subfolders", False)

6 years, 7 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: b4dbae471eee7352fd6ce9589db5f6fdee1b1832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b4dbae471eee73… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 13:57:23 2018 +0100 Reserved 20 Werk IDS Change-Id: I38d9eaced25b257f0e10bb73afdd022068e3f4d0 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 58f5100..8029a14 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5848 +5868

6 years, 7 months

Tests: Check version available for download only when not installed yet

by Lars Michelsen

Module: check_mk Branch: master Commit: 6363ca1d0a5d3dad7d8c9c8309f4f36fb62fa54e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6363ca1d0a5d3d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 11:18:12 2018 +0100 Tests: Check version available for download only when not installed yet Change-Id: I6450c8f86b1b77853448c692ad8e7e2606a33ab3 --- tests/testlib/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index d66da37..28966b5 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -179,9 +179,11 @@ class CMKVersion(object): def _version_available(self): + if self.is_installed(): + return True + response = requests.head(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) - available_on_server = response.status_code == 200 - return self.is_installed() or available_on_server + return response.status_code == 200 def install(self):

6 years, 7 months

Add werk 5781

by Andreas Umbreit

Module: check_mk Branch: master Commit: 0553bf2724fa2b6ca6bd4d54a526fafb7e21fd72 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0553bf2724fa2b… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Fri Feb 16 11:38:12 2018 +0100 Add werk 5781 Change-Id: Icec30a45e74fb483a898b0f776156e981019f689 --- .werks/5781 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.werks/5781 b/.werks/5781 new file mode 100644 index 0000000..eb50b78 --- /dev/null +++ b/.werks/5781 @@ -0,0 +1,16 @@ +Title: Check_MK Update Agent: Now automatically repairs missing agent plugins after a failed windows agent update +Level: 2 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1518711069 +Class: fix + +On some occassions, the windows agent may loose its agent plugins during an msi update. +This issue is still being investigated. In the meantime, the cmk-update-agent.exe is now able to detect +a failed installation and tries to repair the missing plugin files. + +Keep in mind that this workaround is only available -after- the next agent update, so the initial rollout +of this update may still fail, since it is done by an earlier version of the agent updater. +

6 years, 7 months

Tests: Load cmk credentials only when needed

by Lars Michelsen

Module: check_mk Branch: master Commit: 422931685737c4829e44ad9068a575fb41322cf0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=422931685737c4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 10:54:19 2018 +0100 Tests: Load cmk credentials only when needed Change-Id: I43b81c8de71fabc05d213f7995ff05fc8660a5ec --- tests/testlib/__init__.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index ec8b382..d66da37 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -78,8 +78,6 @@ class CMKVersion(object): raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition - self._credentials = self._get_cmk_download_credentials() - self.set_version(version, branch) @@ -181,7 +179,7 @@ class CMKVersion(object): def _version_available(self): - response = requests.head(self.package_url(), auth=self._credentials, verify=False) + response = requests.head(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) available_on_server = response.status_code == 200 return self.is_installed() or available_on_server @@ -190,7 +188,7 @@ class CMKVersion(object): temp_package_path = "/tmp/%s" % self.package_name() print(self.package_url()) - response = requests.get(self.package_url(), auth=self._credentials, verify=False) + response = requests.get(self.package_url(), auth=self._get_cmk_download_credentials(), verify=False) if response.status_code != 200: raise Exception("Failed to load package: %s" % self.package_url()) file(temp_package_path, "w").write(response.content)

6 years, 7 months

Use user specific CMK download credentials

by Lars Michelsen

Module: check_mk Branch: master Commit: e9ac5373ec2f968e7af9f5b64b999d186f1d749c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9ac5373ec2f96… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Feb 19 10:44:10 2018 +0100 Use user specific CMK download credentials Change-Id: I5b69b25ed50f636ffdea955076b095b80b01ff34 --- tests/testlib/__init__.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 013fd52..ec8b382 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -78,11 +78,17 @@ class CMKVersion(object): raise Exception("Invalid edition: %s. Must be short notation (cee, cre, ...)") self.edition_short = edition - self._credentials = ("d-vonheute", "lOBFsgAH") + self._credentials = self._get_cmk_download_credentials() self.set_version(version, branch) + def _get_cmk_download_credentials(self): + try: + return tuple(file("%s/.cmk-credentials" % os.environ["HOME"]).read().strip().split(":")) + except IOError: + raise Exception("Missing ~/.cmk-credentials file (Create with content: USER:PASSWORD)") + def get_default_version(self): if os.path.exists("/etc/alternatives/omd"):

6 years, 7 months

← Newer
1
...
13
14
15
16
17
18
19
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2018