Checkmk git commits February 2017

checkmk-commits@lists.checkmk.com

10 participants
452 discussions

by Simon Betz

Module: check_mk Branch: master Commit: f0a2f579543a5d216edc679f798c354daf2602db URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0a2f579543a5d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Feb 7 13:45:54 2017 +0100 Reverted 4338 Change-Id: I4520165e3c8ffabee65409c91e7c3b2d68919826 --- .werks/4338 | 10 ---------- ChangeLog | 1 - checkman/aix_hacmp_resources | 4 ++-- checks/aix_hacmp_resources | 17 ++++++++--------- 4 files changed, 10 insertions(+), 22 deletions(-) diff --git a/.werks/4338 b/.werks/4338 deleted file mode 100644 index 810e50d..0000000 --- a/.werks/4338 +++ /dev/null @@ -1,10 +0,0 @@ -Title: aix_hacmp_resources: fixed state handling -Level: 1 -Component: checks -Class: fix -Compatible: compat -State: unknown -Version: 1.4.0i4 -Date: 1486379960 - - diff --git a/ChangeLog b/ChangeLog index 6615622..e0f6eb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -93,7 +93,6 @@ * 4335 FIX: perle check and inventory plugins: some updates and improvements... NOTE: Please refer to the migration notes! * 4123 FIX: active check check_sql: changed handling of query results and fixed hostname parameter... - * 4338 FIX: aix_hacmp_resources: fixed state handling * 4325 FIX: check_cpu_peaks: Make the check working with current Check_MK APi * 4339 FIX: fixed AtrributeError in oracle sessions ruleset diff --git a/checkman/aix_hacmp_resources b/checkman/aix_hacmp_resources index bb9baab..8f97aba 100644 --- a/checkman/aix_hacmp_resources +++ b/checkman/aix_hacmp_resources @@ -6,8 +6,8 @@ distribution: check_mk description: This check monitors the resource group states on different nodes of AIX HACMP cluster manager. - The status will be OK, if at least one status is 'online'. The status changes to CRIT if - one status reports 'error'. Otherwise it will be WARN. + The status will be OK, if the first node reports 'online'. Otherwise + the status changes to CRIT. This check needs the check_mk_agent.aix agent. diff --git a/checks/aix_hacmp_resources b/checks/aix_hacmp_resources index 34fc1d4..f91495a 100644 --- a/checks/aix_hacmp_resources +++ b/checks/aix_hacmp_resources @@ -56,19 +56,18 @@ def inventory_aix_hacmp_resources(parsed): def check_aix_hacmp_resources(item, params, parsed): if item in parsed: resource_stats = [] - infotexts = [] + infotext = "" for node_name, resource_status in parsed[item]: resource_stats.append(resource_status) - infotexts.append("%s on node %s" % \ - (resource_status, node_name)) - if "online" in resource_stats: - state = 0 - elif "error" in resource_stats: + infotext += "%s on node %s, " % (resource_status, node_name) + + # The first node is always online in an OK scenario + # Something is wrong if an other node is online + state = 0 + if resource_stats[0] != "online": state = 2 - else: - state = 1 - return state, "Status: %s" % ", ".join(infotexts) + return state, infotext[:-2] check_info['aix_hacmp_resources'] = {

7 years, 7 months

4021 windows agent: improved error message in logfile when a specified winperf counter id could not get resolved

by Andreas Boesl

