Checkmk git commits January 2018

checkmk-commits@lists.checkmk.com

10 participants
255 discussions

5270 Improved Agent Updater Check behaviour

by Andreas Umbreit

Module: check_mk Branch: master Commit: 385dd2ad304c8a03dfeeb38bdd3958b970ebba62 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=385dd2ad304c8a… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Tue Jan 16 08:06:12 2018 +0100 5270 Improved Agent Updater Check behaviour Formerly, the Agent Updater Check did not update immediately after a manual action on the host. This could lead to some confusion. Notably, you had to wait for the next update cycle to have a successful Agent registration displayed within the Check. In order to mitigate this situation, the Agent Updater now: - Invalidates the cache file age after registration in order to have an Update executed with next Check_MK Agent execution - Updates the cachefile information after a successful manual update. The latter action is not performed in --debug option mode. Information about the cachefile updates will be displayed in -vv mode Change-Id: I0ab67a938faebcf5abb06c6c336880b1b4710de1 --- .werks/5270 | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.werks/5270 b/.werks/5270 new file mode 100644 index 0000000..92f52ec --- /dev/null +++ b/.werks/5270 @@ -0,0 +1,23 @@ +Title: Improved Agent Updater Check behaviour +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.5.0i3 +Date: 1516085347 +Class: feature + +Formerly, the Agent Updater Check did not update immediately after a manual action on the host. This could lead to some confusion. +Notably, you had to wait for the next update cycle to have a successful Agent registration displayed within the Check. + + +In order to mitigate this situation, the Agent Updater now: + +- Invalidates the cache file age after registration in order to have an Update executed with next Check_MK Agent execution + +- Updates the cachefile information after a successful manual update. + +The latter action is not performed in --debug option mode. + + +Information about the cachefile updates will be displayed in -vv mode \ No newline at end of file

6 years, 8 months

Windows agent: integration tests for mrpe include

by Jukka Aro

