Checkmk git commits September 2018

checkmk-commits@lists.checkmk.com

12 participants
371 discussions

Fixed unused-variable warnings in checks/[efgh]*.

by Sven Panne

6 years

Add missing context button link from views/ dashboards to custom snapins list page

by Lars Michelsen

Module: check_mk Branch: master Commit: a210fdca5aaa53c0bab2c802745ffbf3281286c0 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a210fdca5aaa53… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Sep 11 18:45:23 2018 +0200 Add missing context button link from views/dashboards to custom snapins list page Change-Id: Ieb73294c97ca425efce2d0cebb29bf20e4fd7c09 --- cmk/gui/visuals.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmk/gui/visuals.py b/cmk/gui/visuals.py index de060b2..ce1688a 100644 --- a/cmk/gui/visuals.py +++ b/cmk/gui/visuals.py @@ -377,6 +377,8 @@ def page_list(what, title, visuals, custom_columns = None, html.context_button(_("Graph tunings"), "graph_tunings.py", "graph_tuning") if pagetypes.has_page_type("sla_configuration"): html.context_button(_("SLAs"), "sla_configurations.py", "sla_configuration") + if pagetypes.has_page_type("custom_snapin"): + html.context_button(_("Custom snapins"), "custom_snapins.py", "custom_snapin") html.context_button(_("Bookmark lists"), "bookmark_lists.py", "bookmark_list") html.end_context_buttons()

6 years

Fixed unused-variable warnings in checks/[mnop]*.

by Sven Panne

6 years

6593 FIX sylo: Fixed missing performance data 'IN' and 'OUT' rates

by Simon Betz

Module: check_mk Branch: master Commit: daf0ccb716b68de360db486cd0fc08847f61536d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=daf0ccb716b68d… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 11:21:25 2018 +0200 6593 FIX sylo: Fixed missing performance data 'IN' and 'OUT' rates Change-Id: I7deba2bd3e64cd6abe30dd4bf5ed20faf4c6afe3 --- .werks/6593 | 10 ++++++++++ checks/sylo | 19 ++++--------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/.werks/6593 b/.werks/6593 new file mode 100644 index 0000000..cd26b43 --- /dev/null +++ b/.werks/6593 @@ -0,0 +1,10 @@ +Title: sylo: Fixed missing performance data 'IN' and 'OUT' rates +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536830433 +Class: fix + + diff --git a/checks/sylo b/checks/sylo index 325a5e3..ed43e3c 100644 --- a/checks/sylo +++ b/checks/sylo @@ -86,30 +86,19 @@ def check_sylo(item, params, info): used_mb = bytesUsed / (1024 * 1024.0) # Rates for input and output - rate_output = '' - rate_perfdata = [ ('in', 0.0), ('out', 0.0) ] - in_rate = get_rate("sylo.in", mtime, inOffset) out_rate = get_rate("sylo.out", mtime, outOffset) - rate_output = ', (in %.1f B/s, out %.1f B/s)' % (in_rate, out_rate) - rate_pefdata = [ ('in', '%f' % in_rate ), - ('out', '%f' % out_rate ) ] - - msg += "Silo is filled %.1fMB (%.1f%%)%s" % \ - (bytesUsed / (1024*1024.0), percUsed, rate_output) + msg += "Silo is filled %.1fMB (%.1f%%), in %.1f B/s, out %.1f B/s" % \ + (bytesUsed / (1024*1024.0), percUsed, in_rate, out_rate) - # CRIT/WARN: Filled up status = 0 if percUsed >= crit and status < 2: status = 2 elif percUsed >= warn and status < 1: status = 1 - perfdata = rate_perfdata + [ - ('used', '%f' % used_mb, warn_mb, crit_mb, 0, size_mb) - ] - - return (status, msg, perfdata) + return status, msg, [('in', '%f' % in_rate), ('out', '%f' % out_rate), + ('used', '%f' % used_mb, warn_mb, crit_mb, 0, size_mb)] return (3, "Invalid hint file contents: " % info)

6 years

6465 cisco_stack: New check to monitor the status of Cisco stack switches

by Konstantin Büttner

Module: check_mk Branch: master Commit: ec55fff26bd471dab52d15608fbe017a4278f589 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ec55fff26bd471… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Tue Sep 11 15:32:30 2018 +0200 6465 cisco_stack: New check to monitor the status of Cisco stack switches Change-Id: I46afa65886d1ef0f7bd2a8d0edfac7c397cbc5aa --- .werks/6465 | 10 +++ checkman/cisco_stack | 13 ++++ checks/cisco_stack | 121 +++++++++++++++++++++++++++++++ cmk/gui/plugins/wato/check_parameters.py | 26 +++++++ 4 files changed, 170 insertions(+) diff --git a/.werks/6465 b/.werks/6465 new file mode 100644 index 0000000..475ce4f --- /dev/null +++ b/.werks/6465 @@ -0,0 +1,10 @@ +Title: cisco_stack: New check to monitor the status of Cisco stack switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536672721 +Class: feature + + diff --git a/checkman/cisco_stack b/checkman/cisco_stack new file mode 100644 index 0000000..0f65218 --- /dev/null +++ b/checkman/cisco_stack @@ -0,0 +1,13 @@ +title: CISCO Stack Switches: Stack Switch States +agents: snmp +catalog: hw/network/cisco +license: GPL +distribution: check_mk +description: + This check monitors the stack states of switches. + +item: + The stack switch number. + +inventory: + One service per switch is created. diff --git a/checks/cisco_stack b/checks/cisco_stack new file mode 100644 index 0000000..319de05 --- /dev/null +++ b/checks/cisco_stack @@ -0,0 +1,121 @@ +#!/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. + + +factory_settings["cisco_stack"] = { + "waiting" : 0, + "progressing" : 0, + "added" : 0, + "ready" : 0, + "sdmMismatch" : 1, + "verMismatch" : 1, + "featureMismatch" : 1, + "newMasterInit" : 0, + "provisioned" : 0, + "invalid" : 2, + "removed" : 2, +} + + +def parse_cisco_stack(info): + + switch_state_names = { + "1" : "waiting", + "2" : "progressing", + "3" : "added", + "4" : "ready", + "5" : "sdmMismatch", + "6" : "verMismatch", + "7" : "featureMismatch", + "8" : "newMasterInit", + "9" : "provisioned", + "10" : "invalid", + "11" : "removed", + } + + switch_role_names = { + "1" : "master", + "2" : "member", + "3" : "notMember", + } + + parsed = {} + for line in info: + parsed[line[0]] = { + "switch_role" : switch_role_names.get(line[1], "unknown"), + "switch_state" : switch_state_names.get(line[2], "unknown"), + } + return parsed + + +def inventory_cisco_stack(parsed): + for item in parsed: + yield item, {} + + +def check_cisco_stack(item, params, parsed): + + switch_state_descriptions = { + "waiting" : "Waiting for other switches to come online", + "progressing" : "Master election or mismatch checks in progress", + "added" : "Added to stack", + "ready" : "Ready", + "sdmMismatch" : "SDM template mismatch", + "verMismatch" : "OS version mismatch", + "featureMismatch" : "Configured feature mismatch", + "newMasterInit" : "Waiting for new master initialization", + "provisioned" : "Not an active member of the stack", + "invalid" : "State machine in invalid state", + "removed" : "Removed from stack", + } + + data = parsed.get(item) + if data is None: + return + + switch_state = data["switch_state"] + switch_role = data["switch_role"] + + status = params.get(data["switch_state"], 3) + infotext = "Switch state: %s (%s), switch role: %s" % (switch_state_descriptions.get(switch_state, "Unknown"), + switch_state, switch_role) + return status, infotext + + +check_info['cisco_stack'] = { + 'default_levels_variable' : 'cisco_stack', + 'parse_function' : parse_cisco_stack, + 'inventory_function' : inventory_cisco_stack, + 'check_function' : check_cisco_stack, + 'service_description' : 'Switch stack status %s', + 'snmp_info' : ('.1.3.6.1.4.1.9.9.500.1.2.1.1', [ + "1", # cswSwitchNumCurrent + "3", # cswSwitchRole + "6", # cswSwitchState + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0").startswith(".1.3.6.1.4.1.9.1.1208"), + 'group' : 'cisco_stack', +} diff --git a/cmk/gui/plugins/wato/check_parameters.py b/cmk/gui/plugins/wato/check_parameters.py index d9fe3bc..086c13c 100755 --- a/cmk/gui/plugins/wato/check_parameters.py +++ b/cmk/gui/plugins/wato/check_parameters.py @@ -891,6 +891,32 @@ register_check_parameters( "dict", ) +register_check_parameters( + subgroup_networking, + "cisco_stack", + _("Cisco Stack Switch Status"), + Dictionary( + elements=[ + ("waiting", MonitoringState(title=_(u"waiting"), default_value=0, help=_(u"Waiting for other switches to come online"))), + ("progressing", MonitoringState(title=_(u"progressing"), default_value=0, help=_(u"Master election or mismatch checks in progress"))), + ("added", MonitoringState(title=_(u"added"), default_value=0, help=_(u"Added to stack"))), + ("ready", MonitoringState(title=_(u"ready"), default_value=0, help=_(u"Ready"))), + ("sdmMismatch", MonitoringState(title=_(u"sdmMismatch"), default_value=1, help=_(u"SDM template mismatch"))), + ("verMismatch", MonitoringState(title=_(u"verMismatch"), default_value=1, help=_(u"OS version mismatch"))), + ("featureMismatch", MonitoringState(title=_(u"featureMismatch"), default_value=1, help=_(u"Configured feature mismatch"))), + ("newMasterInit", MonitoringState(title=_(u"newMasterInit"), default_value=0, help=_(u"Waiting for new master initialization"))), + ("provisioned", MonitoringState(title=_(u"provisioned"), default_value=0, help=_(u"Not an active member of the stack"))), + ("invalid", MonitoringState(title=_(u"invalid"), default_value=2, help=_(u"State machine in invalid state"))), + ("removed", MonitoringState(title=_(u"removed"), default_value=2, help=_(u"Removed from stack"))), + ], + optional_keys=[], + ), + TextAscii( + title=_("Switch number"), + ), + "dict", +) + #. # .--Inventory-----------------------------------------------------------. # | ___ _ |

6 years

snmp_uptime: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 101b8978944454ae765e2fcf9c9d3c022832d7c7 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=101b8978944454… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 11:06:39 2018 +0200 snmp_uptime: Minor cleanup Change-Id: Iab8ae3eb6bf1681b0907e892aa2e796bc2257d8a --- checks/snmp_info | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/snmp_info b/checks/snmp_info index ce9e66b..4b0a627 100644 --- a/checks/snmp_info +++ b/checks/snmp_info @@ -42,5 +42,5 @@ check_info["snmp_info"] = { 'inventory_function': inventory_snmp_info, 'service_description': 'SNMP Info', 'snmp_info': ('.1.3.6.1.2.1.1', ['1.0', '4.0', '5.0', '6.0']), - 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.1.0") != None, + 'snmp_scan_function': lambda oid: oid(".1.3.6.1.2.1.1.1.0") is not None, }

6 years

Docker container progress

by Lars Michelsen

Module: check_mk Branch: master Commit: 58a33183273c9d66de32e462073f9b38fcc19050 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58a33183273c9d… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Thu Sep 13 07:54:22 2018 +0200 Docker container progress * Verify GPG signature of Check_MK packages * Try to fix the update test Change-Id: I9b15f84c07d534c81061d1e76e93567576a8ed1a --- docker/Dockerfile | 8 ++++++-- tests/docker/test_docker.py | 12 ++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index e570fa1..db1684d 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -41,6 +41,8 @@ RUN set -e \ postfix \ inetutils-syslogd \ bsd-mailx \ + gnupg2 \ + dpkg-sig \ $(cat needed-packages) \ && apt-get clean \ && rm /usr/sbin/policy-rc.d \ @@ -48,9 +50,9 @@ RUN set -e \ && rm needed-packages # Now install the Check_MK version specific things -# TODO: Verify gpg signature # hadolint ignore=DL3003,DL3008,DL4006 RUN set -e \ + && mkdir -p /usr/share/man/man8 \ && echo "exit 101" > /usr/sbin/policy-rc.d \ && chmod +x /usr/sbin/policy-rc.d \ && export DEBIAN_FRONTEND=noninteractive \ @@ -58,7 +60,9 @@ RUN set -e \ && PKG_FILE="${PKG_NAME}_0.stretch_$(dpkg --print-architecture).deb" \ && echo "--user \"${CMK_DL_CREDENTIALS}\"" \ | curl -o "${PKG_FILE}" -K - "${CMK_DL_URL}/${CMK_VERSION}/${PKG_FILE}" \ - && mkdir -p /usr/share/man/man8 \ + && curl -sS "${CMK_DL_URL}/Check_MK-pubkey.gpg" \ + | gpg -q --import \ + && dpkg-sig --verify "${PKG_FILE}" \ && dpkg -i "${PKG_FILE}" \ && rm -f "${PKG_FILE}" \ && apt-get clean \ diff --git a/tests/docker/test_docker.py b/tests/docker/test_docker.py index b2ec081..62d68a6 100644 --- a/tests/docker/test_docker.py +++ b/tests/docker/test_docker.py @@ -98,7 +98,7 @@ def _build(request, client, edition, version, add_args=None): u'6557/tcp': {}, } - assert attrs["Size"] < 830000000 + assert attrs["Size"] < 840000000 assert len(attrs["RootFS"]["Layers"]) == 5 @@ -243,10 +243,12 @@ def test_start_enable_mail(request, client): def test_update(request, client): container_name="%s-monitoring" % branch_name + # Pick a random old version that we can use to the setup the initial site with + # Later this site is being updated to the current daily build old_version = testlib.CMKVersion( version="1.5.0p3", edition=testlib.CMKVersion.CEE, - branch=branch_name + branch="1.5.0", ) # 1. create container with old version and add a file to mark the pre-update state @@ -258,14 +260,16 @@ def test_update(request, client): # 2. stop the container c_orig.stop() - # 3. start intermediate container + # 3. start intermediate container in the background and keep it running. + # Don't use the regular startup procedure (which would start the site). Use + # read to wait for termination of the container edition = "enterprise" _build(request, client, edition, build_version) c_tmp = client.containers.run( name="%s-update" % container_name, image=_image_name(edition, build_version), detach=True, - command=["bash", "-c", "echo HI ; sleep 30"], + command=["bash", "-c", "echo HI ; read"], stdin_open=True, volumes_from=c_orig.id, )

6 years

uptime.include: Minor cleanup

by Simon Betz

Module: check_mk Branch: master Commit: 463bdd48c550a553185dda76678d0e714a71acb1 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=463bdd48c550a5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 10:43:33 2018 +0200 uptime.include: Minor cleanup Change-Id: I8f72b94a6b09c83e3f20900bb70a647327160227 --- checks/uptime.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/uptime.include b/checks/uptime.include index f37f309..c9080de 100644 --- a/checks/uptime.include +++ b/checks/uptime.include @@ -99,7 +99,7 @@ snmp_uptime_info = ('.1.3.6.1.2.1', [ def snmp_scan_uptime(oid): - return oid(".1.3.6.1.2.1.1.1.0") != None + return oid(".1.3.6.1.2.1.1.1.0") is not None def inventory_snmp_uptime(info):

6 years

Fixed unused-variable warnings in checks/[ijkl]*.

by Sven Panne

6 years

6589 FIX ibm_svc_mdiskgrp: Fixed disregarded provisioning state

by Simon Betz

Module: check_mk Branch: master Commit: 8c33211561f11fb90cca817e628bef315af4afa6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8c33211561f11f… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Sep 13 09:01:18 2018 +0200 6589 FIX ibm_svc_mdiskgrp: Fixed disregarded provisioning state Change-Id: I3680fea968c3574cd36ba0b2470133e2e2dfed5b --- .werks/6589 | 10 ++++++++++ checks/ibm_svc_mdiskgrp | 13 +++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.werks/6589 b/.werks/6589 new file mode 100644 index 0000000..a50e12a --- /dev/null +++ b/.werks/6589 @@ -0,0 +1,10 @@ +Title: ibm_svc_mdiskgrp: Fixed disregarded provisioning state +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1536822012 +Class: fix + + diff --git a/checks/ibm_svc_mdiskgrp b/checks/ibm_svc_mdiskgrp index 98e9a1d..e08002d 100644 --- a/checks/ibm_svc_mdiskgrp +++ b/checks/ibm_svc_mdiskgrp @@ -98,15 +98,20 @@ def check_ibm_svc_mdiskgrp(item, params, info): # Compute provisioning if not capacity: return # provisioning does not make sense when capacity is 0 + provisioning = 100.0 * virtual_capacity / capacity + infotext = "Provisioning: %s" % get_percent_human_readable(provisioning) + state = 0 if "provisioning_levels" in params: warn, crit = params["provisioning_levels"] if provisioning >= crit: state = 2 elif provisioning >= warn: state = 1 - else: - state = 0 + if state: + infotext += " (warn/crit at %s/%s)" % ( + get_percent_human_readable(warn), + get_percent_human_readable(crit)) warn_mb = capacity * mb * warn / 100 crit_mb = capacity * mb * crit / 100 else: @@ -115,8 +120,8 @@ def check_ibm_svc_mdiskgrp(item, params, info): # Note: Performance data is now (with new metric system) normed to # canonical units - i.e. 1 byte in this case. - yield 0, "Provisioning: %s" % get_percent_human_readable(provisioning), \ - [ ( "fs_provisioning", virtual_capacity*mb, warn_mb, crit_mb, 0, capacity * mb) ] + yield state, infotext, [("fs_provisioning", virtual_capacity*mb, + warn_mb, crit_mb, 0, capacity * mb)]

6 years

← Newer
1
...
20
21
22
23
24
25
26
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits September 2018