Checkmk git commits October 2018

checkmk-commits@lists.checkmk.com

15 participants
308 discussions

Fix a name shadowing problem that lead to a crash when declaring user attributes

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 5181a456306a2669d35c107262aa9b19f2861bb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5181a456306a26… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Oct 25 14:40:41 2018 +0200 Fix a name shadowing problem that lead to a crash when declaring user attributes Change-Id: I7416522d4e8f7c4f1f65216b2b7c710c09945d28 --- cmk/gui/userdb.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 60d16dd..8bb2ef7 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -519,11 +519,16 @@ def declare_user_attribute(name, vs, user_editable = True, permission = None, show_in_table = False, topic = None, add_custom_macro = False, domain = "multisite", from_config = False): + # FIXME: The classmethods "name" and "topic" shadow the arguments from the function scope. + # Any use off "name" and "topic" inside the class will result in a NameError. + attr_name = name + attr_topic = topic + @user_attribute_registry.register class LegacyUserAttribute(GenericUserAttribute): - _name = name + _name = attr_name _valuespec = vs - _topic = topic if topic else 'personal' + _topic = attr_topic if attr_topic else 'personal' @classmethod def name(cls):

5 years, 11 months

Fixed subtile issue after removing star import

by Lars Michelsen

Module: check_mk Branch: master Commit: 5c94dc28233f0d1eb92954bc76ec53a442af854a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5c94dc28233f0d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Oct 25 16:43:07 2018 +0200 Fixed subtile issue after removing star import Change-Id: I10c361afd4b597c1a435b404870bd2eae6b07cd1 --- cmk/gui/userdb.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmk/gui/userdb.py b/cmk/gui/userdb.py index 8bb2ef7..3cdb7c8 100644 --- a/cmk/gui/userdb.py +++ b/cmk/gui/userdb.py @@ -43,7 +43,7 @@ import cmk.gui.background_job as background_job import cmk.gui.gui_background_job as gui_background_job from cmk.gui.exceptions import MKUserError, MKInternalError from cmk.gui.log import logger -from cmk.gui.valuespec import DualListChoice +from cmk.gui.valuespec import DualListChoice, TextAscii import cmk.gui.i18n from cmk.gui.i18n import _ from cmk.gui.globals import html @@ -1114,7 +1114,13 @@ def update_config_based_user_attributes(): _clear_config_based_user_attributes() for attr in config.wato_user_attrs: - vs = globals()[attr['type']](title = attr['title'], help = attr['help']) + if attr["type"] == "TextAscii": + vs = TextAscii(title = attr['title'], help = attr['help']) + else: + raise NotImplementedError() + + # TODO: This method uses LegacyUserAttribute(). Use another class for + # this kind of attribute declare_user_attribute(attr['name'], vs, user_editable = attr['user_editable'], show_in_table = attr.get('show_in_table', False),

5 years, 11 months

Unbreak bandit tests a bit.

by Sven Panne

