Checkmk git commits March 2019

checkmk-commits@lists.checkmk.com

17 participants
451 discussions

7049 FIX oracle_logswitches: Fix interchanged lower levels

by Florian Kromer

Module: check_mk Branch: master Commit: 21ef1368047de5560c2a26e181717b0e55143577 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=21ef1368047de5… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Thu Mar 14 09:25:29 2019 +0100 7049 FIX oracle_logswitches: Fix interchanged lower levels Previously the warn and crit levels have been interchanged. This werk fixes this issue. CMK-1784 Change-Id: Iee5bd47f23fc59efc1be76b4675936d7b36f5ff0 --- .werks/7049 | 13 +++++++++++++ checks/oracle_logswitches | 2 +- .../generictests/datasets/oracle_logswitches.py | 22 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.werks/7049 b/.werks/7049 new file mode 100644 index 0000000..316c243 --- /dev/null +++ b/.werks/7049 @@ -0,0 +1,13 @@ +Title: oracle_logswitches: Fix interchanged lower levels +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552551807 +Class: fix + +Previously the warn and crit levels have been interchanged. +This werk fixes this issue. + +CMK-1784 diff --git a/checks/oracle_logswitches b/checks/oracle_logswitches index c9e8399..f3139da 100644 --- a/checks/oracle_logswitches +++ b/checks/oracle_logswitches @@ -44,7 +44,7 @@ def check_oracle_logswitches(item, params, info): if isinstance(params, tuple): params = { 'levels': (params[2], params[3]), - 'levels_lower': (params[1], params[0]), + 'levels_lower': (params[0], params[1]), } for line in info: diff --git a/tests/unit/checks/generictests/datasets/oracle_logswitches.py b/tests/unit/checks/generictests/datasets/oracle_logswitches.py new file mode 100644 index 0000000..5ef7382 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/oracle_logswitches.py @@ -0,0 +1,22 @@ +# yapf: disable + + +checkname = 'oracle_logswitches' + + +info = [['pengt', '15'], ['hirni', '22']] + + +discovery = {'': [('hirni', {}), ('pengt', {})]} + + +checks = {'': [('hirni', + {'levels': (50, 100), 'levels_lower': (20, 15)}, + [(0, + '22 log switches in the last 60 minutes (warn/crit below 15/20) (warn/crit at 50/100)', + [('logswitches', 22, 50, 100, 0, None)])]), + ('pengt', + {'levels': (50, 100), 'levels_lower': (-1, -1)}, + [(0, + '15 log switches in the last 60 minutes (warn/crit below -1/-1) (warn/crit at 50/100)', + [('logswitches', 15, 50, 100, 0, None)])])]}

5 years, 6 months

WK7244: Restricted WATO sidebar snapin only show up to 10+ changes

by Andreas Boesl

Module: check_mk Branch: master Commit: 839b98fb1a50ea9ecc160fccb5bf050436354509 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=839b98fb1a50ea… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Mar 14 12:10:13 2019 +0100 WK7244: Restricted WATO sidebar snapin only show up to 10+ changes Change-Id: Ie5882973ecdf23f525451113a4233b35599e9c7a --- .werks/7244 | 17 +++++++++++++++++ cmk/gui/plugins/sidebar/wato.py | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/.werks/7244 b/.werks/7244 new file mode 100644 index 0000000..ce02d5e --- /dev/null +++ b/.werks/7244 @@ -0,0 +1,17 @@ +Title: Restricted WATO sidebar snapin only show up to 10+ changes +Level: 1 +Component: wato +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1552391861 + +The sidebar snapin and the WATO main page now use the same infotext to display the number of pending changes. +This infotext currently displays only up to 10 changes in detail. Any number above 10 is abstracted with the text <tt>10+ changes</tt>. +The reasoning behind this is, that there may be some sites with thousands of pending changes. +Determining the exact number generally takes some time, hereby slowing down the rending of any page showing this infotext. + + +The <tt>10+ changes</tt> limit may be lifted in the future, once a more performant changes measurement functionality has been introduced. diff --git a/cmk/gui/plugins/sidebar/wato.py b/cmk/gui/plugins/sidebar/wato.py index 1bdeaa7..bdb5317 100644 --- a/cmk/gui/plugins/sidebar/wato.py +++ b/cmk/gui/plugins/sidebar/wato.py @@ -66,9 +66,9 @@ def render_wato(mini): else: iconlink(module.title, url, module.icon) - num_pending = watolib.get_number_of_pending_changes() - if num_pending: - footnotelinks([(_("%d changes") % num_pending, "wato.py?mode=changelog")]) + pending_info = watolib.get_pending_changes_info() + if pending_info: + footnotelinks([(pending_info, "wato.py?mode=changelog")]) html.div('', class_="clear")

