Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Sven Panne

Module: check_mk Branch: master Commit: eca07079a3dbc8c1fcb5aa482d3b1bdf21e83aca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=eca07079a3dbc8… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 15 15:17:54 2019 +0100 Improved web API unit test. Do not test internal implementation details, test the names of the exposed actions instead. Change-Id: I976de3bb857f59532ad46e5b9286c5f793423f84 --- tests/unit/cmk/gui/test_webapi_unit.py | 68 +++++++++++++++++++++++++--------- 1 file changed, 50 insertions(+), 18 deletions(-) diff --git a/tests/unit/cmk/gui/test_webapi_unit.py b/tests/unit/cmk/gui/test_webapi_unit.py index 8d9cc70..ea1dad0 100644 --- a/tests/unit/cmk/gui/test_webapi_unit.py +++ b/tests/unit/cmk/gui/test_webapi_unit.py @@ -1,21 +1,53 @@ +from cmk.gui.plugins.webapi.utils import api_call_collection_registry -import cmk.gui.webapi - -import cmk.gui.plugins.webapi.utils as webapi_utils def test_registered_api_call_collections(): - registered_plugins = sorted(webapi_utils.api_call_collection_registry.keys()) - assert registered_plugins == [ - 'APICallBIAggregationState', - 'APICallBakery', - 'APICallFolders', - 'APICallGraph', - 'APICallGroups', - 'APICallHosts', - 'APICallHosttags', - 'APICallOther', - 'APICallRules', - 'APICallSLA', - 'APICallSites', - 'APICallUsers', - ] + registered_api_actions = (action \ + for cls in api_call_collection_registry.values() + for action in cls().get_api_calls().iterkeys()) + assert sorted(registered_api_actions) == sorted([ + 'activate_changes', + 'add_contactgroup', + 'add_folder', + 'add_host', + 'add_hostgroup', + 'add_hosts', + 'add_servicegroup', + 'add_users', + 'delete_contactgroup', + 'delete_folder', + 'delete_host', + 'delete_hostgroup', + 'delete_hosts', + 'delete_servicegroup', + 'delete_site', + 'delete_users', + 'discover_services', + 'edit_contactgroup', + 'edit_folder', + 'edit_host', + 'edit_hostgroup', + 'edit_hosts', + 'edit_servicegroup', + 'edit_users', + 'get_all_contactgroups', + 'get_all_folders', + 'get_all_hostgroups', + 'get_all_hosts', + 'get_all_servicegroups', + 'get_all_sites', + 'get_all_users', + 'get_bi_aggregations', + 'get_folder', + 'get_host', + 'get_hosttags', + 'get_ruleset', + 'get_rulesets_info', + 'get_site', + 'login_site', + 'logout_site', + 'set_all_sites', + 'set_hosttags', + 'set_ruleset', + 'set_site', + ])

5 years, 8 months

Validate API call parameters in a generic way.

by Sven Panne

Module: check_mk Branch: master Commit: 66e633e564d95d40061754cba0d627f9e1724ee4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=66e633e564d95d… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 15 09:49:03 2019 +0100 Validate API call parameters in a generic way. This makes our internal API call handling a bit more declarative. Removed the default "locking" value from the API call description on the way, it was just noise. Change-Id: Idc9f119a6ebb6460a7207e6b5b817d7285e29a70 --- cmk/gui/plugins/webapi/__init__.py | 1 - cmk/gui/plugins/webapi/utils.py | 12 --- cmk/gui/plugins/webapi/webapi.py | 196 +++++++++++++------------------------ cmk/gui/webapi.py | 17 +++- 4 files changed, 82 insertions(+), 144 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=66e633e564…

5 years, 8 months

Refactoring: Extracted a few methods.

by Sven Panne