Module: check_mk Branch: master Commit: f001bde0d81993870ef83bd36f50a9741ccc830d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f001bde0d81993… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 25 16:16:39 2018 +0200 Unbreak bandit tests a bit. Bandit is still a bit picky about the exact line where a "nosec" pragma must appear, and YAPF broke that. Change-Id: I0676485823c6c7d6860772e68032f582e1563342 --- cmk_base/data_sources/programs.py | 8 ++++---- cmk_base/donate.py | 4 ++-- cmk_base/notify.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmk_base/data_sources/programs.py b/cmk_base/data_sources/programs.py index 4fbe737..73d0955 100644 --- a/cmk_base/data_sources/programs.py +++ b/cmk_base/data_sources/programs.py @@ -66,10 +66,10 @@ class ProgramDataSource(CheckMKAgentDataSource): p = None try: if config.monitoring_core == "cmc": - p = subprocess.Popen( + p = subprocess.Popen( # nosec commandline, shell=True, - stdin=open(os.devnull), # nosec + stdin=open(os.devnull), stdout=subprocess.PIPE, stderr=subprocess.PIPE, preexec_fn=os.setsid, @@ -78,10 +78,10 @@ class ProgramDataSource(CheckMKAgentDataSource): # We can not create a separate process group when running Nagios # Upon reaching the service_check_timeout Nagios only kills the process # group of the active check. - p = subprocess.Popen( + p = subprocess.Popen( # nosec commandline, shell=True, - stdin=open(os.devnull), # nosec + stdin=open(os.devnull), stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True) diff --git a/cmk_base/donate.py b/cmk_base/donate.py index c298f89..5d3c30e 100644 --- a/cmk_base/donate.py +++ b/cmk_base/donate.py @@ -49,8 +49,8 @@ def do_donation(): console.verbose("Donating files %s\n" % " ".join(cache_files)) indata = base64.b64encode( - os.popen( - "tar czf - -C %s %s" % (cmk.paths.tcp_cache_dir, " ".join(donate))).read()) # nosec + os.popen( # nosec + "tar czf - -C %s %s" % (cmk.paths.tcp_cache_dir, " ".join(donate))).read()) output = os.popen(config.donation_command, "w") # nosec output.write("\n\n@STARTDATA\n") diff --git a/cmk_base/notify.py b/cmk_base/notify.py index b794922..2f6f6b1 100755 --- a/cmk_base/notify.py +++ b/cmk_base/notify.py @@ -1225,10 +1225,10 @@ def notify_via_email(plugin_context): notify_log_debug("Executing command: %s" % command) # TODO: Cleanup this shell=True call! - p = subprocess.Popen( + p = subprocess.Popen( # nosec command_utf8, shell=True, - stdout=subprocess.PIPE, # nosec + stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE, close_fds=True)

5 years, 11 months

Unbreak pylint test: Resurrected dead strip_snmp_value.

by Sven Panne

Module: check_mk Branch: master Commit: d8aa7985d51f91164dbcfb6e95e2493c9315966f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8aa7985d51f91… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Oct 25 15:26:08 2018 +0200 Unbreak pylint test: Resurrected dead strip_snmp_value. Change-Id: Id45c1b1fbbeb0647928298aef662b987af84ba86 --- cmk_base/classic_snmp.py | 53 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/cmk_base/classic_snmp.py b/cmk_base/classic_snmp.py index e1822d1..e650a39 100644 --- a/cmk_base/classic_snmp.py +++ b/cmk_base/classic_snmp.py @@ -279,3 +279,56 @@ def _snmp_base_command(what, access_data, context_name): options += ["-n", context_name] return command + options + +#. +# .--SNMP helpers--------------------------------------------------------. +# | ____ _ _ __ __ ____ _ _ | +# | / ___|| \ | | \/ | _ \ | |__ ___| |_ __ ___ _ __ ___ | +# | \___ \| \| | |\/| | |_) | | '_ \ / _ \ | '_ \ / _ \ '__/ __| | +# | ___) | |\ | | | | __/ | | | | __/ | |_) | __/ | \__ \ | +# | |____/|_| \_|_| |_|_| |_| |_|\___|_| .__/ \___|_| |___/ | +# | |_| | +# +----------------------------------------------------------------------+ +# | Internal helpers for processing SNMP things | +# '----------------------------------------------------------------------' + + +def strip_snmp_value(value, hex_plain=False): + v = value.strip() + if v.startswith('"'): + v = v[1:-1] + if len(v) > 2 and _is_hex_string(v): + return value if hex_plain else _convert_from_hex(v) + # Fix for non hex encoded string which have been somehow encoded by the + # netsnmp command line tools. An example: + # Checking windows systems via SNMP with hr_fs: disk names like c:\ + # are reported as c:\\, fix this to single \ + return v.strip().replace('\\\\', '\\') + return v + + +def _is_hex_string(value): + # as far as I remember, snmpwalk puts a trailing space within + # the quotes in case of hex strings. So we require that space + # to be present in order make sure, we really deal with a hex string. + if value[-1] != ' ': + return False + hexdigits = "0123456789abcdefABCDEF" + n = 0 + for x in value: + if n % 3 == 2: + if x != ' ': + return False + else: + if x not in hexdigits: + return False + n += 1 + return True + + +def _convert_from_hex(value): + hexparts = value.split() + r = "" + for hx in hexparts: + r += chr(int(hx, 16)) + return r

5 years, 11 months

check_mk_agent.linux: Avoid blocking pager for systemctl call

by Moritz Kiemer

Module: check_mk Branch: master Commit: 7dc4a0daa98d4270c64e92007e479387c463a232 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7dc4a0daa98d42… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Oct 25 11:46:38 2018 +0200 check_mk_agent.linux: Avoid blocking pager for systemctl call Change-Id: Icffad1e1e62b7a57ff35e1521e72e417556c9ef9 --- agents/check_mk_agent.linux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index d8d92f8..8b9ffb7 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -185,7 +185,7 @@ function sections_systemd() { if type systemctl >/dev/null 2>&1 ; then echo '<<<systemd_units>>>' - systemctl --all + systemctl --all --no-pager fi }

5 years, 11 months

YAPFed cmk_base

by Lars Michelsen

5 years, 11 months

Moved automation and not_implemented to dedicated modules and erased redefinition of helper funcs

by Kenneth Okoh

Module: check_mk Branch: master Commit: 138d8a4efc8170a5e83991aeadfd4c4add5cca0b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=138d8a4efc8170… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Tue Oct 23 10:10:32 2018 +0200 Moved automation and not_implemented to dedicated modules and erased redefinition of helper funcs Change-Id: Ic62f96541448f6d246e585e5cb2133d9c7cccfd5 --- cmk/gui/wato/__init__.py | 506 +--------------------------------- cmk/gui/wato/pages/automation.py | 170 ++++++++++++ cmk/gui/wato/pages/not_implemented.py | 55 ++++ 3 files changed, 227 insertions(+), 504 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=138d8a4efc…

5 years, 11 months

Moved bulk edit, bulk cleanup and pending to dedicated modules

by Kenneth Okoh

Module: check_mk Branch: master Commit: 6cec046f93d27965b2378849b1d848e1f6516001 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=6cec046f93d279… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 19 15:03:40 2018 +0200 Moved bulk edit, bulk cleanup and pending to dedicated modules Change-Id: I757d28fee730db27776f75302e6c07c68028a3d2 --- cmk/gui/wato/__init__.py | 776 +++------------------------------ cmk/gui/wato/pages/activate_changes.py | 503 +++++++++++++++++++++ cmk/gui/wato/pages/bulk_edit.py | 227 ++++++++++ 3 files changed, 782 insertions(+), 724 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=6cec046f93…

5 years, 11 months

Moved parentscan, progress, and search to dedicated modules and extended global_settings and sites

by Kenneth Okoh

Module: check_mk Branch: master Commit: 0dc873469954a6b5f5579695f4b4611d6c8ab42a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=0dc873469954a6… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Fri Oct 19 16:19:14 2018 +0200 Moved parentscan, progress, and search to dedicated modules and extended global_settings and sites Change-Id: I0ea2afc0714cd1ca3cbaf7d99b383aedadddd3d9 --- cmk/gui/wato/__init__.py | 873 ++------------------------------ cmk/gui/wato/pages/global_settings.py | 198 +++++++- cmk/gui/wato/pages/parentscan.py | 395 +++++++++++++++ cmk/gui/wato/pages/progress.py | 113 +++++ cmk/gui/wato/pages/search.py | 90 ++++ cmk/gui/wato/pages/sites.py | 911 +++++++++++++++++++--------------- 6 files changed, 1317 insertions(+), 1263 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=0dc8734699…

5 years, 11 months

Moved page handler registrations to respective mode definitions

by Kenneth Okoh

Module: check_mk Branch: master Commit: 5ba6759155cb94903474f7bae6dcff54d4163cf6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5ba6759155cb94… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Tue Oct 23 10:37:42 2018 +0200 Moved page handler registrations to respective mode definitions Change-Id: I0d87a5a46da08c5ae21f31aa570323b08d35821a --- cmk/gui/wato/__init__.py | 26 ++++++-------------------- cmk/gui/wato/pages/activate_changes.py | 5 +++-- cmk/gui/wato/pages/automation.py | 5 +++++ cmk/gui/wato/pages/folders.py | 5 +++++ cmk/gui/wato/pages/services.py | 3 +++ 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cmk/gui/wato/__init__.py b/cmk/gui/wato/__init__.py index 9d7162d..59cfc5f 100644 --- a/cmk/gui/wato/__init__.py +++ b/cmk/gui/wato/__init__.py @@ -618,7 +618,6 @@ class AgentOutputPage(object): return "%s-%s-%s.txt" % (site_id, host_name, ty) - class PageFetchAgentOutput(AgentOutputPage): def page(self): html.header(_("%s: Download agent output") % self._host.name(), @@ -668,6 +667,9 @@ class PageFetchAgentOutput(AgentOutputPage): job_manager = gui_background_job.GUIBackgroundJobManager() job_manager.show_job_details_from_snapshot(job_snapshot=job_snapshot) +# TODO: Clean this up! We would like to use the cmk.gui.pages.register() decorator instead +# of this +cmk.gui.pages.register_page_handler("fetch_agent_output", lambda: PageFetchAgentOutput().page()) @gui_background_job.job_registry.register @@ -710,7 +712,6 @@ class FetchAgentOutputBackgroundJob(WatoBackgroundJob): job_interface.send_result_message(_("%s Finished.") % button) - class PageDownloadAgentOutput(AgentOutputPage): def page(self): file_name = self.file_name(self._host.site_id(), self._host.name(), self._ty) @@ -721,6 +722,9 @@ class PageDownloadAgentOutput(AgentOutputPage): preview_filepath = os.path.join(self._job.get_work_dir(), file_name) html.write(file(preview_filepath).read()) +cmk.gui.pages.register_page_handler("download_agent_output", lambda: PageDownloadAgentOutput().page()) + + #. # .--Network Scan--------------------------------------------------------. # | _ _ _ _ ____ | @@ -1189,21 +1193,3 @@ def load_plugins(force): # exceptions all the time and not only the first time (when the plugins # are loaded). loaded_with_language = cmk.gui.i18n.get_current_language() - - -# TODO: Clean this up! We would like to use the cmk.gui.pages.register() decorator instead -# of this -_wato_pages = { - "ajax_start_activation" : lambda: ModeAjaxStartActivation().handle_page(), - "ajax_activation_state" : lambda: ModeAjaxActivationState().handle_page(), - - "automation_login" : lambda: ModeAutomationLogin().page(), - "noauth:automation" : lambda: ModeAutomation().page(), - "ajax_set_foldertree" : lambda: ModeAjaxSetFoldertree().handle_page(), - "wato_ajax_execute_check" : lambda: ModeAjaxExecuteCheck().handle_page(), - "fetch_agent_output" : lambda: PageFetchAgentOutput().page(), - "download_agent_output" : lambda: PageDownloadAgentOutput().page(), - "ajax_popup_move_to_folder" : lambda: ModeAjaxPopupMoveToFolder().page(), -} -for path, page_func in _wato_pages.items(): - cmk.gui.pages.register_page_handler(path, page_func) diff --git a/cmk/gui/wato/pages/activate_changes.py b/cmk/gui/wato/pages/activate_changes.py index df06972..402f7c4 100644 --- a/cmk/gui/wato/pages/activate_changes.py +++ b/cmk/gui/wato/pages/activate_changes.py @@ -43,6 +43,7 @@ from cmk.gui.plugins.wato.utils.base_modes import WatoMode, WatoWebApiMode from cmk.gui.plugins.wato.utils.html_elements import wato_styles from cmk.gui.plugins.wato.utils.context_buttons import home_button +from cmk.gui.pages import register_page_handler from cmk.gui.display_options import display_options from cmk.gui.globals import html from cmk.gui.i18n import _ @@ -432,7 +433,6 @@ class ModeActivateChanges(WatoMode, watolib.ActivateChanges): table.end() - class ModeAjaxStartActivation(WatoWebApiMode): def page(self): watolib.init_wato_datastructures(with_wato_lock=True) @@ -466,7 +466,7 @@ class ModeAjaxStartActivation(WatoWebApiMode): "activation_id": activation_id, } - +register_page_handler("ajax_start_activation", lambda: ModeAjaxStartActivation().handle_page()) class ModeAjaxActivationState(WatoWebApiMode): @@ -487,6 +487,7 @@ class ModeAjaxActivationState(WatoWebApiMode): return manager.get_state() +register_page_handler("ajax_activation_state", lambda: ModeAjaxActivationState().handle_page()) def do_activate_changes_automation(): diff --git a/cmk/gui/wato/pages/automation.py b/cmk/gui/wato/pages/automation.py index 0f9d8bf..154b85a 100644 --- a/cmk/gui/wato/pages/automation.py +++ b/cmk/gui/wato/pages/automation.py @@ -33,6 +33,7 @@ import cmk.gui.config as config import cmk.gui.watolib as watolib import cmk.gui.userdb as userdb +from cmk.gui.pages import register_page_handler from cmk.gui.plugins.wato.utils.base_modes import WatoWebApiMode from cmk.gui.log import logger from cmk.gui.globals import html @@ -53,6 +54,8 @@ class ModeAutomationLogin(WatoWebApiMode): html.set_output_format("python") html.write_html(repr(watolib.get_login_secret(True))) +register_page_handler("automation_login", lambda: ModeAutomationLogin().page()) + class ModeAutomation(WatoWebApiMode): """Executes the requested automation call @@ -168,3 +171,5 @@ class ModeAutomation(WatoWebApiMode): raise html.write_text(_("Internal automation error: %s\n%s") % \ (e, traceback.format_exc())) + +register_page_handler("noauth:automation", lambda: ModeAutomation().page()) diff --git a/cmk/gui/wato/pages/folders.py b/cmk/gui/wato/pages/folders.py index 903c9fd..9a663af 100644 --- a/cmk/gui/wato/pages/folders.py +++ b/cmk/gui/wato/pages/folders.py @@ -43,6 +43,7 @@ from cmk.gui.plugins.wato.utils.html_elements import wato_confirm from cmk.gui.plugins.wato.utils.main_menu import MainMenu, MenuItem from cmk.gui.plugins.wato.utils.context_buttons import folder_status_button, global_buttons +from cmk.gui.pages import register_page_handler from cmk.gui.globals import html from cmk.gui.htmllib import HTML from cmk.gui.i18n import _ @@ -763,6 +764,8 @@ class ModeAjaxPopupMoveToFolder(WatoWebApiMode): return choices +register_page_handler("ajax_popup_move_to_folder", lambda: ModeAjaxPopupMoveToFolder().page()) + class FolderMode(WatoMode): __metaclass__ = abc.ABCMeta @@ -913,3 +916,5 @@ class ModeAjaxSetFoldertree(WatoWebApiMode): def page(self): request = self.webapi_request() config.user.save_file("foldertree", (request.get('topic'), request.get('target'))) + +register_page_handler("ajax_set_foldertree", lambda: ModeAjaxSetFoldertree().handle_page()) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 7169664..46f0973 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -40,6 +40,7 @@ from cmk.gui.plugins.wato.utils import mode_registry, may_edit_ruleset from cmk.gui.plugins.wato.utils.base_modes import WatoMode, WatoWebApiMode from cmk.gui.plugins.wato.utils.context_buttons import host_status_button, global_buttons +from cmk.gui.pages import register_page_handler from cmk.gui.globals import html from cmk.gui.i18n import _ from cmk.gui.exceptions import MKGeneralException @@ -837,3 +838,5 @@ class ModeAjaxExecuteCheck(WatoWebApiMode): "state_name" : short_service_state_name(state, "UNKN"), "output" : output, } + +register_page_handler("wato_ajax_execute_check", lambda: ModeAjaxExecuteCheck().handle_page())

5 years, 11 months

← Newer
1
2
3
4
5
6
7
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits October 2018