Module: check_mk Branch: master Commit: 38c1bee9fc6e85f066a2718559bb6e9dd28fbac6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38c1bee9fc6e85… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 18 11:38:58 2018 +0100 Windows agent: integration tests for mrpe include Change-Id: I3503a7d00dd32c3dcd88cfd278536fdeba90cd9c --- agents/windows/it/test_section_check_mk.py | 1 + agents/windows/it/test_section_mrpe.py | 73 ++++++++++++++++++++---------- 2 files changed, 51 insertions(+), 23 deletions(-) diff --git a/agents/windows/it/test_section_check_mk.py b/agents/windows/it/test_section_check_mk.py index 6f60372..46aeb20 100644 --- a/agents/windows/it/test_section_check_mk.py +++ b/agents/windows/it/test_section_check_mk.py @@ -131,5 +131,6 @@ def test_section_check_mk(request, testconfig, expected_output, actual_output, def test_section_check_mk__no_tcp(request, testconfig, expected_output, actual_output_no_tcp, testfile): + # request.node.name gives test name remotetest(testconfig, expected_output, actual_output_no_tcp, testfile, request.node.name) diff --git a/agents/windows/it/test_section_mrpe.py b/agents/windows/it/test_section_mrpe.py index 01298ca..530bfbc 100644 --- a/agents/windows/it/test_section_mrpe.py +++ b/agents/windows/it/test_section_mrpe.py @@ -7,10 +7,14 @@ from remote import (actual_output, assert_subprocess, config, remote_ip, write_config) -section = 'mrpe' -pluginname = 'check_crit.bat' -checkname = 'Dummy' -mrpedir = 'mrpe' +class Globals(object): + section = 'mrpe' + pluginname = 'check_crit.bat' + checkname = 'Dummy' + mrpedir = 'mrpe' + includedir = 'testinclude' + cfgfile = 'test.cfg' + newline = None @pytest.fixture @@ -20,11 +24,16 @@ def testfile(): @pytest.fixture def testconfig(config): - config.set("global", "sections", section) + config.set("global", "sections", Globals.section) config.set("global", "crash_debug", "yes") - config.add_section(section) - config.set(section, 'check', '%s %s' % (checkname, - os.path.join(mrpedir, pluginname))) + config.add_section(Globals.section) + if Globals.newline is None: + config.set(Globals.section, 'check', '%s %s' % + (Globals.checkname, + os.path.join(Globals.mrpedir, Globals.pluginname))) + else: + config.set(Globals.section, "include", + os.path.join(Globals.includedir, Globals.cfgfile)) return config @@ -32,33 +41,51 @@ def testconfig(config): def expected_output(): drive = r'[A-Z]:%s' % re.escape(os.sep) return [ - re.escape(r'<<<%s>>>' % section), - r'$%s$ %s 2 CRIT - This check is always critical' % (pluginname, - checkname) + re.escape(r'<<<%s>>>' % Globals.section), + r'$%s$ %s 2 CRIT - This check is always critical' % + (Globals.pluginname, Globals.checkname) ] -(a)pytest.fixture(autouse=True) -def manage_plugin(): +(a)pytest.fixture( + params=[None, False, True], + ids=['direct', 'include_without_newline', 'include_with_newline'], + autouse=True) +def manage_plugin(request): + Globals.newline = request.param + plugindir = (Globals.mrpedir + if Globals.newline is None else Globals.includedir) source = os.path.join( - os.path.dirname(os.path.dirname(os.path.abspath(__file__))), mrpedir, - pluginname) - targetdir = os.path.join(remotedir, mrpedir) + os.path.dirname(os.path.dirname(os.path.abspath(__file__))), + Globals.mrpedir, Globals.pluginname) + targetdir = os.path.join(remotedir, plugindir) targetdir_windows = targetdir.replace('/', '\\') if platform.system() != 'Windows': cmds = [[ - 'ssh', - sshopts, + 'ssh', sshopts, '%s@%s' % (remoteuser, remote_ip), 'if not exist %s md %s' % (targetdir_windows, targetdir_windows) - ], ['scp', sshopts, source, - '%s@%s:%s' % (remoteuser, remote_ip, targetdir)]] + ], [ + 'scp', sshopts, source, + '%s@%s:%s' % (remoteuser, remote_ip, targetdir) + ]] for cmd in cmds: assert_subprocess(cmd) + elif Globals.newline is not None: + with open(os.path.join(targetdir, Globals.cfgfile), 'wb') as cfg: + cfg.write("check = %s %s%s" % + (Globals.checkname, + os.path.join(targetdir_windows, Globals.pluginname), + "\n" if Globals.newline else "")) yield if platform.system() == 'Windows': - os.unlink(os.path.join(targetdir, pluginname)) + os.unlink(os.path.join(targetdir, Globals.pluginname)) + if Globals.newline is not None: + os.unlink(os.path.join(targetdir, Globals.cfgfile)) -def test_section_mrpe(testconfig, expected_output, actual_output, testfile): - remotetest(testconfig, expected_output, actual_output, testfile) +def test_section_mrpe(request, testconfig, expected_output, actual_output, + testfile): + # request.node.name gives test name + remotetest(testconfig, expected_output, actual_output, testfile, + request.node.name)

6 years, 8 months

5689 FIX Newline in mrpe include file crashed Windows agent

by Jukka Aro

Module: check_mk Branch: master Commit: 2a24c3696daf1944b69121f29da72eca68ab0318 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2a24c3696daf19… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Thu Jan 18 11:33:32 2018 +0100 5689 FIX Newline in mrpe include file crashed Windows agent A newline character in a file included through the mrpe configuration option <tt>include</tt> (see Werk #266) put Windows agent into an eternal loop. Change-Id: I28018d8a9f88c96e0013c62895374e32f573342c --- .werks/5689 | 15 +++++++++++++++ agents/windows/build_version | 2 +- agents/windows/sections/SectionMRPE.cc | 8 +------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/.werks/5689 b/.werks/5689 new file mode 100644 index 0000000..5154085 --- /dev/null +++ b/.werks/5689 @@ -0,0 +1,15 @@ +Title: Newline in mrpe include file crashed Windows agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516267515 +Class: fix + +A newline character in a file included through the mrpe configuration +option <tt>include</tt> (see Werk #266) put Windows agent into an +eternal loop. + + + diff --git a/agents/windows/build_version b/agents/windows/build_version index 4ac94f0..27be29d 100644 --- a/agents/windows/build_version +++ b/agents/windows/build_version @@ -1 +1 @@ -3068 +3070 diff --git a/agents/windows/sections/SectionMRPE.cc b/agents/windows/sections/SectionMRPE.cc index 0fcd1e4..184400a 100644 --- a/agents/windows/sections/SectionMRPE.cc +++ b/agents/windows/sections/SectionMRPE.cc @@ -52,14 +52,8 @@ void SectionMRPE::updateIncludes() { } lineno = 0; - while (!feof(file)) { + while (fgets(line, sizeof(line), file) != nullptr) { lineno++; - if (!fgets(line, sizeof(line), file)) { - printf("intern clse\n"); - fclose(file); - continue; - } - char *l = strip(line); if (l[0] == 0 || l[0] == '#' || l[0] == ';') continue; // skip empty lines and comments

6 years, 8 months

Fixed path to temporary Boost installation.

by Sven Panne

Module: check_mk Branch: master Commit: 78d71a8d79a57f245389eb9eaf77796a0f0ecfcd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=78d71a8d79a57f… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Thu Jan 18 09:30:48 2018 +0100 Fixed path to temporary Boost installation. We should really include Makefile.omd in our toplevel Makefile, the amount of copy-n-paste is way too high... :-/ Change-Id: Ie5e12035907734bc0b9bdb71f2904a20c19d7736 --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 989130b..c0e227a 100644 --- a/Makefile +++ b/Makefile @@ -416,10 +416,10 @@ config.status: $(DIST_DEPS) echo "update config.status by reconfiguring in the same conditions" ; \ ./config.status --recheck; \ else \ - if test -d ../boost/local ; then \ - BOOST_OPT="--with-boost=$(abspath ../boost/local)" ; \ - elif test -d omd/packages/boost/local ; then \ - BOOST_OPT="--with-boost=$(abspath omd/packages/boost/local)" ; \ + if test -d ../boost/destdir ; then \ + BOOST_OPT="--with-boost=$(abspath ../boost/destdir)" ; \ + elif test -d omd/packages/boost/destdir ; then \ + BOOST_OPT="--with-boost=$(abspath omd/packages/boost/destdir)" ; \ elif test ! -d /usr/include/boost -a -d /usr/include/boost141/boost ; then \ BOOST_OPT="CPPFLAGS=-I/usr/include/boost141" ; \ else \

6 years, 8 months

checktestlib: Extend docstring

by Konstantin Büttner

Module: check_mk Branch: master Commit: a286003cd6c88f031ce4abeef3fb666e170fcb2e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a286003cd6c88f… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Wed Jan 17 17:38:20 2018 +0100 checktestlib: Extend docstring Change-Id: Ie7259737305bd6e0f1cbb28bc047569a12183af8 --- tests/checks/checktestlib.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/checks/checktestlib.py b/tests/checks/checktestlib.py index ab1aa68..3a30989 100644 --- a/tests/checks/checktestlib.py +++ b/tests/checks/checktestlib.py @@ -73,6 +73,14 @@ class CheckResult(object): """ A check result potentially consisting of multiple subresults, as returned by yield-style checks + + Initializing test results using this has the following advantages: + -Some basic consistency checks are being performed, making sure the + check's result conforms to the API + -A common interface to test assertions is provided, regardless of whether + or not the check uses subresults via the yield-API + -The check's code is being run, and doesn't disappear in the yield-APIs + generator-induced laziness. """ def __init__(self, result):

6 years, 8 months

5651 FIX Fixed agent TCP connect timeout being used for whole communication (1.5.0i2 regression)

by Lars Michelsen

Module: check_mk Branch: master Commit: dd048d6b8a83ea3f984d90e905d931d8146b7bc8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=dd048d6b8a83ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 17 11:57:06 2018 +0100 5651 FIX Fixed agent TCP connect timeout being used for whole communication (1.5.0i2 regression) The configurable "Agent TCP connect timeout" was used not only for the connect phase of the TCP connection. This lead to many timeout messages like "agent:myhost:12.16.11.42: timed out". Change-Id: Iff28663cbc8542181844d90b05387fb701321958 --- .werks/5651 | 11 +++++++++++ cmk_base/data_sources/tcp.py | 8 ++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/.werks/5651 b/.werks/5651 new file mode 100644 index 0000000..9f552c2 --- /dev/null +++ b/.werks/5651 @@ -0,0 +1,11 @@ +Title: Fixed agent TCP connect timeout being used for whole communication (1.5.0i2 regression) +Level: 1 +Component: core +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1516186453 +Class: fix + +The configurable "Agent TCP connect timeout" was used not only for the connect phase of +the TCP connection. This lead to many timeout messages like "agent:myhost:12.16.11.42: timed out". diff --git a/cmk_base/data_sources/tcp.py b/cmk_base/data_sources/tcp.py index f827855..215d58b 100644 --- a/cmk_base/data_sources/tcp.py +++ b/cmk_base/data_sources/tcp.py @@ -96,12 +96,16 @@ class TCPDataSource(CheckMKAgentDataSource): s = socket.socket(socktype, socket.SOCK_STREAM) timeout = self._get_timeout(hostname) - s.settimeout(timeout) output = [] - self._logger.debug("[%s] Connecting via TCP to %s:%d (%ss timeout)" % (self.id(), ipaddress, port, s.gettimeout())) + self._logger.debug("[%s] Connecting via TCP to %s:%d (%ss timeout)" % (self.id(), ipaddress, port, timeout)) try: + s.settimeout(timeout) s.connect((ipaddress, port)) + s.settimeout(None) + + self._logger.debug("[%s] Reading data from agent" % (self.id())) + while True: data = s.recv(4096, socket.MSG_WAITALL)

6 years, 8 months

5613 Auxiliary tags: New column 'Tags using this auxiliary tag' shows related tag group

by Simon Betz

Module: check_mk Branch: master Commit: 25df498cdf22c95e012a5a71bd6ce2f08a5a8a89 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=25df498cdf22c9… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 12 10:16:26 2018 +0100 5613 Auxiliary tags: New column 'Tags using this auxiliary tag' shows related tag group Change-Id: I418aa24fd1d440a672569a702b078461099291cb --- .werks/5613 | 10 ++++++++++ web/htdocs/wato.py | 20 +++++++++++++++----- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.werks/5613 b/.werks/5613 new file mode 100644 index 0000000..5cdf184 --- /dev/null +++ b/.werks/5613 @@ -0,0 +1,10 @@ +Title: Auxiliary tags: New column 'Tags using this auxiliary tag' shows related tag group +Level: 1 +Component: multisite +Compatible: compat +Edition: cre +Version: 1.5.0i3 +Date: 1515748506 +Class: feature + + diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 3e4fe68..ad7fd76 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -11749,6 +11749,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): def __init__(self): super(ModeHostTags, self).__init__() self._hosttags, self._auxtags = self._load_hosttags() + self._effective_tag_groups = watolib.get_effective_tag_groups(self._hosttags) def title(self): @@ -11877,13 +11878,11 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): empty_text = _("You haven't defined any tag groups yet."), searchable = False, sortable = False) - tag_groups = watolib.get_effective_tag_groups(self._hosttags) - - if not tag_groups: + if not self._effective_tag_groups: table.end() return - for nr, entry in enumerate(tag_groups): + for nr, entry in enumerate(self._effective_tag_groups): tag_id, title, choices = entry[:3] # fourth: tag dependency information topic, title = map(_u, watolib.parse_hosttag_title(title)) table.row() @@ -11898,7 +11897,7 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): else: html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(-nr))]), _("Move this tag group one position up"), "up") - if nr == len(tag_groups) - 1: + if nr == len(self._effective_tag_groups) - 1: html.empty_icon_button() else: html.icon_button(make_action_link([("mode", "hosttags"), ("_move", str(nr))]), @@ -11948,9 +11947,20 @@ class ModeHostTags(WatoMode, watolib.HosttagsConfiguration): table.text_cell(_("Title"), _u(title)) table.text_cell(_("Topic"), _u(topic) or '') + table.text_cell(_("Tags using this auxiliary tag"), + ", ".join(self._get_tags_using_aux_tag(self._effective_tag_groups, tag_id))) table.end() + def _get_tags_using_aux_tag(self, tag_groups, aux_tag): + used_tags = set() + for tag_def in tag_groups: + for entry in tag_def[2]: + if aux_tag in entry[-1]: + used_tags.add(tag_def[1].split("/")[-1]) + return sorted(used_tags) + + class ModeEditHosttagConfiguration(WatoMode): def __init__(self):