Module: check_mk Branch: master Commit: d8513ca031802122e52e6aa0281022cfb8f5d916 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d8513ca0318021… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Tue Jan 15 09:14:05 2019 +0100 Refactoring: Extracted a few methods. Change-Id: I3bb28a83cf3235b2b27c5db7e240a2e4b4653696 --- cmk/gui/webapi.py | 118 +++++++++++++++++++++++++++--------------------------- 1 file changed, 60 insertions(+), 58 deletions(-) diff --git a/cmk/gui/webapi.py b/cmk/gui/webapi.py index 37c688b..3f5a4db 100644 --- a/cmk/gui/webapi.py +++ b/cmk/gui/webapi.py @@ -110,62 +110,12 @@ def page_api(): raise MKUserError(None, 'pretty_print must be "yes" or "no"') pretty_print = pretty_print_var == "yes" - if not config.user.get_attribute("automation_secret"): - raise MKAuthException("The WATO API is only available for automation users") - - if not config.wato_enabled: - raise MKUserError(None, _("WATO is disabled on this site.")) - api_call = _get_api_call() - - # Initialize host and site attributes - watolib.init_wato_datastructures() - - # Prepare request_object - # Most of the time the request is given as json - # However, the plugin may have an own mechanism to interpret the request - request_object = {} - if api_call.get("dont_eval_request"): - if html.request.var("request"): - request_object = html.request.var("request") - else: - request_object = html.get_request(exclude_vars=["action", "pretty_print"]) - - # Check if the data was sent with the correct data format - # Some API calls only allow python code - # TODO: convert the api_action dict into an object which handles the validation - required_input_format = api_call.get("required_input_format") - if required_input_format: - if required_input_format != request_object["request_format"]: - raise MKUserError( - None, - "This API call requires a %s-encoded request parameter" % required_input_format) - - required_output_format = api_call.get("required_output_format") - if required_output_format: - if required_output_format != html.output_format: - raise MKUserError( - None, "This API call requires the parameter output_format=%s" % - required_output_format) - - # The request_format parameter is not forwarded into the API action - if "request_format" in request_object: - del request_object["request_format"] - - def execute_action(): - if cmk.gui.watolib.read_only.is_enabled( - ) and not cmk.gui.watolib.read_only.may_override(): - raise MKUserError(None, cmk.gui.watolib.read_only.message()) - return { - "result_code": 0, - "result": api_call["handler"](request_object), - } - - if api_call.get("locking", True): - with watolib.exclusive_lock(): - response = execute_action() - else: - response = execute_action() + _check_permissions(api_call) + watolib.init_wato_datastructures() # Initialize host and site attributes + request_object = _get_request(api_call) + _check_formats(api_call, request_object) + response = _execute_action(api_call, request_object) except MKAuthException as e: response = { @@ -186,13 +136,65 @@ def page_api(): html.write(_FORMATTERS[html.output_format][1 if pretty_print else 0](response)) +# TODO: If the registered API calls were instance of a real class, all the code +# below would be in methods of that class. + + def _get_api_call(): action = html.request.var('action') for cls in api_call_collection_registry.values(): api_call = cls().get_api_calls().get(action) if api_call: - for permission in ["wato.use", "wato.api_allowed"] + \ - api_call.get("required_permissions", []): - config.user.need_permission(permission) return api_call raise MKUserError(None, "Unknown API action %s" % html.attrencode(action)) + + +def _check_permissions(api_call): + if not config.user.get_attribute("automation_secret"): + raise MKAuthException("The WATO API is only available for automation users") + + if not config.wato_enabled: + raise MKUserError(None, _("WATO is disabled on this site.")) + + for permission in ["wato.use", "wato.api_allowed"] + \ + api_call.get("required_permissions", []): + config.user.need_permission(permission) + + +def _get_request(api_call): + if api_call.get("dont_eval_request"): + return html.request.var("request", {}) + return html.get_request(exclude_vars=["action", "pretty_print"]) + + +def _check_formats(api_call, request_object): + required_input_format = api_call.get("required_input_format") + if required_input_format and required_input_format != request_object["request_format"]: + raise MKUserError( + None, "This API call requires a %s-encoded request parameter" % required_input_format) + + required_output_format = api_call.get("required_output_format") + if required_output_format and required_output_format != html.output_format: + raise MKUserError( + None, "This API call requires the parameter output_format=%s" % required_output_format) + + # The request_format parameter is not forwarded into the API action + if "request_format" in request_object: + del request_object["request_format"] + + +def _execute_action(api_call, request_object): + if api_call.get("locking", True): + with watolib.exclusive_lock(): + return _execute_action_no_lock(api_call, request_object) + return _execute_action_no_lock(api_call, request_object) + + +def _execute_action_no_lock(api_call, request_object): + if cmk.gui.watolib.read_only.is_enabled() and \ + not cmk.gui.watolib.read_only.may_override(): + raise MKUserError(None, cmk.gui.watolib.read_only.message()) + return { + "result_code": 0, + "result": api_call["handler"](request_object), + }

