Checkmk git commits March 2018

checkmk-commits@lists.checkmk.com

10 participants
326 discussions

Fixed recently damaged "empty folder" menu

by Lars Michelsen

Module: check_mk Branch: master Commit: 81cadb706bcd520b32b3967e71c28dae1207ef21 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=81cadb706bcd52… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Mar 7 07:02:58 2018 +0100 Fixed recently damaged "empty folder" menu Change-Id: Id369d2c88e1b426b0f9ce6df02c9e03614d661a2 --- web/htdocs/wato.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 515326e..3fb5faa 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -649,15 +649,15 @@ class ModeFolder(WatoMode): if not self._folder.locked_hosts(): menu_items.extend([ - ("newhost", _("Create new host"), "new", "hosts", + MenuItem("newhost", _("Create new host"), "new", "hosts", _("Add a new host to the monitoring (agent must be installed)")), - ("newcluster", _("Create new cluster"), "new_cluster", "hosts", + MenuItem("newcluster", _("Create new cluster"), "new_cluster", "hosts", _("Use Check_MK clusters if an item can move from one host " "to another at runtime"))]) if not self._folder.locked_subfolders(): menu_items.extend([ - ("newfolder", _("Create new folder"), "newfolder", "hosts", + MenuItem("newfolder", _("Create new folder"), "newfolder", "hosts", _("Folders group your hosts, can inherit attributes and can have permissions.")) ]) @@ -12050,9 +12050,9 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): def page(self): if not self._hosttags + self._auxtags: MainMenu([ - ("edit_hosttag", _("Create new tag group"), "new", "hosttags", + MenuItem("edit_hosttag", _("Create new tag group"), "new", "hosttags", _("Each host tag group will create one dropdown choice in the host configuration.")), - ("edit_auxtag", _("Create new auxiliary tag"), "new", "hosttags", + MenuItem("edit_auxtag", _("Create new auxiliary tag"), "new", "hosttags", _("You can have these tags automatically added if certain primary tags are set.")), ]).show()

6 years, 3 months

Win-agent: remove unused variable

by Jukka Aro

Module: check_mk Branch: master Commit: 37ca804b4010b29829e03a46b1b74b9c042d1192 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=37ca804b4010b2… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Wed Mar 7 08:07:45 2018 +0100 Win-agent: remove unused variable --- agents/windows/build_version | 2 +- agents/windows/stringutil.cc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/agents/windows/build_version b/agents/windows/build_version index 2caf624..3374bc7 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3154 +3156 diff --git a/agents/windows/stringutil.cc b/agents/windows/stringutil.cc index d4b00fd..5ca3729 100644 --- a/agents/windows/stringutil.cc +++ b/agents/windows/stringutil.cc @@ -319,7 +319,6 @@ OptionalString matchIPv6Mapped(const std::string &inputAddr) { std::smatch match; if (std::regex_match(inputAddr, match, ipv6mapped) && match.size() >= 2) { - std::smatch subMatch; for (const auto &m : match) { const auto subString{m.str()}; if (const auto subMatch = matchBase(subString, ipv4)) {

6 years, 3 months

5909 FIX fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places

by Marcel Arentz

Module: check_mk Branch: master Commit: fbd9ab0690257e08812350135c02ed0d6a01547d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=fbd9ab0690257e… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Mar 6 18:11:27 2018 +0100 5909 FIX fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places Fortigate changed obviously the location of information for cpu utilization and sessions in the past. We support these by using two different check plugins. With this fix the service discovery does not create duplicated services anymore if both paths are present on the device. Instead the newer path will be preferred. Change-Id: I2c4bd51e629c47e14988ba6d4e8d83870b90d64f --- .werks/5909 | 14 ++++++++++++++ checks/fortigate_cpu | 3 ++- checks/fortigate_sessions | 3 ++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.werks/5909 b/.werks/5909 new file mode 100644 index 0000000..ff63039 --- /dev/null +++ b/.werks/5909 @@ -0,0 +1,14 @@ +Title: fortigate_sessions, fortigate_cpu: Fixed duplicated discovery if needed information is at two places +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i4 +Date: 1520356129 +Class: fix + +Fortigate changed obviously the location of information for cpu utilization +and sessions in the past. We support these by using two different check +plugins. With this fix the service discovery does not create duplicated +services anymore if both paths are present on the device. Instead the newer +path will be preferred. diff --git a/checks/fortigate_cpu b/checks/fortigate_cpu index 5409495..23e403f 100644 --- a/checks/fortigate_cpu +++ b/checks/fortigate_cpu @@ -36,7 +36,8 @@ check_info["fortigate_cpu"] = { "group" : "cpu_utilization", # uses mib FORTINET-MIB-280 "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and \ - oid(".1.3.6.1.4.1.12356.1.8.0"), + oid(".1.3.6.1.4.1.12356.1.8.0") and \ + not oid(".1.3.6.1.4.1.12356.101.4.1.3.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 8 ]), "includes" : [ "cpu_util.include", "fortigate_cpu.include" ], } diff --git a/checks/fortigate_sessions b/checks/fortigate_sessions index 6526fb2..c1ff4d3 100644 --- a/checks/fortigate_sessions +++ b/checks/fortigate_sessions @@ -47,7 +47,8 @@ check_info["fortigate_sessions"] = { "has_perfdata" : True, # uses mib FORTINET-MIB-280 "snmp_scan_function" : lambda oid: ".1.3.6.1.4.1.12356.101.1" in oid(".1.3.6.1.2.1.1.2.0") and\ - oid(".1.3.6.1.4.1.12356.1.10.0"), + oid(".1.3.6.1.4.1.12356.1.10.0") and \ + not oid(".1.3.6.1.4.1.12356.101.4.1.8.0"), "snmp_info" : ( ".1.3.6.1.4.1.12356.1", [ 10 ]), "includes" : ["fortigate_sessions.include"], }

6 years, 4 months

Reserved 10 Werk IDS

by Marcel Arentz

Module: check_mk Branch: master Commit: 106e0550983d61392a7e363c1c414a49e3aa95c6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=106e0550983d61… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Tue Mar 6 18:08:45 2018 +0100 Reserved 10 Werk IDS Change-Id: Iae42b18bf3c2f71ab4043322ab802b70186b3c8f --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 2034c59..54ad6c4 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5909 +5919

6 years, 4 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 3ee8c4163c12dc4c69de8ab247092dc62f2a3a84 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3ee8c4163c12dc… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 17:03:41 2018 +0100 Reserved 20 Werk IDS Change-Id: Ie4fbd973a3288abc1cdec941bf581c33c0a1de8a --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 8c4b9d8..2034c59 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -5889 +5909

6 years, 4 months

5889 FIX Fixed visible HTML tag in WATO folder permission error message

by Lars Michelsen

Module: check_mk Branch: master Commit: 3aada191fb9a62199c952bbbccbfadb9be20d369 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3aada191fb9a62… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 17:06:56 2018 +0100 5889 FIX Fixed visible HTML tag in WATO folder permission error message Change-Id: Ifdb5c13d31a7504ab1a2c6df96ab6abc498ddee5 --- .werks/5889 | 11 +++++++++++ web/htdocs/wato.py | 4 ++-- web/htdocs/watolib.py | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.werks/5889 b/.werks/5889 new file mode 100644 index 0000000..63edbc7 --- /dev/null +++ b/.werks/5889 @@ -0,0 +1,11 @@ +Title: Fixed visible HTML tag in WATO folder permission error message +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520352233 + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index cb2425e..515326e 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -629,8 +629,8 @@ class ModeFolder(WatoMode): self._folder.show_breadcrump() if not self._folder.may("read"): - html.message(html.render_img("images/icon_autherr.png", class_="authicon") - + " " + self._folder.reason_why_may_not("read")) + html.message(html.render_icon("autherr", cssclass="authicon") + + " " + self._folder.reason_why_may_not("read")) self._folder.show_locking_information() self._show_subfolders_of() diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index 4d2b423..5d7311a 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -802,7 +802,7 @@ class WithPermissions(object): self.user_needs_permission(user_id, how) return False except MKAuthException, e: - return "%s" % e + return HTML("%s" % e)

6 years, 4 months

wato module registering now supports sorting

by Lars Michelsen

Module: check_mk Branch: master Commit: 8d921d20276451a655e937effc66d9767d3e643a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8d921d20276451… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 15:36:21 2018 +0100 wato module registering now supports sorting changed the following other things: * registering of new modules is now done using the new register_modules() function * the modules are now represented by watomodule() instances instead of tuples * the modules now have a new optional field: sort_index to define the sort order. modules without explicit sort_index default to 100. modules with equal sort_index will be sorted by their title. * added missing "menus" to host- and servicegroup pages when no group defined yet Change-Id: Id1dd3ef8b88635b0c18b0f83df73be2162c51c62 --- web/htdocs/wato.py | 128 +++++++++++++++++++++++++++--------- web/htdocs/watolib.py | 4 +- web/plugins/sidebar/wato.py | 19 +++--- web/plugins/wato/background_job.py | 12 ++-- web/plugins/wato/bi.py | 11 +++- web/plugins/wato/builtin_modules.py | 85 ++++++++++++------------ web/plugins/wato/mkeventd.py | 6 +- 7 files changed, 169 insertions(+), 96 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8d921d2027…

6 years, 4 months

Add quick lock hint for locking

by Lars Michelsen

Module: check_mk Branch: master Commit: b2246e288c8626475b76d04c7cab83c89c693d9f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b2246e288c8626… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 6 14:02:08 2018 +0100 Add quick lock hint for locking Change-Id: I7b9aee665b0065eac7660953869ad5f536d4163c --- tests/testlib/__init__.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/testlib/__init__.py b/tests/testlib/__init__.py index 556749c..560e6a0 100644 --- a/tests/testlib/__init__.py +++ b/tests/testlib/__init__.py @@ -203,7 +203,9 @@ class CMKVersion(object): time.sleep(1) # Improve the protection against other test runs installing packages - with lockfile.FileLock("/tmp/cmk-test-install-version.lock"): + print("Getting install file lock (/tmp/cmk-test-install-version.lock)...") + with lockfile.FileLock("/tmp/cmk-test-install-version"): + print("Have install file lock") cmd = "sudo /usr/bin/gdebi --non-interactive %s" % temp_package_path print(cmd) sys.stdout.flush() @@ -441,7 +443,10 @@ class Site(object): raise Exception("The site %s already exists." % self.id) if not self.exists(): - with lockfile.FileLock("/tmp/cmk-test-create-site.lock"): + print("Getting site create lock (/tmp/cmk-test-create-site.lock)...") + with lockfile.FileLock("/tmp/cmk-test-create-site"): + print("Have site create lock") + print("[%0.2f] Creating site '%s'" % (time.time(), self.id)) p = subprocess.Popen(["/usr/bin/sudo", "/usr/bin/omd", "-V", self.version.version_directory(),

6 years, 4 months

5712 FIX cisco_mem, cisco_mem_asa, cisco_mem_asa64: No longer crash when total memory is reported as 0.

by Konstantin Büttner

Module: check_mk Branch: master Commit: cc5dc797b9fb951308cd0b417f70d89983c84c33 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc5dc797b9fb95… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Mar 6 13:34:15 2018 +0100 5712 FIX cisco_mem, cisco_mem_asa, cisco_mem_asa64: No longer crash when total memory is reported as 0. The state in case of 0 total memory is still UNKNOWN, but the error message is more helpful. Change-Id: Iacb4711a441eb66bf6fad8c101902c900746a68c --- .werks/5712 | 11 +++++++++++ checks/cisco_mem.include | 7 ++++--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.werks/5712 b/.werks/5712 new file mode 100644 index 0000000..9d2b3a4 --- /dev/null +++ b/.werks/5712 @@ -0,0 +1,11 @@ +Title: cisco_mem, cisco_mem_asa, cisco_mem_asa64: No longer crash when total memory is reported as 0. +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.5.0i4 +Date: 1520339353 + +The state in case of 0 total memory is still UNKNOWN, but the error message is more helpful. diff --git a/checks/cisco_mem.include b/checks/cisco_mem.include index f99f9f4..e75351a 100644 --- a/checks/cisco_mem.include +++ b/checks/cisco_mem.include @@ -47,21 +47,22 @@ def inventory_cisco_mem(info): def check_cisco_mem(item, params, info): for line in info: + if line[0] != item: continue if type(params) == tuple: params = {"levels": params} - mem_free = saveint(line[2]) - mem_used = saveint(line[1]) + mem_free = int(line[2]) + mem_used = int(line[1]) mem_total = mem_free + mem_used return check_cisco_mem_sub(item, params, mem_used, mem_total) def check_cisco_mem_sub(item, params, mem_used, mem_total): if not mem_total: - return 2, "total memory not available", [] + return 3, "Cannot calculate memory usage: Device reports total memory 0" perc_used = 100.0 * (float(mem_used) / float(mem_total)) warn, crit = params["levels"]

6 years, 4 months

Update for WK5783. Fixed missing job permissions

by Andreas Boesl

Module: check_mk Branch: master Commit: 877ec30acea1e683948188004821c06e579c3d9a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=877ec30acea1e6… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Mar 6 12:55:22 2018 +0100 Update for WK5783. Fixed missing job permissions Change-Id: I23946360898c1e61d8a8e420c98133f5fd71c60b --- web/plugins/pages/shipped.py | 1 + 1 file changed, 1 insertion(+) diff --git a/web/plugins/pages/shipped.py b/web/plugins/pages/shipped.py index 7ad93f1..5d1d09c 100644 --- a/web/plugins/pages/shipped.py +++ b/web/plugins/pages/shipped.py @@ -46,6 +46,7 @@ import werks import inventory import notifications import valuespec +import gui_background_job # map URLs to page rendering functions register_handlers({

6 years, 4 months

← Newer
1
...
21
22
23
24
25
26
27
...
33
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2018