5 years, 6 months

6763 FIX if_brocade: Fixed missing graph templates and units for metrics

by Marcel Arentz

Module: check_mk Branch: master Commit: 14afd4e4f5cf985de4464d3f473d9b560d399fab URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=14afd4e4f5cf98… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Wed Mar 13 15:22:32 2019 +0100 6763 FIX if_brocade: Fixed missing graph templates and units for metrics The graph definitions and units for metrics have been missing for interface services of several brocade devices, if they use if_brocade instead of the regular if64 check plugin. This is now fixed. Change-Id: I71015d748a19a46ca3c591f63c66304f830542b8 --- .werks/6763 | 12 ++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 1 + 2 files changed, 13 insertions(+) diff --git a/.werks/6763 b/.werks/6763 new file mode 100644 index 0000000..131ead3 --- /dev/null +++ b/.werks/6763 @@ -0,0 +1,12 @@ +Title: if_brocade: Fixed missing graph templates and units for metrics +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552486810 +Class: fix + +The graph definitions and units for metrics have been missing for interface +services of several brocade devices, if they use if_brocade instead of the +regular if64 check plugin. This is now fixed. diff --git a/cmk/gui/plugins/metrics/check_mk.py b/cmk/gui/plugins/metrics/check_mk.py index 38c4f10..fc1755d 100644 --- a/cmk/gui/plugins/metrics/check_mk.py +++ b/cmk/gui/plugins/metrics/check_mk.py @@ -6120,6 +6120,7 @@ check_metrics["check_mk-if64adm"] = if_translation check_metrics["check_mk-hpux_if"] = if_translation check_metrics["check_mk-if64_tplink"] = if_translation check_metrics["check_mk-if_lancom"] = if_translation +check_metrics["check_mk-if_brocade"] = if_translation check_metrics["check_mk-if"] = if_translation check_metrics["check_mk-lnx_if"] = if_translation check_metrics["check_mk-mcdata_fcport"] = if_translation

5 years, 6 months