5 years, 8 months

Reserved 20 Werk IDS

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ee99eab39b5d8e104ccd7cbb5d224d4b0fec13b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ee99eab39b5d8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Jan 15 15:18:46 2019 +0100 Reserved 20 Werk IDS Change-Id: I841e83045a476bb695604fc5e71ea502835ecab5 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index adc8bc7..1c0e343 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7071 +7091

5 years, 8 months

CMK-1468: Add to Jenkinsfile:

by Alex Zurhake

Module: check_mk Branch: master Commit: dfe5e62d93982991c6357db55f5cc93bf436e6fe URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dfe5e62d939829… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Jan 14 14:36:59 2019 +0100 CMK-1468: Add to Jenkinsfile: Build Linux Agents 64bit and 32bit Make Dist Build Check MK Package for Centos-6 and Ubuntu 18.04 Add Dcokerfiles for: Agent builder 32bit and 64 bit Install Binutils and GCC-8 on: Centos-6 Ubuntu 18.04 Change-Id: I6088bed44be630e848ffa6ff0c2aeaa5e50087f2 --- .../build-nodes/agent-builder/build-image-32.sh | 64 +++++++++++++ .../build-nodes/agent-builder/build-image-64.sh | 64 +++++++++++++ .../infrastructure/build-nodes/centos-6/Dockerfile | 24 +++++ .../build-nodes/centos-6/bw-build-gnu-toolchain | 57 ++++++++++++ .../build-nodes/ubuntu-18.04/Dockerfile | 14 +++ .../ubuntu-18.04/bw-build-gnu-toolchain | 57 ++++++++++++ buildscripts/scripts/nightly-build.jenkins | 100 +++++++++++++++++---- 7 files changed, 361 insertions(+), 19 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=dfe5e62d93…

5 years, 8 months

CMK-1468: better readability of Makefiles

by Alex Zurhake