6 years, 8 months

Do a two-step build for re2 to get a local version-independent DESTDIR.

by Sven Panne

Module: check_mk Branch: master Commit: 70ba4b2fd2efad0e50b25a5a4364086f8e415bc6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=70ba4b2fd2efad… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 17 12:25:24 2018 +0100 Do a two-step build for re2 to get a local version-independent DESTDIR. Change-Id: I7f57fa0a64f066dbd8fb5731b13d114434dc315b --- omd/Makefile.omd | 11 +++++++++++ omd/packages/re2/.gitignore | 2 +- omd/packages/re2/Makefile | 5 +++-- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index dea9cdf..37d5782 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -72,6 +72,17 @@ check-freetds: exit 1 ; \ fi +# re2 ######################################################################### + +PACKAGE_RE2_DESTDIR := $(PACKAGE_BASE)/re2/destdir + +check-re2: + @if [ ! -d $(PACKAGE_RE2_DESTDIR) ]; then \ + echo "ERROR: You need to build the \"re2\" package first" ; \ + exit 1 ; \ + fi + + # python-module ################################################################ PACKAGE_PYTHON_MODULES_DESTDIR := $(PACKAGE_BASE)/python-modules/destdir diff --git a/omd/packages/re2/.gitignore b/omd/packages/re2/.gitignore index 78d22c2..f615a1a 100644 --- a/omd/packages/re2/.gitignore +++ b/omd/packages/re2/.gitignore @@ -1,2 +1,2 @@ -dest/ +destdir/ re2-20??-??-01/ diff --git a/omd/packages/re2/Makefile b/omd/packages/re2/Makefile index 0dd8293..7bf32f1 100644 --- a/omd/packages/re2/Makefile +++ b/omd/packages/re2/Makefile @@ -24,11 +24,12 @@ build: echo "no"; IFS=$$SAVED_IFS ; \ done ; \ test -z "$$CXX" && { echo "error: no C++ compiler found" >&2 ; exit 1; } ; \ - $(MAKE) -C $(DIR) CXX="$$CXX" DESTDIR=$(abspath dest) prefix=$(OMD_ROOT) install + $(MAKE) -C $(DIR) CXX="$$CXX" prefix=$(OMD_ROOT) && \ + $(MAKE) -C $(DIR) CXX="$$CXX" DESTDIR=$(PACKAGE_RE2_DESTDIR) prefix="" install install: skel: clean: - rm -rf $(DIR) dest + rm -rf $(DIR) $(PACKAGE_RE2_DESTDIR)