agent_azure: prepare for tag based monitoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: 51d5fd11e5caf1ebe7dba7ea75f2102a563165da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=51d5fd11e5caf1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 8 13:17:27 2019 +0100 agent_azure: prepare for tag based monitoring CMK-1420 Change-Id: Ib8fb7556306832957883c7a21905a644c371dbae --- agents/special/agent_azure | 49 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index fa2f8d8..607b853 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -178,6 +178,22 @@ def parse_arguments(argv): parser.add_argument("--secret", required=True, help="Azure authentication secret") # CONSTRAIN DATA TO REQUEST parser.add_argument( + "--require-tag", + default=[], + metavar='TAG', + action='append', + help='''Only monitor resources that have the specified TAG. To require multiple tags, + provide the option more than once.''') + parser.add_argument( + "--require-tag-value", + default=[], + metavar=("TAG", "VALUE"), + nargs=2, + action='append', + help= + '''Only monitor resources that have the specified TAG set to VALUE. To require multiple tags, + provide the option more than once.''') + parser.add_argument( "--explicit-config", default=[], nargs='*', @@ -284,18 +300,48 @@ class ExplicitConfig(object): return "\n".join(str(group) for group in self.groups.values()) +class TagBasedConfig(object): + def __init__(self, required, key_values): + super(TagBasedConfig, self).__init__() + self._required = required + self._values = key_values + + def is_configured(self, resource): + if not all(k in resource.tags for k in self._required): + return False + for key, val in self._values: + if resource.tags.get(key) != val: + return False + return True + + def __str__(self): + lines = [] + if self._required: + lines.append("required tags: %s" % ", ".join(self._required)) + for key, val in self._values: + lines.append("required value for %r: %r" % (key, val)) + return '\n'.join(lines) + + class Selector(object): def __init__(self, args): super(Selector, self).__init__() self._explicit_config = ExplicitConfig(raw_list=args.explicit_config) + self._tag_based_config = TagBasedConfig(args.require_tag, args.require_tag_value) def do_monitor(self, resource): if not self._explicit_config.is_configured(resource): return False + if not self._tag_based_config.is_configured(resource): + return False return True def __str__(self): - return "Explicitly configured:\n%s" % self._explicit_config + lines = [ + "Explicit configuration:\n %s" % str(self._explicit_config).replace("\n", "\n "), + "Tag based configuration:\n %s" % str(self._tag_based_config).replace("\n", "\n "), + ] + return "\n".join(lines) class Section(object): @@ -410,6 +456,7 @@ class AzureResource(object): self.info["subscription"] = match.group(1) self.info["group"] = match.group(2) self.info["provider"] = match.group(3) + self.tags = self.info.get("tags", {}) self.section = resource.type.split('/')[-1].lower() self.piggytargets = [self.info["group"]]

5 years, 6 months

7216 Azure: Select resources by tags

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8397453c82efc1928057f4a5019f5e993d99159a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8397453c82efc1… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 8 13:18:41 2019 +0100 7216 Azure: Select resources by tags You can now use Azure resource tags to decide which azure resources should be included in your monitoring using the datasource programs rule "Microsoft Azure". CMK-1420 Change-Id: I99e6c1ccefe720ca8dd82166d0b301a31cc450b8 --- .werks/7216 | 11 +++++++++++ checks/agent_azure | 7 +++++++ cmk/gui/plugins/wato/datasource_programs.py | 25 +++++++++++++++++++++++++ 3 files changed, 43 insertions(+) diff --git a/.werks/7216 b/.werks/7216 new file mode 100644 index 0000000..9490583 --- /dev/null +++ b/.werks/7216 @@ -0,0 +1,11 @@ +Title: Azure: Select resources by tags +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552049913 +Class: feature + +You can now use Azure resource tags to decide which azure resources should +be included in your monitoring using the datasource programs rule "Microsoft Azure". diff --git a/checks/agent_azure b/checks/agent_azure index 775a670..fbdb560 100644 --- a/checks/agent_azure +++ b/checks/agent_azure @@ -55,6 +55,13 @@ def agent_azure_arguments(params, _no_hostname, _no_ipaddress): if group_resources: args.append("resources=%s" % ",".join(group_resources)) + tag_based = config.get('tag_based', []) + for tag, requirement in tag_based: + if requirement == 'exists': + args += ["--require-tag", tag] + elif isinstance(requirement, tuple) and requirement[0] == 'value': + args += ["--require-tag-value", tag, requirement[1]] + return args diff --git a/cmk/gui/plugins/wato/datasource_programs.py b/cmk/gui/plugins/wato/datasource_programs.py index 2aaba8a..5dc5ae0 100644 --- a/cmk/gui/plugins/wato/datasource_programs.py +++ b/cmk/gui/plugins/wato/datasource_programs.py @@ -1607,6 +1607,7 @@ class RulespecSpecialAgentsAzure(HostRulespec): " resource groups and resources.") % ("12000", "200"), elements=[ ('explicit', self._azure_explicit_config()), + ('tag_based', self._azure_tag_based_config()), ], )), ("piggyback_vms", @@ -1658,6 +1659,30 @@ class RulespecSpecialAgentsAzure(HostRulespec): add_label=_("Add resource group"), ) + def _azure_tag_based_config(self): + return ListOf( + Tuple( + orientation="horizontal", + elements=[ + TextAscii( + title=_('The resource tag'), + allow_empty=False, + ), + CascadingDropdown( + orientation="horizontal", + choices=[ + ('exists', _("exists")), + ('value', _("is"), TextUnicode(title=_('Tag value'), + allow_empty=False)), + ], + ), + ], + ), + title=_('resources matching tag based criteria'), + allow_empty=False, + add_label=_("Add resource tag"), + ) + class MultisiteBiDatasource(object): def get_valuespec(self):