Module: check_mk Branch: master Commit: c1d8099229e056c3719afb8f085e4e7ac5bae200 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c1d8099229e056… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Feb 7 13:22:03 2017 +0100 4021 windows agent: improved error message in logfile when a specified winperf counter id could not get resolved Change-Id: Ib559beebffa12a425c4391d8afcf3a9ee325749f --- .werks/4021 | 9 +++++++++ ChangeLog | 1 + agents/windows/PerfCounter.cc | 6 +++++- agents/windows/build_version | 2 +- agents/windows/check_mk_agent-64.exe | Bin 1328640 -> 1329152 bytes agents/windows/check_mk_agent-64.unstripped.exe | Bin 15652368 -> 15658018 bytes agents/windows/check_mk_agent-64.unversioned.exe | Bin 1328640 -> 1329152 bytes agents/windows/check_mk_agent.exe | Bin 1305088 -> 1305600 bytes agents/windows/check_mk_agent.msi | Bin 2903552 -> 2904576 bytes agents/windows/check_mk_agent.unstripped.exe | Bin 13543976 -> 13549114 bytes agents/windows/check_mk_agent.unversioned.exe | Bin 1305088 -> 1305600 bytes agents/windows/install_agent-64.exe | Bin 586639 -> 586830 bytes agents/windows/install_agent.exe | Bin 583691 -> 583901 bytes 13 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.werks/4021 b/.werks/4021 new file mode 100644 index 0000000..6d481d3 --- /dev/null +++ b/.werks/4021 @@ -0,0 +1,9 @@ +Title: windows agent: improved error message in logfile when a specified winperf counter id could not get resolved +Level: 1 +Component: checks +Compatible: compat +Version: 1.4.0i4 +Date: 1486470085 +Class: feature + + diff --git a/ChangeLog b/ChangeLog index fb9d39f..6615622 100644 --- a/ChangeLog +++ b/ChangeLog @@ -26,6 +26,7 @@ * 4336 diskstat: now detects NVMe drives, eg. solid-state drives * 4019 Windows powershell scripts are now always called with the options -noprofile -executionpolicy bypass... * 4020 windows/megaraid.bat: now also provides information for the megaraid_bbu check (Battery Backup Unit) + * 4021 windows agent: improved error message in logfile when a specified winperf counter id could not get resolved * 4171 FIX: perle_psmu: fixed value error... * 4172 FIX: smart.temp: fixed discovery and check function... * 4173 FIX: if.include: ignore some more keys in 'Network interfaces and switch ports' rule which are only used for interface grouping diff --git a/agents/windows/PerfCounter.cc b/agents/windows/PerfCounter.cc index 3eb3a50..398c244 100644 --- a/agents/windows/PerfCounter.cc +++ b/agents/windows/PerfCounter.cc @@ -205,8 +205,12 @@ PerfCounterObject::PerfCounterObject(unsigned int counter_base_number) _buffer = retrieveCounterData(std::to_wstring(counter_base_number).c_str()); _object = findObject(counter_base_number); + + std::ostringstream stringStream; + stringStream << "counter id not found: " << counter_base_number; + if (_object == NULL) { - throw std::runtime_error("counter id not found"); + throw std::runtime_error(stringStream.str()); } if (_object->NumInstances <= 0) { diff --git a/agents/windows/build_version b/agents/windows/build_version index 6357d64..166c7ce 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -2522 +2539 diff --git a/agents/windows/check_mk_agent-64.exe b/agents/windows/check_mk_agent-64.exe index aadbe3e..adb5363 100755 Binary files a/agents/windows/check_mk_agent-64.exe and b/agents/windows/check_mk_agent-64.exe differ diff --git a/agents/windows/check_mk_agent-64.unstripped.exe b/agents/windows/check_mk_agent-64.unstripped.exe index fead502..f1b99ec 100755 Binary files a/agents/windows/check_mk_agent-64.unstripped.exe and b/agents/windows/check_mk_agent-64.unstripped.exe differ diff --git a/agents/windows/check_mk_agent-64.unversioned.exe b/agents/windows/check_mk_agent-64.unversioned.exe index 599cfa7..881e4a6 100755 Binary files a/agents/windows/check_mk_agent-64.unversioned.exe and b/agents/windows/check_mk_agent-64.unversioned.exe differ diff --git a/agents/windows/check_mk_agent.exe b/agents/windows/check_mk_agent.exe index bb27778..2aab3ac 100755 Binary files a/agents/windows/check_mk_agent.exe and b/agents/windows/check_mk_agent.exe differ diff --git a/agents/windows/check_mk_agent.msi b/agents/windows/check_mk_agent.msi index 8cb6c97..7f9de40 100755 Binary files a/agents/windows/check_mk_agent.msi and b/agents/windows/check_mk_agent.msi differ diff --git a/agents/windows/check_mk_agent.unstripped.exe b/agents/windows/check_mk_agent.unstripped.exe index 6a56d88..27c88b2 100755 Binary files a/agents/windows/check_mk_agent.unstripped.exe and b/agents/windows/check_mk_agent.unstripped.exe differ diff --git a/agents/windows/check_mk_agent.unversioned.exe b/agents/windows/check_mk_agent.unversioned.exe index 3c80bab..5ffebcf 100755 Binary files a/agents/windows/check_mk_agent.unversioned.exe and b/agents/windows/check_mk_agent.unversioned.exe differ diff --git a/agents/windows/install_agent-64.exe b/agents/windows/install_agent-64.exe index 44c648b..a5a7431 100755 Binary files a/agents/windows/install_agent-64.exe and b/agents/windows/install_agent-64.exe differ diff --git a/agents/windows/install_agent.exe b/agents/windows/install_agent.exe index 714e77f..b551fe0 100755 Binary files a/agents/windows/install_agent.exe and b/agents/windows/install_agent.exe differ

7 years, 7 months

Unbreak documentation target. Simplification.

by Sven Panne

Module: check_mk Branch: master Commit: 453b65c3ced21224068539496bc6e3a43950f4fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=453b65c3ced212… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 7 13:18:10 2017 +0100 Unbreak documentation target. Simplification. Change-Id: I00d58da173cfcaff9325fb15e5b5cb98d4b495ca --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a8eb10e..f9f6aeb 100644 --- a/Makefile +++ b/Makefile @@ -421,8 +421,8 @@ compile_commands.json: config.h $(FILES_TO_FORMAT) $(MAKE) -C livestatus clean $(BEAR) $(MAKE) -C livestatus -j8 ifeq ($(ENTERPRISE),yes) - test -d enterprise && $(MAKE) -C enterprise/core clean - test -d enterprise && $(BEAR) --append $(MAKE) -C enterprise/core -j8 + $(MAKE) -C enterprise/core clean + $(BEAR) --append $(MAKE) -C enterprise/core -j8 endif tidy: compile_commands.json @@ -461,3 +461,6 @@ format: # Note: You need the doxygen and graphviz packages. documentation: config.h $(DOXYGEN) doc/Doxyfile +ifeq ($(ENTERPRISE),yes) + cd enterprise && $(DOXYGEN) doc/Doxyfile +endif

7 years, 7 months

4327 FIX Allowing dollar sign in mail addresses now

by Lars Michelsen

Module: check_mk Branch: master Commit: 87854fb79a51f4d94a62250c9d395426235c07ed URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=87854fb79a51f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 12:47:13 2017 +0100 4327 FIX Allowing dollar sign in mail addresses now Change-Id: I410d89157bf15f58d2ee04e99ac83ff1c9771800 --- .werks/4327 | 9 +++++++++ ChangeLog | 1 + web/htdocs/valuespec.py | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.werks/4327 b/.werks/4327 new file mode 100644 index 0000000..4b6c0b3 --- /dev/null +++ b/.werks/4327 @@ -0,0 +1,9 @@ +Title: Allowing dollar sign in mail addresses now +Level: 1 +Component: wato +Compatible: compat +Version: 1.4.0i4 +Date: 1486467997 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d724b13..fb9d39f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -139,6 +139,7 @@ * 4318 FIX: Rule editor: Fixed wrong default value for yes/no rulesets * 4323 FIX: Fixed wrong %s in notification rule title deletion confirm dialog * 4324 FIX: Fixed possible exception when saving user with special characters in user name + * 4327 FIX: Allowing dollar sign in mail addresses now Notifications: * 4197 FIX: Fix sending notification to global fallback email address diff --git a/web/htdocs/valuespec.py b/web/htdocs/valuespec.py index 3b770d3..0651bc3 100644 --- a/web/htdocs/valuespec.py +++ b/web/htdocs/valuespec.py @@ -663,7 +663,7 @@ class EmailAddressUnicode(TextUnicode, EmailAddress): def __init__(self, **kwargs): TextUnicode.__init__(self, **kwargs) EmailAddress.__init__(self, **kwargs) - self._regex = re.compile(r'^[\w._%+-]+(a)(localhost|[\w.-]+\.[\w]{2,24})$', re.I | re.UNICODE) + self._regex = re.compile(r'^[$\w._%+-]+(a)(localhost|[\w.-]+\.[\w]{2,24})$', re.I | re.UNICODE) def validate_value(self, value, varprefix): TextUnicode.validate_value(self, value, varprefix)

7 years, 7 months

Fixed linter issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 0bec8fb71b82ec54f6e815c226b56d1f09cc35f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0bec8fb71b82ec… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 11:55:19 2017 +0100 Fixed linter issues Change-Id: I6e26dff45ed3ab17e3a73b08cc17ff8d4e5336fe --- bin/mkbench | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/mkbench b/bin/mkbench index 876280c..26160e4 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -1106,8 +1106,9 @@ class Measurement(object): def set_value(self, k, val): """Set an attribute of the measurement. Cares about converting tuples to the correct namedtuples.""" - from psutil._common import sdiskusage - from psutil._pslinux import svmem, sdiskio + # TODO: Remove the disablings below once the builds ship these modules + from psutil._common import sdiskusage # pylint: disable=import-error + from psutil._pslinux import svmem, sdiskio # pylint: disable=import-error if k == "memory": val = svmem(*val)

7 years, 7 months

Fixed linter issues

by Lars Michelsen

Module: check_mk Branch: master Commit: c18d6cd928244a02ea3c16191d209bcbb3ff53f7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c18d6cd928244a… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 11:55:19 2017 +0100 Fixed linter issues Change-Id: I6e26dff45ed3ab17e3a73b08cc17ff8d4e5336fe --- bin/mkbench | 5 +++-- cmk_base/cee | 2 +- tests/pylint/test_pylint_checks.py | 2 +- tests/testlib/pylint_cmk.py | 2 +- web/plugins/wato/mkeventd.py | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/bin/mkbench b/bin/mkbench index e2e371b..876280c 100755 --- a/bin/mkbench +++ b/bin/mkbench @@ -71,8 +71,9 @@ import traceback import logging import multiprocessing -import psutil -import npyscreen +# TODO: Remove the disablings below once the builds ship these modules +import psutil # pylint: disable=import-error +import npyscreen # pylint: disable=import-error from collections import namedtuple diff --git a/cmk_base/cee b/cmk_base/cee index 8c843cc..bcc1fe3 120000 --- a/cmk_base/cee +++ b/cmk_base/cee @@ -1 +1 @@ -../../cmc/cmk_base/cee \ No newline at end of file +../enterprise/cmk_base/cee \ No newline at end of file diff --git a/tests/pylint/test_pylint_checks.py b/tests/pylint/test_pylint_checks.py index 43ad6b0..c4ab1d8 100755 --- a/tests/pylint/test_pylint_checks.py +++ b/tests/pylint/test_pylint_checks.py @@ -5,7 +5,7 @@ import os import sys import pytest -from testlib import repo_path +from testlib import repo_path, cmc_path import testlib.pylint_cmk as pylint_cmk # Mark all tests in this file to be pylint checks diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index 14168aa..7ad92bb 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -11,7 +11,7 @@ import tempfile from pylint.reporters.text import ColorizedTextReporter, ParseableTextReporter from pylint.utils import Message -from testlib import repo_path +from testlib import repo_path, cmk_path, cmc_path def ordered_module_files(): diff --git a/web/plugins/wato/mkeventd.py b/web/plugins/wato/mkeventd.py index 983d0d8..4d2ee18 100644 --- a/web/plugins/wato/mkeventd.py +++ b/web/plugins/wato/mkeventd.py @@ -1764,7 +1764,7 @@ def mode_mkeventd_config(phase): msg = _("Changed Configuration variable %s to %s.") % (varname, current_settings[varname] and _("on") or _("off")) - save_configuration_settings(current_settings) + save_global_settings(current_settings) add_ec_change("edit-configvar", msg)

7 years, 7 months

Fixed cmc Makefile

by Sven Panne

Module: check_mk Branch: master Commit: c30629f5ad9bf658bb5ceb8dc930bd936b3fa085 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c30629f5ad9bf6… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Feb 7 11:58:56 2017 +0100 Fixed cmc Makefile Change-Id: I3ebddc6b9771e47f2e8aec35cc4675a98ba3ce18 --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ace4a12..a8eb10e 100644 --- a/Makefile +++ b/Makefile @@ -237,7 +237,8 @@ cmc-$(VERSION).tar.gz: config.h enterprise \ livestatus \ m4 | tar xf - -C cmc-$(VERSION) - cd cmc-$(VERSION) && mv enterprise/skel enterprise/skel.permissions . + mv cmc-$(VERSION)/enterprise/skel{,.permissions} cmc-$(VERSION) + sed -i '1 i\include ../../Makefile.omd' cmc-$(VERSION)/Makefile cd cmc-$(VERSION) && tar czf ../cmc-$(VERSION).tar.gz $(TAROPTS) .bugs * rm -rf cmc-$(VERSION)

7 years, 7 months

4049 FIX Fixed cut-off of bulk options when row-limit is reached.

by Roland Halbig

Module: check_mk Branch: master Commit: dfd0a0c27789f34c34f1ae0c4c1ec5b3bff930a1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfd0a0c27789f3… Author: Roland Halbig <rh(a)mathias-kettner.de> Date: Tue Feb 7 11:37:32 2017 +0100 4049 FIX Fixed cut-off of bulk options when row-limit is reached. Change-Id: I16c3c6fadb1160586eade1e7f5296993af8c7714 --- .werks/4049 | 9 +++++++++ ChangeLog | 1 + web/htdocs/table.py | 3 ++- 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/4049 b/.werks/4049 new file mode 100644 index 0000000..a4b7be6 --- /dev/null +++ b/.werks/4049 @@ -0,0 +1,9 @@ +Title: Fixed cut-off of bulk options when row-limit is reached. +Level: 1 +Component: multisite +Compatible: compat +Version: 1.4.0i4 +Date: 1486463810 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index d420aee..d724b13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,7 @@ * 4316 FIX: Views: Fixed editing of "hide from sidebar" and "show context button" options * 4321 FIX: LDAP: Improved validation of groups to attributes sync plugin * 4048 FIX: Fixed bug in tables: the notification message for reached row limits is visible again + * 4049 FIX: Fixed cut-off of bulk options when row-limit is reached. WATO: * 4142 New extended search dialog for rulesets and rules... diff --git a/web/htdocs/table.py b/web/htdocs/table.py index 4f5184d..175e311 100644 --- a/web/htdocs/table.py +++ b/web/htdocs/table.py @@ -177,7 +177,8 @@ def end(): num_rows_unlimited = len(rows) limit = table['limit'] if limit is not None: - rows = rows[:limit] + # only use rows up to the limit plus the fixed rows + rows = [ rows[i] for i in range(num_rows_unlimited) if i < limit or rows[i][3]] # Render header _write_table(table, rows, actions_enabled, actions_visible, search_term)

7 years, 7 months

pylint tests: Fixed paths to enterprise components

by Lars Michelsen

Module: check_mk Branch: master Commit: 17be797e10473765f8448d760df00368c39c8f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=17be797e104737… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 11:21:39 2017 +0100 pylint tests: Fixed paths to enterprise components Change-Id: I6d7a35537dd877697efc32b6aef3fcea00f9e32f --- tests/pylint/test_pylint_checks.py | 3 +-- tests/pylint/test_pylint_misc.py | 25 +++++++++++------------ tests/testlib/pylint_cmk.py | 41 +++++++++++++++++++------------------- 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/tests/pylint/test_pylint_checks.py b/tests/pylint/test_pylint_checks.py index 4bd3238..43ad6b0 100755 --- a/tests/pylint/test_pylint_checks.py +++ b/tests/pylint/test_pylint_checks.py @@ -29,8 +29,7 @@ def test_pylint_checks(): pylint_cmk.add_file(f, path) # Also add bakery plugins - for path in pylint_cmk.check_files(os.path.realpath(repo_path() - + "/../cmc/agents/bakery")): + for path in pylint_cmk.check_files(cmc_path() + "/agents/bakery"): pylint_cmk.add_file(f, path) f.close() diff --git a/tests/pylint/test_pylint_misc.py b/tests/pylint/test_pylint_misc.py index 317e8ef..de6fd4e 100755 --- a/tests/pylint/test_pylint_misc.py +++ b/tests/pylint/test_pylint_misc.py @@ -5,7 +5,7 @@ import os import sys import pytest -from testlib import repo_path +from testlib import cmk_path, cmc_path import testlib.pylint_cmk as pylint_cmk # Mark all tests in this file to be pylint checks @@ -13,21 +13,20 @@ pytestmark = pytest.mark.pylint def test_pylint_misc(): search_paths = [ - "cmk_base", - "../cmc/cmk_base", - "lib", - "bin", - "notifications", - "agents/plugins", - "active_checks", - "../cmc/agents/plugins", - "../cmc/bin", - "../cmc/misc", + cmk_path() + "/cmk_base", + cmc_path() + "/cmk_base", + cmk_path() + "/lib", + cmk_path() + "/bin", + cmk_path() + "/notifications", + cmk_path() + "/agents/plugins", + cmk_path() + "/active_checks", + cmc_path() + "/agents/plugins", + cmc_path() + "/bin", + cmc_path() + "/misc", ] checked, worst = 0, 0 - for rel_path in search_paths: - path = os.path.realpath(repo_path() + "/" + rel_path) + for path in search_paths: worst = max(worst, pylint_cmk.run_pylint(path)) checked += 1 diff --git a/tests/testlib/pylint_cmk.py b/tests/testlib/pylint_cmk.py index fd9a6bc..14168aa 100644 --- a/tests/testlib/pylint_cmk.py +++ b/tests/testlib/pylint_cmk.py @@ -16,27 +16,26 @@ from testlib import repo_path def ordered_module_files(): ordered_modules = [ - "modules/check_mk_base.py", - "modules/check_mk.py", - "modules/config.py", - "modules/discovery.py", - "modules/snmp.py", - "modules/notify.py", - "modules/events.py", - "modules/nagios.py", - "modules/automation.py", - "modules/inventory.py", - "enterprise/modules/real_time_checks.py", - "enterprise/modules/alert_handling.py", - "enterprise/modules/keepalive.py", - "enterprise/modules/cmc.py", - "enterprise/modules/inline_snmp.py", - "enterprise/modules/agent_bakery.py", - "enterprise/modules/rrd.py", + cmk_path() + "/modules/check_mk_base.py", + cmk_path() + "/modules/check_mk.py", + cmk_path() + "/modules/config.py", + cmk_path() + "/modules/discovery.py", + cmk_path() + "/modules/snmp.py", + cmk_path() + "/modules/notify.py", + cmk_path() + "/modules/events.py", + cmk_path() + "/modules/nagios.py", + cmk_path() + "/modules/automation.py", + cmk_path() + "/modules/inventory.py", + cmc_path() + "/modules/real_time_checks.py", + cmc_path() + "/modules/alert_handling.py", + cmc_path() + "/modules/keepalive.py", + cmc_path() + "/modules/cmc.py", + cmc_path() + "/modules/inline_snmp.py", + cmc_path() + "/modules/agent_bakery.py", + cmc_path() + "/modules/rrd.py", ] - modules = [ os.path.realpath(repo_path() + "/" + p) - for p in ordered_modules ] + modules = ordered_modules # Add modules which are not specified above for path in module_files(): @@ -48,8 +47,8 @@ def ordered_module_files(): def module_files(): modules = [] - for base_path in [ repo_path() + "/modules", - repo_path() + "/enterprise/modules" ]: + for base_path in [ cmk_path() + "/modules", + cmc_path() + "/modules" ]: modules += [ base_path + "/" + f for f in os.listdir(base_path) if not f.startswith(".") ]

7 years, 7 months

html.set_var(): Protect against unexpcted types now

by Lars Michelsen

Module: check_mk Branch: master Commit: 1368c2121aa6a7dc91d1b049e9f3c3cb1057ac70 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1368c2121aa6a7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Feb 7 11:22:13 2017 +0100 html.set_var(): Protect against unexpcted types now Change-Id: Ic898a7b2637ab2f15cdfeab37a411709f1b47a2c --- web/htdocs/htmllib.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index d3678a1..a059dc4 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1330,11 +1330,16 @@ class RequestHandler(object): def set_var(self, varname, value): - if value == None: + if value is None: self.del_var(varname) - else: + + elif type(value) in [ str, unicode ]: self.vars[varname] = value + else: + # crash report please + raise TypeError(_("Only str and unicode values are allowed")) + def del_var(self, varname): if varname in self.vars:

7 years, 7 months

← Newer
1
...
29
30
31
32
33
34
35
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2017