Module: check_mk Branch: master Commit: 009674a11e558146a76fba4304d47ee09718a09d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=009674a11e5581… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Jan 14 14:44:44 2019 +0100 CMK-1468: better readability of Makefiles Change-Id: I77e050e20a9315239e6eb6ea9d89c996ffb1aa79 --- omd/Makefile | 5 +---- omd/packages/Python/Python.make | 11 ++++------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/omd/Makefile b/omd/Makefile index 5db396c..c38f102 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -349,10 +349,7 @@ $(CMA_PACKAGE): $(CMA-INSTALL) $(DESTDIR)$(OMD_ROOT)/share/omd/skel.permissions $(OMD_VERSION) clean: $(addsuffix -clean,$(PACKAGES)) - @if [ -d $(DESTDIR) ]; then \ - rm -rf $(DESTDIR) ; \ - fi - env + rm -rf $(DESTDIR) @for p in packages/* ; do \ if [ -d $$p ] && [ -f $$p/Makefile ]; then \ $(MAKE) -C $$p clean ; \ diff --git a/omd/packages/Python/Python.make b/omd/packages/Python/Python.make index bbd1e2e..13ec6d0 100644 --- a/omd/packages/Python/Python.make +++ b/omd/packages/Python/Python.make @@ -3,13 +3,10 @@ PYTHON := Python PYTHON_VERS := 2.7.15 PYTHON_DIR := $(PYTHON)-$(PYTHON_VERS) -PYTHON_BUILD = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-build - -PYTHON_COMPILE = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-compile - -PYTHON_INSTALL = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install - -PYTHON_PATCHING = $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching +PYTHON_BUILD := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-build +PYTHON_COMPILE := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-compile +PYTHON_INSTALL := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-install +PYTHON_PATCHING := $(BUILD_HELPER_DIR)/$(PYTHON_DIR)-patching .PHONY: Python Python-install Python-skel Python-clean upstream

5 years, 8 months

Fix compiler error in Centos 6, that was caused by insufficient curses detection mechanism in net-snmp, as suggested by @SP

by Alex Zurhake

Module: check_mk Branch: master Commit: 629e1dec82e041b49dbc12de78f77406e457075d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=629e1dec82e041… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Tue Jan 15 09:28:46 2019 +0100 Fix compiler error in Centos 6, that was caused by insufficient curses detection mechanism in net-snmp, as suggested by @SP Change-Id: Ic5b19de0fc74d7f2b995c9074aea0e8500ebb794 --- omd/packages/net-snmp/patches/0016-fix-curses-detection.dif | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/omd/packages/net-snmp/patches/0016-fix-curses-detection.dif b/omd/packages/net-snmp/patches/0016-fix-curses-detection.dif new file mode 100644 index 0000000..3179280 --- /dev/null +++ b/omd/packages/net-snmp/patches/0016-fix-curses-detection.dif @@ -0,0 +1,10 @@ +--- a/configure.d/config_os_libs2 ++++ b/configure.d/config_os_libs2-patched +@@ -561,4 +561,7 @@ + + AC_CHECK_HEADERS([curses.h]) + NETSNMP_SEARCH_LIBS([endwin], [curses ncurses],,,,[LIBCURSES]) ++if test -n "$LIBCURSES"; then ++ NETSNMP_SEARCH_LIBS([halfdelay], [tinfo], [LIBCURSES="$LIBCURSES $LIBTINFO"],,,[LIBTINFO]) ++fi + AC_SUBST([LIBCURSES])

5 years, 8 months

CMK-1468: Don't call 'make dist' in each rpm Distro

by Alex Zurhake

Module: check_mk Branch: master Commit: 11f86e4675349cfd54477151cc07aa96f0f58f7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11f86e4675349c… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Mon Jan 14 14:34:12 2019 +0100 CMK-1468: Don't call 'make dist' in each rpm Distro To make this work: - Build livestatus only once as standalone. - Make sure all autoreconf files are packed into the archive Change-Id: I3fd3f4924b98916e1116cc6e5713372d7660cd2f --- Makefile | 16 ++++++++-------- omd/Makefile | 1 - omd/packages/mk-livestatus/mk-livestatus.make | 12 ++++++------ 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index bce07c0..2236f62 100644 --- a/Makefile +++ b/Makefile @@ -136,17 +136,17 @@ check-version: # is currently not used by most distros # Would also use --exclude-vcs, but this is also not available # And --transform is also missing ... -dist: mk-livestatus-$(VERSION).tar.gz $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) +dist: $(DISTNAME).tar.gz config.h.in $(DIST_DEPS) ifeq ($(ENTERPRISE),yes) $(MAKE) -C enterprise agents/plugins/cmk-update-agent $(MAKE) -C enterprise agents/plugins/cmk-update-agent-32 $(MAKE) -C enterprise agents/windows/plugins/cmk-update-agent.exe endif - @set -e -o pipefail ; EXCLUDES= ; \ + set -e -o pipefail ; EXCLUDES= ; \ if [ -d .git ]; then \ git rev-parse --short HEAD > COMMIT ; \ for X in $$(git ls-files --directory --others -i --exclude-standard) ; do \ - if [[ $$X != aclocal.m4 && $$X != config.h.in && ! "$(DIST_DEPS)" =~ (^|[[:space:]])$$X($$|[[:space:]]) && $$X != $(DISTNAME).tar.gz ]]; then \ + if [[ $$X != aclocal.m4 && $$X != config.h.in && ! "$(DIST_DEPS)" =~ (^|[[:space:]])$$X($$|[[:space:]]) && $$X != $(DISTNAME).tar.gz && $$X != omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz && $$X != livestatus/* && $$X != enterprise/* ]]; then \ EXCLUDES+=" --exclude $${X%*/}" ; \ fi ; \ done ; \ @@ -177,7 +177,7 @@ endif rm -rf check-mk-$(EDITION)-$(OMD_VERSION) # This tar file is only used by "omd/packages/check_mk/Makefile" -$(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks web/htdocs/js/main_min.js web/htdocs/js/mobile_min.js web/htdocs/js/side_min.js ChangeLog +$(DISTNAME).tar.gz: omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz .werks/werks web/htdocs/js/main_min.js web/htdocs/js/mobile_min.js web/htdocs/js/side_min.js ChangeLog @echo "Making $(DISTNAME)" rm -rf $(DISTNAME) mkdir -p $(DISTNAME) @@ -210,7 +210,7 @@ $(DISTNAME).tar.gz: mk-livestatus-$(VERSION).tar.gz .werks/werks web/htdocs/js/m tar czf $(DISTNAME)/checkman.tar.gz $(TAROPTS) -C checkman $$(cd checkman ; ls) tar czf $(DISTNAME)/web.tar.gz $(TAROPTS) -C web htdocs app - tar xzf mk-livestatus-$(VERSION).tar.gz + tar xzf omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz tar czf $(DISTNAME)/livestatus.tar.gz $(TAROPTS) -C mk-livestatus-$(VERSION) $$(cd mk-livestatus-$(VERSION) ; ls -A ) rm -rf mk-livestatus-$(VERSION) @@ -268,13 +268,13 @@ packages: # NOTE: Old tar versions (e.g. on CentOS 5) don't have the --transform option, # so we do things in a slightly complicated way. -mk-livestatus-$(VERSION).tar.gz: +omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz: rm -rf mk-livestatus-$(VERSION) mkdir -p mk-livestatus-$(VERSION) tar cf - $(TAROPTS) -C livestatus $$(cd livestatus ; echo $(LIVESTATUS_SOURCES) ) | tar xf - -C mk-livestatus-$(VERSION) cp -a configure.ac m4 mk-livestatus-$(VERSION) cd mk-livestatus-$(VERSION) && autoreconf --install --include=m4 && rm -rf autom4te.cache - tar czf mk-livestatus-$(VERSION).tar.gz $(TAROPTS) mk-livestatus-$(VERSION) + tar czf omd/packages/mk-livestatus/mk-livestatus-$(VERSION).tar.gz $(TAROPTS) mk-livestatus-$(VERSION) rm -rf mk-livestatus-$(VERSION) version: @@ -325,7 +325,7 @@ web/htdocs/js/%_min.js: node_modules webpack.config.js $(JAVASCRIPT_SOURCES) clean: make -C omd clean rm -rf clang-analyzer dist.tmp rpm.topdir *.rpm *.deb *.exe \ - mk-livestatus-*.tar.gz \ + omd/packages/mk-livestatus/mk-livestatus-*.tar.gz \ $(NAME)-*.tar.gz *~ counters autochecks \ precompiled cache web/htdocs/js/*_min.js \ .werks/werks \ diff --git a/omd/Makefile b/omd/Makefile index 012e7da..5db396c 100644 --- a/omd/Makefile +++ b/omd/Makefile @@ -250,7 +250,6 @@ rpm: if [ "$(EDITION)" = "raw" ]; then \ sed -i '/icmpsender/d;/icmpreceiver/d' omd.spec ; \ fi - make -C $(REPO_PATH) dist mkdir -p $(RPM_TOPDIR)/{SOURCES,BUILD,RPMS,SRPMS,SPECS} cp ../check-mk-$(EDITION)-$(OMD_VERSION).tar.gz $(RPM_TOPDIR)/SOURCES # NO_BRP_STALE_LINK_ERROR ignores errors when symlinking from skel to diff --git a/omd/packages/mk-livestatus/mk-livestatus.make b/omd/packages/mk-livestatus/mk-livestatus.make index 07eb10f..139e31f 100644 --- a/omd/packages/mk-livestatus/mk-livestatus.make +++ b/omd/packages/mk-livestatus/mk-livestatus.make @@ -2,8 +2,9 @@ MK_LIVESTATUS := mk-livestatus MK_LIVESTATUS_DIR := $(MK_LIVESTATUS)-$(CMK_VERSION) # Attention: copy-n-paste from check_mk/Makefile below... -MK_LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-build -MK_LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS)-install +MK_LIVESTATUS_BUILD := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS_DIR)-build +MK_LIVESTATUS_UNPACK := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS_DIR)-unpack +MK_LIVESTATUS_INSTALL := $(BUILD_HELPER_DIR)/$(MK_LIVESTATUS_DIR)-install .PHONY: $(MK_LIVESTATUS) $(MK_LIVESTATUS)-install $(MK_LIVESTATUS)-skel $(MK_LIVESTATUS)-clean @@ -11,11 +12,10 @@ $(MK_LIVESTATUS): $(MK_LIVESTATUS_BUILD) $(MK_LIVESTATUS)-install: $(MK_LIVESTATUS_INSTALL) -$(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz: - $(MAKE) -C $(REPO_PATH) $(MK_LIVESTATUS_DIR).tar.gz +$(PACKAGE_DIR)/$(MK_LIVESTATUS)/$(MK_LIVESTATUS_DIR).tar.gz: + $(MAKE) -C $(REPO_PATH) omd/packages/mk-livestatus/$(MK_LIVESTATUS_DIR).tar.gz -$(MK_LIVESTATUS_BUILD): $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz $(BOOST_BUILD) $(RE2_BUILD) - $(TAR_GZ) $(REPO_PATH)/$(MK_LIVESTATUS_DIR).tar.gz +$(MK_LIVESTATUS_BUILD): $(MK_LIVESTATUS_UNPACK) $(BOOST_BUILD) $(RE2_BUILD) cd $(MK_LIVESTATUS_DIR) ; \ ./configure CXXFLAGS="-g -O3 -Wall -Wextra" --with-boost=$(PACKAGE_BOOST_DESTDIR) --with-re2=$(PACKAGE_RE2_DESTDIR) --prefix=$(OMD_ROOT) $(MAKE) -C $(MK_LIVESTATUS_DIR) all