6 years, 8 months

5447 fjdarye500_ca_ports: New checks monitor IOps and throughput of Fujitsu storage CA ports

by Simon Betz

Module: check_mk Branch: master Commit: d841e8d7be97bac4693b30db6140d93f1be77d25 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d841e8d7be97ba… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Nov 23 18:41:49 2017 +0100 5447 fjdarye500_ca_ports: New checks monitor IOps and throughput of Fujitsu storage CA ports Change-Id: Ibba38c6ffc81070dae490ddba82b1d80eb0a3944 --- .werks/5447 | 14 +++++ checkman/fjdarye500_ca_ports | 18 ++++++ checks/fjdarye500_ca_ports | 112 +++++++++++++++++++++++++++++++++++ web/plugins/wato/check_parameters.py | 23 +++++++ 4 files changed, 167 insertions(+) diff --git a/.werks/5447 b/.werks/5447 new file mode 100644 index 0000000..e850e17 --- /dev/null +++ b/.werks/5447 @@ -0,0 +1,14 @@ +Title: fjdarye500_ca_ports: New checks monitor IO and throughput of Fujitsu storage CA ports +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.5.0i2 +Date: 1511458802 +Class: feature + +By default CA ports in mode 'CA' and 'CARA' are discovered. +Moreover port indices can be configured in the related +discovery rule 'Discovery of Fujtsu storage CA ports'. +There are no hints in the SNMP data which ports are active +thus the above rule may be useful. diff --git a/checkman/fjdarye500_ca_ports b/checkman/fjdarye500_ca_ports new file mode 100644 index 0000000..eec18ea --- /dev/null +++ b/checkman/fjdarye500_ca_ports @@ -0,0 +1,18 @@ +title: Fujitsu storage systems: CA ports +agents: snmp +catalog: hw/storagehw/fujitsu +license: GPL +distribution: check_mk +description: + This check monitors the CA ports of Fujitsu storage systems + which support the FJDARY-E150-SNMPV2.MIB like the ETERNUS DX500 S3. + + In the discovery rule 'Discovery of Fujtsu storage CA ports' + port indices and port modes are configurable. + By default CA ports in mode 'CA' and 'CARA' are discovered. + +item: + The CA port index. + +inventory: + One service per port is created. diff --git a/checks/fjdarye500_ca_ports b/checks/fjdarye500_ca_ports new file mode 100644 index 0000000..b1edaef --- /dev/null +++ b/checks/fjdarye500_ca_ports @@ -0,0 +1,112 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2017 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. + + +inventory_fujitsu_ca_ports = [] + + +def parse_fjdarye500_ca_ports(info): + map_modes = { + "11": "CA", + "12": "RA", + "13": "CARA", + "20": "Initiator", + } + + parsed = {} + for index, mode, read_iops, write_iops, read_mb, write_mb in info: + mode_readable = map_modes[mode] + port = parsed.setdefault(index, { + "mode": mode_readable, + "read_ios": int(read_iops), + "read_throughput": int(read_mb) * 1024**2, + }) + if mode_readable != "Initiator": + port.update({ + "write_ios": int(write_iops), + "write_throughput": int(write_mb) * 1024**2, + }) + return parsed + + +def inventory_fjdarye500_ca_ports(parsed): + settings = host_extra_conf_merged(host_name(), inventory_fujitsu_ca_ports) + indices = settings.get('indices') + modes = settings.get('modes', ['CA', 'CARA']) + for index, attrs in parsed.iteritems(): + if indices and index not in indices: + continue + if modes and attrs['mode'] not in modes: + continue + yield index, {} + + +def check_fjdarye500_ca_ports(item, params, parsed): + if item in parsed: + mode = parsed[item]["mode"] + yield 0, "Mode: %s" % mode + for state, infotext, perfdata in check_diskstat_dict(item, params, parsed): + if infotext and "Read: " in infotext and mode in ["CARA", "Initiator"]: + infotext.replace("Read: ", "Initiator: ") + if infotext and "Write: " in infotext and mode == "CARA": + infotext.replace("Write: ", "Target: ") + yield state, infotext, perfdata + + +check_info['fjdarye500_ca_ports'] = { + 'parse_function' : parse_fjdarye500_ca_ports, + 'inventory_function' : inventory_fjdarye500_ca_ports, + 'check_function' : check_fjdarye500_ca_ports, + 'service_description' : 'CA Port IO %s', + 'snmp_info' : ('.1.3.6.1.4.1.211.1.21.1.150.5.5.2.1', [ + # fjdaryPfCaPortRdIOPS + # "This shows the READ IOPS for the CA,CARA mode. + # The Initiator IOPS is shown for RA,Initiator mode." + # fjdaryPfCaPortWtIOPS + # "This shows the WRITE IOPS for the CA,CARA mode. + # The Target IOPS is shown for the RA mode. + # This information is an invalid value for the Initiator mode." + # fjdaryPfCaPortRdTp + # "This shows the amount of the READ Throughput for the CA,CARA mode. + # The Initiator Throughput is shown for RA,Initiator mode. + # The unit is MB/sec." + # fjdaryPfCaPortWtTp + # "This shows the amount of the WRITE Throughput for the CA,CARA mode. + # The Target Throughput is shown for the RA mode. + # The unit is MB/sec. + # This information is an invalid value for the Initiator mode." + '1', # FJDARY-E150::fjdaryPfCaPortIndex + '2', # FJDARY-E150::fjdaryPfCaPortMode + '3', # FJDARY-E150::fjdaryPfCaPortRdIOPS + '4', # FJDARY-E150::fjdaryPfCaPortWtIOPS + '5', # FJDARY-E150::fjdaryPfCaPortRdTp + '6', # FJDARY-E150::fjdaryPfCaPortWtTp + ]), + 'snmp_scan_function' : lambda oid: oid(".1.3.6.1.2.1.1.2.0") == ".1.3.6.1.4.1.211.1.21.1.150", + 'has_perfdata' : True, + 'group' : 'diskstat', + 'includes' : ['diskstat.include'] +} diff --git a/web/plugins/wato/check_parameters.py b/web/plugins/wato/check_parameters.py index d9557a8..df192cf 100644 --- a/web/plugins/wato/check_parameters.py +++ b/web/plugins/wato/check_parameters.py @@ -1588,6 +1588,29 @@ register_rule(group + '/' + subgroup_inventory, match = "dict", ) +register_rule( + "%s/%s" % (group, subgroup_inventory), + varname="inventory_fujitsu_ca_ports", + title=_("Discovery of Fujtsu storage CA ports"), + valuespec=Dictionary( + elements=[ + ("indices", ListOfStrings(title=_("CA port indices"))), + ("modes", DualListChoice( + title=_("CA port modes"), + choices=[ + ("CA", _("CA")), + ("RA", _("RA")), + ("CARA", _("CARA")), + ("Initiator", _("Initiator")), + ], + row=4, + size=30, + )), + ], + ), + match="dict", +) + #. # .--Applications--------------------------------------------------------. # | _ _ _ _ _ |

6 years, 8 months

Cleaned up Boost build.

by Sven Panne

Module: check_mk Branch: master Commit: 1aceb6ebb5ae6847879b76b357136363daec4cf8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=1aceb6ebb5ae68… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 17 11:44:44 2018 +0100 Cleaned up Boost build. Change-Id: I17ca54c40931f823c0fa54bffb1e2a1dbf79ffe6 --- omd/Makefile.omd | 32 +++++++++++++++++++++----------- omd/packages/boost/Makefile | 14 +++++++------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/omd/Makefile.omd b/omd/Makefile.omd index b6d5fa1..dea9cdf 100644 --- a/omd/Makefile.omd +++ b/omd/Makefile.omd @@ -7,6 +7,8 @@ else REPO_PATH := $(abspath ..) endif +PACKAGE_BASE := $(REPO_PATH)/omd/packages + EDITION := raw EDITION_SHORT := cre ifneq (,$(wildcard $(REPO_PATH)/enterprise)) @@ -35,18 +37,18 @@ DISTRO_INFO := $(shell $(REPO_PATH)/omd/distro) DISTRO_NAME := $(word 1, $(DISTRO_INFO)) DISTRO_VERSION := $(word 2, $(DISTRO_INFO)) -# Depending on the distro we include a Makefile with distro- -# specific variables +# Depending on the distro we include a Makefile with distro-specific variables. include $(REPO_PATH)/omd/distros/$(DISTRO_NAME)_$(DISTRO_VERSION).mk -# Net result -> all Makefiles have now access to the linux distribution -# specific settings +# perl ######################################################################### + +PERL := /usr/bin/perl +PACKAGE_PERL_MODULES_DESTDIR := $(PACKAGE_BASE)/perl-modules/destdir +PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 -PERL := /usr/bin/perl -PACKAGE_PERL_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/perl-modules/destdir -PACKAGE_PERL_MODULES_PERL5LIB := $(PACKAGE_PERL_MODULES_DESTDIR)/dest/lib/perl5 +# python ####################################################################### -PACKAGE_PYTHON_DESTDIR := $(REPO_PATH)/omd/packages/python/destdir +PACKAGE_PYTHON_DESTDIR := $(PACKAGE_BASE)/python/destdir PACKAGE_PYTHON_PYTHONPATH := $(PACKAGE_PYTHON_DESTDIR)/lib/python2.7 PACKAGE_PYTHON_LDFLAGS := -L$(PACKAGE_PYTHON_DESTDIR)/lib -L$(PACKAGE_PYTHON_PYTHONPATH)/config PACKAGE_PYTHON_LD_LIBRARY_PATH := $(PACKAGE_PYTHON_DESTDIR)/lib @@ -59,8 +61,10 @@ check-python: exit 1 ; \ fi -PACKAGE_FREETDS_DESTDIR := $(REPO_PATH)/omd/packages/freetds/destdir -PACKAGE_FREETDS_LDFLAGS := -L$(PACKAGE_FREETDS_DESTDIR)/lib +# freetds ##################################################################### + +PACKAGE_FREETDS_DESTDIR := $(PACKAGE_BASE)/freetds/destdir +PACKAGE_FREETDS_LDFLAGS := -L$(PACKAGE_FREETDS_DESTDIR)/lib check-freetds: @if [ ! -d $(PACKAGE_FREETDS_DESTDIR) ]; then \ @@ -68,7 +72,9 @@ check-freetds: exit 1 ; \ fi -PACKAGE_PYTHON_MODULES_DESTDIR := $(REPO_PATH)/omd/packages/python-modules/destdir +# python-module ################################################################ + +PACKAGE_PYTHON_MODULES_DESTDIR := $(PACKAGE_BASE)/python-modules/destdir PACKAGE_PYTHON_MODULES_PYTHONPATH := $(PACKAGE_PYTHON_MODULES_DESTDIR)/lib check-python-modules: @@ -76,3 +82,7 @@ check-python-modules: echo "ERROR: You need to build the \"python-modules\" package first" ; \ exit 1 ; \ fi + +# perl ######################################################################### + +PACKAGE_BOOST_DESTDIR := $(PACKAGE_BASE)/boost/destdir diff --git a/omd/packages/boost/Makefile b/omd/packages/boost/Makefile index de84fd4..d5cc223 100644 --- a/omd/packages/boost/Makefile +++ b/omd/packages/boost/Makefile @@ -7,9 +7,9 @@ DIR := $(NAME)_$(VERSION) # For some obscure reason (GCC's dual ABI) we have to link all Boost stuff # statically, otherwise we get linker errors later, e.g.: # -# .../packages/boost/local/lib/libboost_system.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_create(unsigned long&, unsigned long)(a)GLIBCXX_3.4.21' -# .../packages/boost/local/lib/libboost_system.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()@GLIBCXX_3.4.21' -# .../packages/boost/local/lib/libboost_system.so: undefined reference to `operator delete(void*, unsigned long)(a)CXXABI_1.3.9' +# .../packages/boost/destdir/lib/libboost_system.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_create(unsigned long&, unsigned long)(a)GLIBCXX_3.4.21' +# .../packages/boost/destdir/lib/libboost_system.so: undefined reference to `std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::~basic_string()@GLIBCXX_3.4.21' +# .../packages/boost/destdir/lib/libboost_system.so: undefined reference to `operator delete(void*, unsigned long)(a)CXXABI_1.3.9' # # For more details about the dual ABI see: # @@ -40,16 +40,16 @@ build: check-python export LDFLAGS="$(PACKAGE_PYTHON_LDFLAGS)" ; \ export LD_LIBRARY_PATH="$(PACKAGE_PYTHON_LD_LIBRARY_PATH)" ; \ ./bootstrap.sh \ - "--prefix=$(shell pwd)/local" \ - --without-libraries=graph,locale,log,math,program_options,regex,serialization,wave \ + "--prefix=$(PACKAGE_BOOST_DESTDIR)" \ + "--without-libraries=graph,locale,log,math,program_options,regex,serialization,wave" \ "--with-python=$(PACKAGE_PYTHON_EXECUTABLE)" && \ ./b2 $(B2_LINK_OPTION) cxxflags=-fPIC cflags=-fPIC -j2 install ) install: mkdir -p $(DESTDIR)$(OMD_ROOT)/lib - find local/lib -name "*.so*" -exec cp -v {} $(DESTDIR)$(OMD_ROOT)/lib \; + find $(PACKAGE_BOOST_DESTDIR)/lib -name "*.so*" -exec cp -v {} $(DESTDIR)$(OMD_ROOT)/lib \; skel: clean: - rm -rf $(DIR) local + rm -rf $(DIR) $(PACKAGE_BOOST_DESTDIR)

6 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
26
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2018