5 years, 6 months

agent_azure: be lazy when formatting selector

by Moritz Kiemer

Module: check_mk Branch: master Commit: 47d3bd928a10b9d13c99942cc1615173b59b3d7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=47d3bd928a10b9… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 8 12:35:45 2019 +0100 agent_azure: be lazy when formatting selector Change-Id: I4ddcb7a12f333df113b02cd9a155553e34911d9d --- agents/special/agent_azure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 47114b1..fa2f8d8 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -612,11 +612,10 @@ def main(argv=None): args = parse_arguments(argv or sys.argv[1:]) selector = Selector(args) - str_config = "Configuration:\n%s\n" % selector if args.dump_config: - sys.stdout.write(str_config) + sys.stdout.write("Configuration:\n%s\n" % selector) return 0 - LOG.debug(str_config) + LOG.debug("%s", selector) try: client = AzureClient(args)

5 years, 6 months

agent_azure: refactor to prepare for tag based monitoring

by Moritz Kiemer

Module: check_mk Branch: master Commit: aa6b73d56d06c4d38ad6a453067345fc30f33a28 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aa6b73d56d06c4… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Fri Mar 8 12:20:07 2019 +0100 agent_azure: refactor to prepare for tag based monitoring Change-Id: I3c376c16fa18eee4cb4e0624a35c91f5c5673dd2 --- agents/special/agent_azure | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 03f3120..47114b1 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -284,6 +284,20 @@ class ExplicitConfig(object): return "\n".join(str(group) for group in self.groups.values()) +class Selector(object): + def __init__(self, args): + super(Selector, self).__init__() + self._explicit_config = ExplicitConfig(raw_list=args.explicit_config) + + def do_monitor(self, resource): + if not self._explicit_config.is_configured(resource): + return False + return True + + def __str__(self): + return "Explicitly configured:\n%s" % self._explicit_config + + class Section(object): SEP = 124 LOCK = Lock() @@ -597,17 +611,16 @@ def write_exception_to_agent_info_section(exception): def main(argv=None): args = parse_arguments(argv or sys.argv[1:]) - config = ExplicitConfig(raw_list=args.explicit_config) - str_config = "Configuration:\n%s\n" % config + selector = Selector(args) + str_config = "Configuration:\n%s\n" % selector if args.dump_config: sys.stdout.write(str_config) return 0 - else: - LOG.debug(str_config) + LOG.debug(str_config) try: client = AzureClient(args) - resources = [r for r in client.discover_resources() if config.is_configured(r)] + resources = [r for r in client.discover_resources() if selector.do_monitor(r)] client.init_specific(resources) write_groups(resources)

5 years, 6 months

7200 FIX check_mail_loop: Fixed 'option --subject not recognized'

by Ronny Bruska