5 years, 8 months

Install and work guide for kubernetes custom metrics

by Óscar Nájera

Module: check_mk Branch: master Commit: 5f564318a7ebdcbce3166d0ab90de8f5ac1ec887 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5f564318a7ebdc… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Dec 20 14:13:03 2018 +0100 Install and work guide for kubernetes custom metrics - check_mk user kubernetes permissions to reach custom metrics - Namespace Check_MK monitoring architecture inside node CMK-1474 Change-Id: Ia966ad09b0e172b9098e877665c2908c100b4fb6 --- doc/treasures/kubernetes/check_mk_rbac.yaml | 17 +- doc/treasures/kubernetes/custom-metrics.yaml | 228 +++++++++++++++++++ doc/treasures/kubernetes/monitoring-arch.png | Bin 0 -> 17204 bytes doc/treasures/kubernetes/prometheus-operator.yaml | 131 +++++++++++ doc/treasures/kubernetes/readme.md | 248 +++++++++++++++++++++ .../kubernetes/sample-prometheus-instance.yaml | 106 +++++++++ 6 files changed, 728 insertions(+), 2 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5f564318a7…

5 years, 8 months

Check kubernetes Pods custom metrics, cpu, memory, fs

by Óscar Nájera

Module: check_mk Branch: master Commit: be297ace6a79b4f480d7bfa4c75fcba59f16889e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=be297ace6a79b4… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Thu Dec 20 18:04:58 2018 +0100 Check kubernetes Pods custom metrics, cpu, memory, fs CMK-1476 Change-Id: I8d136d94cd405cb6a86e549e676c844cf691c332 --- checkman/k8s_pods_cpu | 13 ++++ checkman/k8s_pods_fs | 13 ++++ checkman/k8s_pods_memory | 13 ++++ checks/k8s_pods_cm | 128 +++++++++++++++++++++++++++++++++ cmk/special_agents/agent_kubernetes.py | 10 +-- 5 files changed, 172 insertions(+), 5 deletions(-) diff --git a/checkman/k8s_pods_cpu b/checkman/k8s_pods_cpu new file mode 100644 index 0000000..684b830 --- /dev/null +++ b/checkman/k8s_pods_cpu @@ -0,0 +1,13 @@ +title: Kubernetes pods CPU resources +agents: linux +catalog: containerization/kubernetes +license: GPL +distribution: check_mk +description: + This check monitors the pods' cpu usage inside a namespace of a Kubernetes node. + +item: + The namespace whose cpu resources are monitored + +inventory: + One service per namespace is created. diff --git a/checkman/k8s_pods_fs b/checkman/k8s_pods_fs new file mode 100644 index 0000000..634ee14 --- /dev/null +++ b/checkman/k8s_pods_fs @@ -0,0 +1,13 @@ +title: Kubernetes pods Filesystem resources +agents: linux +catalog: containerization/kubernetes +license: GPL +distribution: check_mk +description: + This check monitors the pods' filesystem usage inside a namespace of a Kubernetes node. + +item: + The namespace whose filesystem resources are monitored + +inventory: + One service per namespace is created. diff --git a/checkman/k8s_pods_memory b/checkman/k8s_pods_memory new file mode 100644 index 0000000..bd2569d --- /dev/null +++ b/checkman/k8s_pods_memory @@ -0,0 +1,13 @@ +title: Kubernetes pods memory resources +agents: linux +catalog: containerization/kubernetes +license: GPL +distribution: check_mk +description: + This check monitors the pods' memory usage inside a namespace of a Kubernetes node. + +item: + The namespace whose memory resources are monitored + +inventory: + One service per namespace is created. diff --git a/checks/k8s_pods_cm b/checks/k8s_pods_cm new file mode 100644 index 0000000..037969e --- /dev/null +++ b/checks/k8s_pods_cm @@ -0,0 +1,128 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + +from cmk.special_agents.agent_kubernetes import parse_frac_prefix + + +def parse_mul_prefix(value): + # type: (str) -> int + if value.endswith('k'): + return 1000 * int(value[:-1]) + return int(value) + + +@get_parsed_item_data +def check_k8s_pods_memory(item, _no_params, metrics): + + rss = 0 + swap = 0 + usage_bytes = 0 + max_usage_bytes = 0 + + for pod_data in metrics: + rss += parse_mul_prefix(pod_data['metrics']['memory_rss']) + swap += parse_mul_prefix(pod_data['metrics']['memory_swap']) + usage_bytes += parse_mul_prefix(pod_data['metrics']['memory_usage_bytes']) + max_usage_bytes += parse_mul_prefix(pod_data['metrics']['memory_max_usage_bytes']) + + yield check_levels(rss, 'rss', _no_params, human_readable_func=get_bytes_human_readable) + yield check_levels(swap, 'swap', _no_params, human_readable_func=get_bytes_human_readable) + yield check_levels( + usage_bytes, 'usage_bytes', _no_params, human_readable_func=get_bytes_human_readable) + yield check_levels( + max_usage_bytes, + 'max_usage_bytes', + _no_params, + human_readable_func=get_bytes_human_readable) + + +check_info['k8s_pods_memory'] = { + 'parse_function': parse_k8s, + 'inventory_function': discover(), + 'check_function': check_k8s_pods_memory, + 'service_description': 'Memory usage for Pods in %s namespace', + 'includes': ['k8s.include'], +} + + +@get_parsed_item_data +def check_k8s_pods_cpu(item, _no_params, metrics): + + system = 0 + user = 0 + usage = 0 + + for pod_data in metrics: + system += parse_frac_prefix(pod_data['metrics']['cpu_system']) + user += parse_frac_prefix(pod_data['metrics']['cpu_user']) + usage += parse_frac_prefix(pod_data['metrics']['cpu_usage']) + + yield check_levels(system, 'system', _no_params) + yield check_levels(user, 'user', _no_params) + yield check_levels(usage, 'usage', _no_params) + + +check_info['k8s_pods_cpu'] = { + 'parse_function': parse_k8s, + 'inventory_function': discover(), + 'check_function': check_k8s_pods_cpu, + 'service_description': 'CPU usage for Pods in %s namespace', + 'includes': ['k8s.include'], +} + + +@get_parsed_item_data +def check_k8s_pods_fs(item, _no_params, metrics): + + inodes = 0 + reads = 0 + writes = 0 + limit_bytes = 0 + usage_bytes = 0 + + for pod_data in metrics: + inodes += parse_frac_prefix(pod_data['metrics']['fs_inodes']) + reads += parse_frac_prefix(pod_data['metrics']['fs_reads']) + writes += parse_frac_prefix(pod_data['metrics']['fs_writes']) + limit_bytes += parse_mul_prefix(pod_data['metrics']['fs_limit_bytes']) + usage_bytes += parse_mul_prefix(pod_data['metrics']['fs_usage_bytes']) + + yield check_levels(inodes, 'inodes', _no_params) + yield check_levels(reads, 'reads', _no_params) + yield check_levels(writes, 'writes', _no_params) + yield check_levels( + limit_bytes, 'limit_bytes', _no_params, human_readable_func=get_bytes_human_readable) + yield check_levels( + usage_bytes, 'usage_bytes', _no_params, human_readable_func=get_bytes_human_readable) + + +check_info['k8s_pods_fs'] = { + 'parse_function': parse_k8s, + 'inventory_function': discover(), + 'check_function': check_k8s_pods_fs, + 'service_description': 'FS usage for Pods in %s namespace', + 'includes': ['k8s.include'], +} diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 5efe7a0..03951d3 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -95,7 +95,7 @@ def setup_logging(verbosity): logging.basicConfig(level=lvl, format=fmt) -def parse_cpu(value): +def parse_frac_prefix(value): # type: (str) -> float if value.endswith('m'): return 0.001 * float(value[:-1]) @@ -199,11 +199,11 @@ class Node(Metadata): return view capacity, allocatable = self._status.capacity, self._status.allocatable if capacity: - view['capacity']['cpu'] += parse_cpu(capacity.get('cpu', '0.0')) + view['capacity']['cpu'] += parse_frac_prefix(capacity.get('cpu', '0.0')) view['capacity']['memory'] += parse_memory(capacity.get('memory', '0.0')) view['capacity']['pods'] += int(capacity.get('pods', '0')) if allocatable: - view['allocatable']['cpu'] += parse_cpu(allocatable.get('cpu', '0.0')) + view['allocatable']['cpu'] += parse_frac_prefix(allocatable.get('cpu', '0.0')) view['allocatable']['memory'] += parse_memory(allocatable.get('memory', '0.0')) view['allocatable']['pods'] += int(allocatable.get('pods', '0')) return view @@ -253,14 +253,14 @@ class Pod(Metadata): continue limits = resources.limits if limits: - view['limits']['cpu'] += parse_cpu(limits.get('cpu', 'inf')) + view['limits']['cpu'] += parse_frac_prefix(limits.get('cpu', 'inf')) view['limits']['memory'] += parse_memory(limits.get('memory', 'inf')) else: view['limits']['cpu'] += float('inf') view['limits']['memory'] += float('inf') requests = resources.requests if requests: - view['requests']['cpu'] += parse_cpu(requests.get('cpu', '0.0')) + view['requests']['cpu'] += parse_frac_prefix(requests.get('cpu', '0.0')) view['requests']['memory'] += parse_memory(requests.get('memory', '0.0')) return view

5 years, 8 months

← Newer
1
...
23
24
25
26
27
28
29
...
49
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019