Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

by Mathias Kettner

Module: check_mk Branch: master Commit: 9a8ab8f4460348a685153dca6740f54e3f5f46f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9a8ab8f4460348… Author: Mathias Kettner <mk(a)mathias-kettner.de> Date: Thu Mar 28 10:45:21 2019 +0100 Fixed typo in help text --- cmk/gui/plugins/wato/bi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmk/gui/plugins/wato/bi.py b/cmk/gui/plugins/wato/bi.py index 125d644..4483b78 100644 --- a/cmk/gui/plugins/wato/bi.py +++ b/cmk/gui/plugins/wato/bi.py @@ -2336,8 +2336,8 @@ class BIRulesPermission(Permission): @property def description(self): - return _("User the WATO BI module, create, modify and delete BI rules and " - "aggregations in packs that you are a contact of") + return _("Use the WATO BI module, create, modify and delete BI rules and " + "aggregations in packs that you are a contact of.") @property def defaults(self):

5 years, 3 months

checkman: nutanix sorted into its own subcategory within OS

by Martin Hirschvogel

Module: check_mk Branch: master Commit: e9163baa74443d83f3893cc5c27c0e2ad6e98434 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=e9163baa74443d… Author: Martin Hirschvogel <mh(a)mathias-kettner.de> Date: Wed Mar 27 10:58:11 2019 +0100 checkman: nutanix sorted into its own subcategory within OS CMK-1839 Change-Id: I87a3c49b52cb968a6a0d3cbaf7749325dc97875e --- checkman/prism_alerts | 4 ++-- checkman/prism_containers | 2 +- checkman/prism_info | 4 ++-- cmk/utils/man_pages.py | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/checkman/prism_alerts b/checkman/prism_alerts index 4db50ad..e5a80e6 100644 --- a/checkman/prism_alerts +++ b/checkman/prism_alerts @@ -1,6 +1,6 @@ title: Nutanix Prism: Alerts -agents: special -catalog: os/storage +agents: nutanix +catalog: os/misc license: GPL distribution: check_mk description: diff --git a/checkman/prism_containers b/checkman/prism_containers index 16f7564..bdb28d1 100644 --- a/checkman/prism_containers +++ b/checkman/prism_containers @@ -1,5 +1,5 @@ title: Nutanix Prism: Containers -agents: special +agents: nutanix catalog: os/storage license: GPL distribution: check_mk diff --git a/checkman/prism_info b/checkman/prism_info index 59fda47..822b74b 100644 --- a/checkman/prism_info +++ b/checkman/prism_info @@ -1,6 +1,6 @@ title: Nutanix Prism: General info about a cluster -agents: special -catalog: os/storage +agents: nutanix +catalog: os/misc license: GPL distribution: check_mk description: diff --git a/cmk/utils/man_pages.py b/cmk/utils/man_pages.py index f5801c4..e7d73f4 100644 --- a/cmk/utils/man_pages.py +++ b/cmk/utils/man_pages.py @@ -185,6 +185,7 @@ catalog_titles = { "msoffice" : "MS Office", "nginx" : "NGINX", "nullmailer" : "Nullmailer", + "nutanix" : "Nutanix", "omd" : "Open Monitoring Distribution (OMD)", "check_mk" : "Check_MK Monitoring System", "oracle" : "ORACLE Database", @@ -250,7 +251,8 @@ check_mk_agents = { "windows": "Windows", "snmp": "SNMP", "openvms": "OpenVMS", - "vsphere": "vSphere" + "vsphere": "vSphere", + "nutanix": "Nutanix", } _manpage_catalog = {} # type: ignore

5 years, 3 months

check_sql: fix bug that snuck in during makeover

by Moritz Kiemer

Module: check_mk Branch: master Commit: dd03a68d1956b800d2729cc68b7bf18359e71266 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd03a68d1956b8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 15:29:18 2019 +0100 check_sql: fix bug that snuck in during makeover Change-Id: Ice0f09669c3cf94d0c06d1764297229c4f360699 --- active_checks/check_sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index d233303..31f2fce 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -409,7 +409,7 @@ def process_result(result, warn, crit, metrics=False, debug=False): perf = "" if metrics: try: - perf = " | performance_data=%s" % str(result[2]) + perf = " | performance_data=%s" % str(row0[2]) except IndexError: if debug: raise

5 years, 3 months

CMK-1899: build CMK docker container

by Alex Zurhake

Module: check_mk Branch: master Commit: 2041cdbdda627649e1b711f8131f37bf3789d6dc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2041cdbdda6276… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Wed Mar 27 13:09:40 2019 +0100 CMK-1899: build CMK docker container Change-Id: Ib5084e6d5352cd075317cabbff1c80e517f9ce78 --- buildscripts/scripts/build-cmk-container.sh | 64 ++++++++++++++++++++++ buildscripts/scripts/nightly-cmk-container.jenkins | 43 +++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/buildscripts/scripts/build-cmk-container.sh b/buildscripts/scripts/build-cmk-container.sh new file mode 100755 index 0000000..ce419a6 --- /dev/null +++ b/buildscripts/scripts/build-cmk-container.sh @@ -0,0 +1,64 @@ +#!/bin/bash +set -e +unset LANG + +log() { echo "[$(date '+%F %T')] ==============================" "$@"; } +die() { log "$@"; exit 1; } + +if [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "" ] || [ "$2" = "" ] || [ "$3" = "" ]; then + echo "Aufrufen: bw-docker-bauen [BRANCH] [EDITION] [VERSION]" + echo " bw-docker-bauen 1.5.0 enterprise 1.5.0p4" + echo + exit 0 +fi + +BRANCH=$1 +EDITION=$2 +VERSION=$3 + +if [ $EDITION = raw ]; then + SUFFIX=.cre +elif [ $EDITION = enterprise ]; then + SUFFIX=.cee +elif [ $EDITION = managed ]; then + SUFFIX=.cme +else + die "FEHLER: Unbekannte Edition '$EDITION'" +fi + +mkdir -p /bauwelt/tmp +TMP_PATH=$(mktemp --directory -p /bauwelt/tmp --suffix=.cmk-docker) +DOCKER_PATH="$TMP_PATH/check-mk-${EDITION}-${VERSION}${SUFFIX}/docker" +DOCKER_IMAGE_ARCHIVE="check-mk-${EDITION}-docker-${VERSION}.tar.gz" +PKG_NAME="check-mk-${EDITION}-${VERSION}" +PKG_FILE="${PKG_NAME}_0.stretch_$(dpkg --print-architecture).deb" + +trap "rm -rf \"$TMP_PATH\"" SIGTERM SIGHUP SIGINT + +log "Unpack source tar to $TMP_PATH" +tar -xz -C "$TMP_PATH" -f "/bauwelt/download/${VERSION}/check-mk-${EDITION}-${VERSION}${SUFFIX}.tar.gz" + +log "Copy debian package..." +cp "/bauwelt/download/${VERSION}/${PKG_FILE}" "$DOCKER_PATH/" + +log "Building container image" +make -C "$DOCKER_PATH" "$DOCKER_IMAGE_ARCHIVE" + +log "Verschiebe Image-Tarball..." +mv -v "$DOCKER_PATH/$DOCKER_IMAGE_ARCHIVE" "/bauwelt/download/${VERSION}/" + +if [ $EDITION = raw ]; then + log "Erstelle \"{$BRANCH}-latest\" tag..." + docker tag "checkmk/check-mk-${EDITION}:${VERSION}" "checkmk/check-mk-${EDITION}:${BRANCH}-latest" + + log "Erstelle \"latest\" tag..." + docker tag "checkmk/check-mk-${EDITION}:${VERSION}" "checkmk/check-mk-${EDITION}:latest" + + log "Lade zu Docker-Hub hoch..." + DOCKERCLOUD_NAMESPACE=checkmk docker push "checkmk/check-mk-${EDITION}:${VERSION}" + DOCKERCLOUD_NAMESPACE=checkmk docker push "checkmk/check-mk-${EDITION}:${BRANCH}-latest" + DOCKERCLOUD_NAMESPACE=checkmk docker push "checkmk/check-mk-${EDITION}:latest" +fi + +log "Räume temporäres Verzeichnis $TMP_PATH weg" +rm -rf "$TMP_PATH" diff --git a/buildscripts/scripts/nightly-cmk-container.jenkins b/buildscripts/scripts/nightly-cmk-container.jenkins new file mode 100644 index 0000000..22f162b --- /dev/null +++ b/buildscripts/scripts/nightly-cmk-container.jenkins @@ -0,0 +1,43 @@ +import java.text.SimpleDateFormat + +properties([ + pipelineTriggers([ + upstream(upstreamProjects: 'cmk_master/nightly_build_containerized', threshold: hudson.model.Result.SUCCESS) + ]) +]) + +currentBuild.description = '\nBuilding the CMK docker container\n' + +def dateFormat = new SimpleDateFormat("yyyy.MM.dd") +def date = new Date() +def CMK_VERS = dateFormat.format(date) +def DAILY_DATA = '/var/jenkins_home/daily-data/' + BRANCH_NAME.replaceAll("/","-") + '/' + CMK_VERS + +def PACKAGE_DIR = '/bauwelt/download' +def GPG_KEY_DIR = '/bauwelt/etc/.gnupg' +def RELEASE_KEY_DIR = '/bauwelt/git/release/release.key' + +node { + docker.withRegistry(DOCKER_REGISTRY, 'nexus') { + IMAGE = 'ubuntu-18.04-common' + docker.image(IMAGE).pull() + docker.image(IMAGE).inside("-u 0:0 -v ${PACKAGE_DIR}/${CMK_VERS}:${PACKAGE_DIR}/${CMK_VERS} -v ${DAILY_DATA}:${DAILY_DATA} -v /var/run/docker.sock:/var/run/docker.sock -v ${GPG_KEY_DIR}:${GPG_KEY_DIR}:ro -v ${RELEASE_KEY_DIR}:${RELEASE_KEY_DIR}:ro -v /root/.cmk-credentials:/root/.cmk-credentials --network ci_local-infra") { + stage('Build Container') { + sh """ + cd ${DAILY_DATA}/git/ + ./buildscripts/scripts/build-cmk-container.sh master enterprise ${CMK_VERS} + """ + withCredentials([usernamePassword(credentialsId: '9d7aca31-0043-4cd0-abeb-26a249d68261', passwordVariable: 'GPG_PASSPHRASE', usernameVariable: 'GPG_USERNAME')]) { + sh """ + cd ${PACKAGE_DIR}/${CMK_VERS} + rm -f HASHES + ${DAILY_DATA}/git/buildscripts/scripts/sign-packages.sh ${CMK_VERS} + rsync -av -e "ssh -o StrictHostKeyChecking=no -i ${RELEASE_KEY_DIR}" \ + ${PACKAGE_DIR}/${CMK_VERS} \ + bauwelt@mathias-kettner.de:${PACKAGE_DIR} + """ + } + } + } + } +}

5 years, 3 months

check_sql: make pylint happier

by Moritz Kiemer

Module: check_mk Branch: master Commit: 229cefcfa737a7e4751a29513b34e7d4dd48ed7e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=229cefcfa737a7… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 15:27:04 2019 +0100 check_sql: make pylint happier Change-Id: I5af69da0d1bb6ff6cbbd6437cce4342f5f80f991 --- active_checks/check_sql | 67 ++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/active_checks/check_sql b/active_checks/check_sql index e9ace9f..d233303 100755 --- a/active_checks/check_sql +++ b/active_checks/check_sql @@ -37,7 +37,7 @@ import sys import cmk.utils.password_store cmk.utils.password_store.replace_passwords() -log = logging.getLogger(__name__) +LOG = logging.getLogger(__name__) DEFAULT_PORTS = { "postgres": 5432, @@ -202,10 +202,10 @@ def parse_args(argv): logging.basicConfig(level=max(30 - 10 * args.verbose, 0), format=fmt) # V-VERBOSE INFO - for k, v in args.__dict__.items(): - if k in ('user', 'password'): - v = '****' - log.debug('argparse: %s = %r', k, v) + for key, val in args.__dict__.items(): + if key in ('user', 'password'): + val = '****' + LOG.debug('argparse: %s = %r', key, val) return args @@ -225,12 +225,12 @@ def bail_out(exit_code, output): # def _default_execute(cursor, cmd, inpt, procedure): if procedure: - log.info("SQL Procedure Name: %s", cmd) - log.info("Input Values: %s", inpt) + LOG.info("SQL Procedure Name: %s", cmd) + LOG.info("Input Values: %s", inpt) cursor.callproc(cmd, inpt) - log.debug("inpt after 'callproc' = %r", inpt) + LOG.debug("inpt after 'callproc' = %r", inpt) else: - log.info("SQL Statement: %s", cmd) + LOG.info("SQL Statement: %s", cmd) cursor.execute(cmd) return cursor.fetchall() @@ -262,12 +262,12 @@ def mssql_connect(host, port, db_name, user, pwd): database=db_name, user=user, password=pwd) -def mssql_execute(cursor, cmd, inpt, procedure): +def mssql_execute(cursor, cmd, _inpt, procedure): if procedure: - log.info("SQL Procedure Name: %s", cmd) + LOG.info("SQL Procedure Name: %s", cmd) cmd = 'EXEC ' + cmd else: - log.info("SQL Statement: %s", cmd) + LOG.info("SQL Statement: %s", cmd) cursor.execute(cmd) @@ -279,8 +279,8 @@ def oracle_connect(host, port, db_name, user, pwd): '/usr/lib/python%s.%s/site-packages' % (sys.version_info.major, sys.version_info.minor)) try: import cx_Oracle # pylint: disable=import-error - except ImportError as e: - bail_out(3, "%s. Please install it via 'pip install cx_Oracle'." % e) + except ImportError as exc: + bail_out(3, "%s. Please install it via 'pip install cx_Oracle'." % exc) cstring = "%s/%s@%s:%s/%s" % (user, pwd, host, port, db_name) return cx_Oracle.connect(cstring) @@ -289,34 +289,34 @@ def oracle_connect(host, port, db_name, user, pwd): def oracle_execute(cursor, cmd, inpt, procedure): try: import cx_Oracle # pylint: disable=import-error - except ImportError as e: - bail_out(3, "%s. Please install it via 'pip install cx_Oracle'." % e) + except ImportError as exc: + bail_out(3, "%s. Please install it via 'pip install cx_Oracle'." % exc) if procedure: - log.info("SQL Procedure Name: %s", cmd) - log.info("Input Values: %s", inpt) + LOG.info("SQL Procedure Name: %s", cmd) + LOG.info("Input Values: %s", inpt) - # NOTE: In an earlier version, this code-branch - # had been executed regardles of the dbms. - # clearly this vvv is oracle specific. + # In an earlier version, this code-branch + # had been executed regardles of the dbms. + # clearly this is oracle specific. outvar = cursor.var(cx_Oracle.STRING) # pylint:disable=undefined-variable - # However, I have not been able to test it. + # However, I have not been able to test it. inpt.append(outvar) cursor.callproc(cmd, inpt) - log.debug("inpt after 'callproc' = %r", inpt) - log.debug("outvar = %r", outvar) + LOG.debug("inpt after 'callproc' = %r", inpt) + LOG.debug("outvar = %r", outvar) # for empty input this is just # _res = outvar.getvalue() _res = ','.join(i.getvalue() for i in inpt) - log.debug("outvar.getvalue() = %r", _res) + LOG.debug("outvar.getvalue() = %r", _res) params_result = _res.split(",") - log.debug("params_result = %r", params_result) + LOG.debug("params_result = %r", params_result) else: - log.info("SQL Statement: %s", cmd) + LOG.info("SQL Statement: %s", cmd) cursor.execute(cmd) return cursor.fetchall() @@ -327,8 +327,8 @@ def db2_connect(host, port, db_name, user, pwd): try: import ibm_db # pylint: disable=import-error import ibm_db_dbi # pylint: disable=import-error - except ImportError as e: - bail_out(3, "%s. Please install it via pip." % e) + except ImportError as exc: + bail_out(3, "%s. Please install it via pip." % exc) cstring = 'DRIVER={IBM DB2 ODBC DRIVER};DATABASE=%s;' \ 'HOSTNAME=%s;PORT=%s;PROTOCOL=TCPIP;UID=%s;PWD=%s;' \ @@ -382,7 +382,7 @@ def execute(dbms, connection, cmd, inpt, procedure=False): cursor.close() connection.close() - log.info("SQL Result:\n%r", result) + LOG.info("SQL Result:\n%r", result) return result @@ -394,9 +394,8 @@ def process_result(result, warn, crit, metrics=False, debug=False): [numerical_value, text, performance_data]. The full result is returned as muliline output. """ - if result is None or len(result) == 0: + if not result: bail_out(3, "SQL statement/procedure returned no data") - row0 = result[0] number = float(row0[0]) @@ -450,8 +449,8 @@ def main(argv=None): metrics=args.metrics, debug=args.debug, ) - except () if args.debug else Exception as e: - errmsg = str(e).strip('()').replace(r'\n', ' ') + except () if args.debug else Exception as exc: + errmsg = str(exc).strip('()').replace(r'\n', ' ') bail_out(3, "Error while %s: %s" % (msg, errmsg)) bail_out(state, args.text + text)

5 years, 3 months

active_checks.py: fix tiny typo

by Moritz Kiemer

Module: check_mk Branch: master Commit: cc54fc0658d8a83e03ece8a0061c19d76f561693 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc54fc0658d8a8… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Mar 27 13:55:14 2019 +0100 active_checks.py: fix tiny typo Change-Id: I73a36bce57c1c24c99e8350e9ea944ef2cb35200 --- cmk/gui/plugins/wato/active_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/wato/active_checks.py b/cmk/gui/plugins/wato/active_checks.py index 9298ba7..11407cd3 100644 --- a/cmk/gui/plugins/wato/active_checks.py +++ b/cmk/gui/plugins/wato/active_checks.py @@ -1908,7 +1908,7 @@ class RulespecActiveChecksFormSubmit(HostRulespec): title=_("Check HTML Form Submit"), help= _("Check submission of HTML forms via HTTP/HTTPS using the plugin <tt>check_form_submit</tt> " - "provided with Check_MK. This plugin provides more functionality as <tt>check_http</tt>, " + "provided with Check_MK. This plugin provides more functionality than <tt>check_http</tt>, " "as it automatically follows HTTP redirect, accepts and uses cookies, parses forms " "from the requested pages, changes vars and submits them to check the response " "afterwards."),

5 years, 3 months

k8s_replicas: new check to monitor replicas in deployments

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 040bc04bbe95cb8ad4c8aebd49ad4d62464cc4bf URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=040bc04bbe95cb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 27 15:20:35 2019 +0100 k8s_replicas: new check to monitor replicas in deployments CMK-1894 Change-Id: Iefc324d38032c8eab8c8dd988457ea0038e129e6 --- checkman/k8s_replicas | 25 ++++++ checks/k8s_replicas | 103 +++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 21 +++++ cmk/gui/plugins/wato/datasource_programs.py | 1 + cmk/special_agents/agent_kubernetes.py | 65 +++++++++++++++ tests/unit/checks/test_k8s_replicas.py | 121 ++++++++++++++++++++++++++++ 6 files changed, 336 insertions(+) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=040bc04bbe…

5 years, 3 months

k8s_pod_info: show information about a pod in the HW/SW inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: ceb097ce4c5f585e9e620fae89eba79681f6b78e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ceb097ce4c5f58… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Mon Mar 25 15:58:56 2019 +0100 k8s_pod_info: show information about a pod in the HW/SW inventory CMK-1893 Change-Id: Ibcd38353be9edce9471750bbd077d9f48a2bd18f --- cmk/gui/plugins/views/inventory.py | 9 +++++++ cmk/special_agents/agent_kubernetes.py | 25 +++++++++++++++++++ inventory/k8s_pod_info | 45 ++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+) diff --git a/cmk/gui/plugins/views/inventory.py b/cmk/gui/plugins/views/inventory.py index d9e337f..5bd54e9 100644 --- a/cmk/gui/plugins/views/inventory.py +++ b/cmk/gui/plugins/views/inventory.py @@ -1106,6 +1106,15 @@ inventory_displayhints.update({ ".software.applications.kubernetes.pod_container:*.ready": {"title": _("Ready"), "paint": "container_ready"}, ".software.applications.kubernetes.pod_container:*.restart_count": {"title": _("Restart count")}, ".software.applications.kubernetes.pod_container:*.container_id": {"title": _("Container ID")}, + ".software.applications.kubernetes.pod_info.": { + "title": _("Pod"), + }, + ".software.applications.kubernetes.pod_info.node": {"title": _("Node")}, + ".software.applications.kubernetes.pod_info.host_network": {"title": _("Host network")}, + ".software.applications.kubernetes.pod_info.dns_policy": {"title": _("DNS policy")}, + ".software.applications.kubernetes.pod_info.host_ip": {"title": _("Host IP")}, + ".software.applications.kubernetes.pod_info.pod_ip": {"title": _("Pod IP")}, + ".software.applications.kubernetes.pod_info.qos_class": {"title": _("QOS class")}, ".software.applications.citrix.": {"title": _("Citrix")}, ".software.applications.citrix.controller.": {"title": _("Controller")}, ".software.applications.citrix.controller.controller_version": { diff --git a/cmk/special_agents/agent_kubernetes.py b/cmk/special_agents/agent_kubernetes.py index 20eb247..e23b4f5 100644 --- a/cmk/special_agents/agent_kubernetes.py +++ b/cmk/special_agents/agent_kubernetes.py @@ -256,16 +256,26 @@ class Pod(Metadata): spec = pod.spec if spec: self.node = spec.node_name + self.host_network = (spec.host_network if spec.host_network is not None else False) + self.dns_policy = spec.dns_policy self._containers = spec.containers else: self.node = None + self.host_network = False + self.dns_policy = None self._containers = [] status = pod.status if status: + self.host_ip = status.host_ip + self.pod_ip = status.pod_ip + self.qos_class = status.qos_class self._container_statuses = (status.container_statuses if status.container_statuses else []) else: + self.host_ip = None + self.pod_ip = None + self.qos_class = None self._container_statuses = [] @staticmethod @@ -322,6 +332,17 @@ class Pod(Metadata): data['image_id'] = container_status.image_id return view + @property + def info(self): + return { + 'node': self.node, + 'host_network': self.host_network, + 'dns_policy': self.dns_policy, + 'host_ip': self.host_ip, + 'pod_ip': self.pod_ip, + 'qos_class': self.qos_class, + } + class Namespace(Metadata): # TODO: namespaces may have resource quotas and limits @@ -484,6 +505,9 @@ class PodList(ListLike[Pod]): def pods_in_cluster(self): return {'requests': {'pods': len(self)}} + def info(self): + return {pod.name: pod.info for pod in self} + def resources(self): return {pod.name: pod.resources for pod in self} @@ -825,6 +849,7 @@ class ApiData(object): g = Group() g.join('k8s_resources', self.pods.resources()) g.join('k8s_pod_container', self.pods.containers()) + g.join('k8s_pod_info', self.pods.info()) return '\n'.join(g.output()) diff --git a/inventory/k8s_pod_info b/inventory/k8s_pod_info new file mode 100644 index 0000000..f2818c2 --- /dev/null +++ b/inventory/k8s_pod_info @@ -0,0 +1,45 @@ +#!/usr/bin/env python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2019 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. + + +def inv_k8s_pod_info(info, inventory_tree, status_data_tree): + parsed = parse_k8s(info) + + path = "software.applications.kubernetes.pod_info." + inv_node = inventory_tree.get_dict(path) + status_node = status_data_tree.get_dict(path) + + for key, value in sorted(parsed.iteritems()): + if key in {'node', 'host_network', 'dns_policy'}: + inv_node[key] = value + else: + status_node[key] = value + + +inv_info['k8s_pod_info'] = { + 'inv_function': inv_k8s_pod_info, + 'includes': ['k8s.include'], +}

5 years, 3 months

k8s_pod_container: return CRIT if not all Containers are ready

by Tom Baerwinkel

Module: check_mk Branch: master Commit: f15b70255ed45df0a7aa3703daf5181315d10ef9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f15b70255ed45d… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Tue Mar 26 09:55:57 2019 +0100 k8s_pod_container: return CRIT if not all Containers are ready CMK-1893 Change-Id: Ia56aef5bed5cc405cf43237193bde07e26387533 --- checkman/k8s_pod_container | 5 +++++ checks/k8s_pod_container | 10 +++++++--- cmk/gui/plugins/metrics/check_mk.py | 8 ++++++++ .../generictests/datasets/k8s_pod_container_regression.py | 6 ++---- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/checkman/k8s_pod_container b/checkman/k8s_pod_container index a2ec51d..c501cae 100644 --- a/checkman/k8s_pod_container +++ b/checkman/k8s_pod_container @@ -8,6 +8,11 @@ description: ready containers of a pod. A container is ready if it passes its readiness probe. + To account for the initial setup of the container or the + switch of a Pod from one to another the ruleset + {Maximum number of check attempts for service} should be + used. + item: No item. diff --git a/checks/k8s_pod_container b/checks/k8s_pod_container index 601e256..fa6e4a2 100644 --- a/checks/k8s_pod_container +++ b/checks/k8s_pod_container @@ -31,10 +31,14 @@ def inventory_k8s_pod_container(parsed): def check_k8s_pod_container(_no_item, params, parsed): container = len(parsed) - yield 0, "Container: %d" % container, [('docker_all_containers', container)] - ready = sum(container['ready'] for container in parsed.itervalues()) - yield 0, "Ready: %d" % ready, [('ready_containers', ready)] + + state = 2 if ready != container else 0 + perfdata = [ + ('docker_all_containers', container, None, None, 0, container), + ('ready_containers', ready, None, None, 0, container), + ] + yield state, "Ready: %d/%d" % (ready, container), perfdata check_info['k8s_pod_container'] = { diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 15f5ee7..78630d9 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -8949,6 +8949,14 @@ graph_info["k8s_resources.memory"] = { "optional_metrics": ["k8s_memory_capacity", "k8s_memory_allocatable", "k8s_memory_limit"], } +graph_info["k8s_pod_container"] = { + "title": _("Ready containers"), + "metrics": [ + ("docker_all_containers", "line"), + ("ready_containers", "area"), + ], +} + graph_info["used_cpu_time"] = { "title": _("Used CPU Time"), "metrics": [ diff --git a/tests/unit/checks/generictests/datasets/k8s_pod_container_regression.py b/tests/unit/checks/generictests/datasets/k8s_pod_container_regression.py index d8a79e9..4d6c45a 100644 --- a/tests/unit/checks/generictests/datasets/k8s_pod_container_regression.py +++ b/tests/unit/checks/generictests/datasets/k8s_pod_container_regression.py @@ -12,7 +12,5 @@ discovery = {'': [(None, {})]} checks = {'': [(None, {}, - [(0, - 'Container: 1', - [('docker_all_containers', 1, None, None, None, None)]), - (0, 'Ready: 1', [('ready_containers', 1, None, None, None, None)])])]} \ No newline at end of file + [(0, 'Ready: 1/1', [('docker_all_containers', 1, None, None, 0, 1), + ('ready_containers', 1, None, None, 0, 1)])])]}

5 years, 3 months

Fix agent in checkman pages of Kubernetes checks

by Tom Baerwinkel

Module: check_mk Branch: master Commit: b8dfd81d599569658b1f19442b63c55f208d054a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b8dfd81d599569… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Wed Mar 27 16:28:15 2019 +0100 Fix agent in checkman pages of Kubernetes checks Change-Id: Ie07c3b5ba405bee2727900950ac65b9dc0cc6643 --- checkman/k8s_component_statuses | 2 +- checkman/k8s_conditions | 2 +- checkman/k8s_namespaces | 2 +- checkman/k8s_nodes | 2 +- checkman/k8s_persistent_volume_claims | 2 +- checkman/k8s_persistent_volumes | 2 +- checkman/k8s_pod_container | 4 ++-- checkman/k8s_pods_cpu | 2 +- checkman/k8s_pods_fs | 2 +- checkman/k8s_pods_memory | 2 +- checkman/k8s_resources.cpu | 2 +- checkman/k8s_resources.memory | 2 +- checkman/k8s_resources.pods | 2 +- checkman/k8s_roles | 2 +- checkman/k8s_stats.fs | 2 +- checkman/k8s_stats.network | 2 +- checkman/k8s_storage_classes | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/checkman/k8s_component_statuses b/checkman/k8s_component_statuses index b71ce59..dbbcd8e 100644 --- a/checkman/k8s_component_statuses +++ b/checkman/k8s_component_statuses @@ -1,5 +1,5 @@ title: Kubernetes component status -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_conditions b/checkman/k8s_conditions index c18318d..04c9dfa 100644 --- a/checkman/k8s_conditions +++ b/checkman/k8s_conditions @@ -1,5 +1,5 @@ title: Kubernetes conditions -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_namespaces b/checkman/k8s_namespaces index 8a6f014..6b45ad5 100644 --- a/checkman/k8s_namespaces +++ b/checkman/k8s_namespaces @@ -1,5 +1,5 @@ title: Kubernetes namespaces -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_nodes b/checkman/k8s_nodes index b9b77e9..369a1ea 100644 --- a/checkman/k8s_nodes +++ b/checkman/k8s_nodes @@ -1,5 +1,5 @@ title: Kubernetes nodes -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_persistent_volume_claims b/checkman/k8s_persistent_volume_claims index 3f738ea..2684583 100644 --- a/checkman/k8s_persistent_volume_claims +++ b/checkman/k8s_persistent_volume_claims @@ -1,5 +1,5 @@ title: Kubernetes persistent volume claims -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_persistent_volumes b/checkman/k8s_persistent_volumes index 93466e3..c6d5a91 100644 --- a/checkman/k8s_persistent_volumes +++ b/checkman/k8s_persistent_volumes @@ -1,5 +1,5 @@ title: Kubernetes persistent volumes -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_pod_container b/checkman/k8s_pod_container index c501cae..87903b7 100644 --- a/checkman/k8s_pod_container +++ b/checkman/k8s_pod_container @@ -1,5 +1,5 @@ title: Kubernetes pod container statistics -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk @@ -17,4 +17,4 @@ item: No item. inventory: - One service is created for each pod. \ No newline at end of file + One service is created for each pod. diff --git a/checkman/k8s_pods_cpu b/checkman/k8s_pods_cpu index 684b830..f97d7f2 100644 --- a/checkman/k8s_pods_cpu +++ b/checkman/k8s_pods_cpu @@ -1,5 +1,5 @@ title: Kubernetes pods CPU resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_pods_fs b/checkman/k8s_pods_fs index 6dfbd89..29b1c4e 100644 --- a/checkman/k8s_pods_fs +++ b/checkman/k8s_pods_fs @@ -1,5 +1,5 @@ title: Kubernetes pods filesystem resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_pods_memory b/checkman/k8s_pods_memory index bd2569d..89d25dc 100644 --- a/checkman/k8s_pods_memory +++ b/checkman/k8s_pods_memory @@ -1,5 +1,5 @@ title: Kubernetes pods memory resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_resources.cpu b/checkman/k8s_resources.cpu index e5ce1ae..7f3940d 100644 --- a/checkman/k8s_resources.cpu +++ b/checkman/k8s_resources.cpu @@ -1,5 +1,5 @@ title: Kubernetes CPU resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_resources.memory b/checkman/k8s_resources.memory index 2a33c60..62bb2b9 100644 --- a/checkman/k8s_resources.memory +++ b/checkman/k8s_resources.memory @@ -1,5 +1,5 @@ title: Kubernetes memory resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_resources.pods b/checkman/k8s_resources.pods index 4fc8181..e2028e4 100644 --- a/checkman/k8s_resources.pods +++ b/checkman/k8s_resources.pods @@ -1,5 +1,5 @@ title: Kubernetes pod resources -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_roles b/checkman/k8s_roles index 50e8cd6..6d79088 100644 --- a/checkman/k8s_roles +++ b/checkman/k8s_roles @@ -1,5 +1,5 @@ title: Kubernetes roles -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_stats.fs b/checkman/k8s_stats.fs index 9089681..c00b8aa 100644 --- a/checkman/k8s_stats.fs +++ b/checkman/k8s_stats.fs @@ -1,5 +1,5 @@ title: Kubernetes node and cluster level filesystem usage -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_stats.network b/checkman/k8s_stats.network index 9006204..76b7140 100644 --- a/checkman/k8s_stats.network +++ b/checkman/k8s_stats.network @@ -1,5 +1,5 @@ title: Kubernetes node and cluster level network usage -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk diff --git a/checkman/k8s_storage_classes b/checkman/k8s_storage_classes index 321c344..b6b41c2 100644 --- a/checkman/k8s_storage_classes +++ b/checkman/k8s_storage_classes @@ -1,5 +1,5 @@ title: Kubernetes storage classes -agents: linux +agents: kubernetes catalog: containerization/kubernetes license: GPL distribution: check_mk

5 years, 3 months

← Newer
1
...
4
5
6
7
8
9
10
...
46
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits March 2019