Module: check_mk Branch: master Commit: f50070696ce4b2073b3a520765d56bfafc343a1e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f50070696ce4b2… Author: Ronny Bruska <rb(a)mathias-kettner.de> Date: Thu Mar 14 09:49:32 2019 +0100 7200 FIX check_mail_loop: Fixed 'option --subject not recognized' When used in WATO, the 'subject' parameter was not called correctly in the check command. This has been fixed. Change-Id: Ie76c7ee3942832b5f0c50ae0310d8aaa9f0e3ec4 --- .werks/7200 | 11 +++++++++++ active_checks/check_mail_loop | 1 + checks/check_mail_loop | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.werks/7200 b/.werks/7200 new file mode 100644 index 0000000..82d44b8 --- /dev/null +++ b/.werks/7200 @@ -0,0 +1,11 @@ +Title: check_mail_loop: Fixed 'option --subject not recognized' +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1552553063 +Class: fix + +When used in WATO, the 'subject' parameter was not called correctly in the check command. +This has been fixed. diff --git a/active_checks/check_mail_loop b/active_checks/check_mail_loop index cbf7731..0477bcd 100755 --- a/active_checks/check_mail_loop +++ b/active_checks/check_mail_loop @@ -133,6 +133,7 @@ long_options = [ 'help', 'status-dir=', 'status-suffix=', + 'subject=', "debug", ] diff --git a/checks/check_mail_loop b/checks/check_mail_loop index 0d9a4cc..6ff678f 100644 --- a/checks/check_mail_loop +++ b/checks/check_mail_loop @@ -79,7 +79,7 @@ def check_mail_loop_arguments(params): args += ['--critical=%d' % params['duration'][1]] if 'subject' in params: - args += ' --subject=%s' % quote_shell_string(params['subject']) + args += ['--subject=%s' % params['subject']] return args

5 years, 6 months

Improve selection of Distros and Docker Pull

by Alex Zurhake

Module: check_mk Branch: master Commit: 2167943d4715f600e9ab91df332e5203e0effdd8 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2167943d4715f6… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 14 08:37:50 2019 +0100 Improve selection of Distros and Docker Pull Change-Id: Ief323a0264c35bba4d1563ea9096815060d2c3eb --- buildscripts/scripts/nightly-build.jenkins | 196 +++++++++++++++++------------ 1 file changed, 114 insertions(+), 82 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=2167943d47…

5 years, 6 months

Use 'Parametrized Build' to select distros to build for

by Alex Zurhake

Module: check_mk Branch: master Commit: 58454a0ceef030eb5a17e74692d2a78cd16fb47b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58454a0ceef030… Author: Alex Zurhake <az(a)mathias-kettner.de> Date: Thu Mar 14 08:36:05 2019 +0100 Use 'Parametrized Build' to select distros to build for Change-Id: Ice82c30fd3c6e5525cbac8be9375dfcf2ba6cfd4 --- buildscripts/scripts/nightly-build.jenkins | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/buildscripts/scripts/nightly-build.jenkins b/buildscripts/scripts/nightly-build.jenkins index a405d63..f9c5299 100644 --- a/buildscripts/scripts/nightly-build.jenkins +++ b/buildscripts/scripts/nightly-build.jenkins @@ -1,10 +1,22 @@ import java.text.SimpleDateFormat -def DISTRO_LIST = ["ubuntu-18.04", "centos-6"] +properties([ + parameters([ + string(name: 'DISTROS', defaultValue: DISTRO_LIST_MASTER, description: 'List of targeted distros' ) + ]) +]) + def PACKAGE_BUILDS = [:] def AGENT_LIST = ["linux-64bit", "linux-32bit", "windows" ] def AGENT_BUILDS= [:] +DISTRO_LIST = DISTROS.split(' '); + +println("Building for the following Distros:") +println(DISTRO_LIST) +currentBuild.description = '\nBuilding for the following Distros:\n' + DISTRO_LIST + +def DOCKER_BUILDS = [:] def dateFormat = new SimpleDateFormat("yyyy.MM.dd") def date = new Date() def CMK_VERS = dateFormat.format(date)

5 years, 6 months

← Newer
1
...
23
24
25
26
27
28
29
...
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