Checkmk git commits April 2019

checkmk-commits@lists.checkmk.com

15 participants
599 discussions

mk_mysql: Filter after mysqld when detecting instance names

by Óscar Nájera

Module: check_mk Branch: master Commit: 9230a05fd5bb01cfe076560bb2228ddfc6350577 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9230a05fd5bb01… Author: Óscar Nájera <on(a)mathias-kettner.de> Date: Wed Apr 17 15:13:46 2019 +0200 mk_mysql: Filter after mysqld when detecting instance names - Remove too unnecessary grep regex trick as ps already filters after process - Fix queries to instances specifying socket input Change-Id: I72c96ea227ab3dd065939ce202524499778a8100 --- agents/plugins/mk_mysql | 28 ++++++++++------------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index 117fc6c..31f781b 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -25,14 +25,14 @@ # gets optional socket as argument function do_query() { - SOCKET="$1" - COUNT=$(ps -fww -C mysqld | grep socket | wc -l) + MYSQLDPS=$(ps -fww -C mysqld | grep -- --socket=$1) + COUNT=$(echo $MYSQLDPS | wc -l) if [ $COUNT -gt 1 ] then - INSTANCE_NAME=$(ps -efww|grep socket|grep "${SOCKET}"|grep "[u]ser" | sed -ne 's/.*socket=$[^.]*$.*/\1/p') + INSTANCE_NAME=$(echo $MYSQLDPS | sed -ne 's/.*socket=$[^.]*$.*/\1/p') INSTANCE_NAME="[[${INSTANCE_NAME##*/}]]" else - INSTANCE_NAME="[[$(ps -efww|grep socket|grep "${SOCKET}"|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" + INSTANCE_NAME="[[$(echo $MYSQLDPS | sed -ne 's/.*user=$[^ ]*$.*/\1/p')]]" fi @@ -40,24 +40,24 @@ function do_query() { # Check if mysqld is running and root password setup echo "<<<mysql_ping>>>" echo $INSTANCE_NAME - mysqladmin --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 ping 2>&1 + mysqladmin --defaults-extra-file=$MK_CONFDIR/mysql.cfg --socket=$1 ping 2>&1 if [ $? -eq 0 ]; then echo "<<<mysql>>>" echo $INSTANCE_NAME - mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -sN \ + mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg --socket=$1 -sN \ -e "show global status ; show global variables ;" echo "<<<mysql_capacity>>>" echo $INSTANCE_NAME - mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -sN \ + mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg --socket=$1 -sN \ -e "SELECT table_schema, sum(data_length + index_length), sum(data_free) FROM information_schema.TABLES GROUP BY table_schema" echo "<<<mysql_slave>>>" echo $INSTANCE_NAME - mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -s \ + mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg --socket=$1 -s \ -e "show slave status\G" fi @@ -68,7 +68,7 @@ if which mysqladmin >/dev/null then mysql_sockets=$(fgrep socket $MK_CONFDIR/mysql.cfg|sed -ne 's/.*socket=$[^ ]*$.*/\1/p') if [ -z "$mysql_sockets" ] ; then - mysql_sockets=$(ps -fww -C mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') + mysql_sockets=$(ps -fww -C mysqld | grep "socket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') fi if [ -z "$mysql_sockets" ] ; then do_query "" @@ -77,16 +77,8 @@ then do_query "$socket" done fi - #echo "<<<mysql_version>>>" - #mysql -V echo "<<<mysql_port>>>" - ps -fww -C mysqld |while read LINE; do echo $LINE|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|grep mysqld | grep "[p]ort"|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 - - #echo "<<<mysql_instances>>>" - #mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -s \ - # -e "show INSTANCES" + ps -fww -C mysqld |while read LINE; do echo $LINE| sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 fi - -

5 years, 5 months

6989 FIX Fix timestamp handling for events generated by rules expecting regular messages

by Konstantin Büttner

Module: check_mk Branch: master Commit: df4da272c12144b62426924591869982aa773693 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=df4da272c12144… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Apr 18 13:00:42 2019 +0200 6989 FIX Fix timestamp handling for events generated by rules expecting regular messages Due to the event being rewritten at every new occurence in the case of expect rules, the timestamp for the event's first occurence would always equal the one for the last, making it useless. This has been fixed. CMK-1843 Change-Id: Ie6bf99f19ae2bb31d1b4f6d99f62cdcc49601137 --- .werks/6989 | 13 +++++++++++++ cmk/ec/main.py | 7 ++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.werks/6989 b/.werks/6989 new file mode 100644 index 0000000..c2d3def --- /dev/null +++ b/.werks/6989 @@ -0,0 +1,13 @@ +Title: Fix timestamp handling for events generated by rules expecting regular messages +Level: 1 +Component: ec +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1555511063 + +Due to the event being rewritten at every new occurence in the case of expect rules, +the timestamp for the event's first occurence would always equal the one for the +last, making it useless. This has been fixed. diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 71d7add..26f86d0 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1286,7 +1286,7 @@ class EventServer(ECServerThread): merge_event["text"] = text # Better rewrite (again). Rule might have changed. Also we have changed # the text and the user might have his own text added via set_text. - self.rewrite_event(rule, merge_event, {}) + self.rewrite_event(rule, merge_event, {}, set_first=False) self._history.add(merge_event, "COUNTFAILED") else: # Create artifical event from scratch. Make sure that all important @@ -1685,7 +1685,7 @@ class EventServer(ECServerThread): return result # Rewrite texts and compute other fields in the event - def rewrite_event(self, rule, event, groups): + def rewrite_event(self, rule, event, groups, set_first=True): if rule["state"] == -1: prio = event["priority"] if prio >= 5: @@ -1708,7 +1708,8 @@ class EventServer(ECServerThread): if ("sl" not in event) or (rule["sl"]["precedence"] == "rule"): event["sl"] = rule["sl"]["value"] - event["first"] = event["time"] + if set_first: + event["first"] = event["time"] event["last"] = event["time"] if "set_comment" in rule: event["comment"] = replace_groups(rule["set_comment"], event["text"], groups)

5 years, 5 months

7454 oracle_rman_backups: This check is deprecated

by Simon Betz

Module: check_mk Branch: master Commit: 2dfc0f725d737ad526ffdc45d1f18ef18c2cf44a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2dfc0f725d737a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 12:06:11 2019 +0200 7454 oracle_rman_backups: This check is deprecated Please update the agent plugin {{mk_oracle}} and rediscover the affected hosts. Change-Id: Ie3628e3b48f0bc5713788f00ee3caacf296b4fe8 --- .werks/7454 | 11 +++++++++++ checks/oracle_rman_backups | 40 ++-------------------------------------- 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/.werks/7454 b/.werks/7454 new file mode 100644 index 0000000..2917a02 --- /dev/null +++ b/.werks/7454 @@ -0,0 +1,11 @@ +Title: oracle_rman_backups: This check is deprecated +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555581921 +Class: feature + +Please update the agent plugin {{mk_oracle}} and rediscover the affected hosts. +This check has been replaced by the {{oracle_rman}} check plugin. diff --git a/checks/oracle_rman_backups b/checks/oracle_rman_backups index 1b97e68..488df8f 100644 --- a/checks/oracle_rman_backups +++ b/checks/oracle_rman_backups @@ -24,49 +24,13 @@ # to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, # Boston, MA 02110-1301 USA. -# <<<oracle_rman_backups>>> -# IODBSZ1 2013-04-08T16:33:53 COMPLETED 2013-04-08_16:33:54 2013-04-08_17:56:42 DB FULL -# IODBSZ1 2013-04-23T15:28:26 RUNNING 2013-04-23_15:28:28 2013-04-23_15:31:02 ARCHIVELOG - def inventory_oracle_rman_backups(info): - inventory = [] - for line in info: - if line[1] != "FAILURE" and " ".join(line[5:]) in ('ARCHIVELOG', 'DB FULL', 'DB INCR'): - inventory.append(("%s.%s" % (line[0], " ".join(line[5:])), {})) - return inventory + return def check_oracle_rman_backups(item, params, info): - try: - sid, jobname = item.split('.') - except ValueError: - return (3, 'Invalid check item given (must be <SID>.<job_name>)') - - data = None - for line in info: - if line[0] == sid and " ".join(line[5:]) == jobname: - data = line - break - if not data: - return (3, 'Unable to find the job') - - state = 0 - output = [] - - job_state = data[2] - - txt = "State: %s" % job_state - if job_state not in ["COMPLETED", "RUNNING"]: - txt += " (!!)" - state = max(state, 2) - output.append(txt) - - output.append("Start-Time: %s" % data[3]) - if job_state != "RUNNING": - output.append("End-Time: %s" % data[4]) - - return (state, ", ".join(output)) + return 1, "This check is deprecated. Please update the mk_oracle agent plugin" check_info['oracle_rman_backups'] = {

5 years, 5 months

local: make testable and add test

by Moritz Kiemer

Module: check_mk Branch: master Commit: cea45be58b4c92f902baf85256574b50f6a92d54 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cea45be58b4c92… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Apr 18 10:50:23 2019 +0200 local: make testable and add test Change-Id: I6064a90f6abb0c3f3c4a11a54e65ada6016761d1 --- checks/local | 15 ++--- checks/mrpe | 17 +---- checks/parse_nagios.include | 42 ++++++++++++ tests/unit/checks/generictests/datasets/local_1.py | 76 ++++++++++++++++++++++ 4 files changed, 125 insertions(+), 25 deletions(-) diff --git a/checks/local b/checks/local index 7a64587..ad1317f 100644 --- a/checks/local +++ b/checks/local @@ -123,16 +123,10 @@ def _parse_local_line(line): compute_data = [] if perftxt != "-": for entry in perftxt.split('|'): - try: - varname, valuetxt = entry.split('=') - values = valuetxt.split(';') - compute_data.append(tuple([varname] + values)) - # perfdata must not contain values with colons. So we split - # these values and use the upper levels only. - upper_values = [v.split(':')[-1] for v in values] - perfdata.append(tuple([varname] + upper_values)) - - except ValueError: + new_perf = parse_nagios_perfstring(entry) + if new_perf: + perfdata.append(new_perf) + else: return 3, "Invalid performance data %s in local check output %s" % \ (perftxt, " ".join(line)), [] @@ -208,4 +202,5 @@ check_info["local"] = { 'has_perfdata': True, 'node_info': True, 'group': 'local', + 'includes': ['parse_nagios.include'] } diff --git a/checks/mrpe b/checks/mrpe index 2187904..66738ae 100644 --- a/checks/mrpe +++ b/checks/mrpe @@ -62,20 +62,6 @@ def parse_mrpe(info): return parsed -def mrpe_parse_perfdata(perfinfo): - if '=' not in perfinfo: - return None - varname, valuetxt = perfinfo.split("=", 1) - values = valuetxt.split(";") - try: - return tuple([varname] + [int(v) for v in values]) - except ValueError: - try: - return tuple([varname] + [float(v) for v in values]) - except ValueError: - return tuple([varname] + values) - - @get_parsed_item_data def check_mrpe(_no_item, _no_params, data): # This check is cluster-aware. An item might be found @@ -105,7 +91,7 @@ def check_mrpe(_no_item, _no_params, data): perf_parsed = [] for perfvalue in perfdata: - new_perf = mrpe_parse_perfdata(perfvalue) + new_perf = parse_nagios_perfstring(perfvalue) if new_perf: perf_parsed.append(new_perf) @@ -121,4 +107,5 @@ check_info["mrpe"] = { 'check_function': check_mrpe, 'service_description': '%s', 'has_perfdata': True, + 'includes': ['parse_nagios.include'], } diff --git a/checks/parse_nagios.include b/checks/parse_nagios.include new file mode 100644 index 0000000..c943e09 --- /dev/null +++ b/checks/parse_nagios.include @@ -0,0 +1,42 @@ +#!/usr/bin/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 parse_nagios_perfstring(perfinfo): + if '=' not in perfinfo: + return None + varname, valuetxt = perfinfo.split("=", 1) + values = valuetxt.split(";") + # perfdata must not contain values with colons. So we split + # these values and use the upper levels only. + values = [v.split(':')[-1] for v in values] + try: + return tuple([varname] + [int(v) for v in values]) + except ValueError: + try: + return tuple([varname] + [float(v) for v in values]) + except ValueError: + return tuple([varname] + values) diff --git a/tests/unit/checks/generictests/datasets/local_1.py b/tests/unit/checks/generictests/datasets/local_1.py new file mode 100644 index 0000000..ca8afd7 --- /dev/null +++ b/tests/unit/checks/generictests/datasets/local_1.py @@ -0,0 +1,76 @@ +# yapf: disable + + +checkname = 'local' + + +info = [ + ['node_1', '0', 'Service_FOO', 'V=1', 'This', 'Check', 'is', 'OK'], + ['node_1', '1', 'Bar_Service', '-', 'This', 'is', 'WARNING', 'and', 'has', 'no', + 'performance', 'data'], + ['node_1', '2', 'NotGood', 'V=120;50;100;0;1000', 'A', 'critical', 'check'], + ['node_1', 'P', 'Some_other_Service', 'value1=10;30;50|value2=20;10:20;0:50;0;100', + 'Result', 'is', 'computed', 'from', 'two', 'values'], + ['node_1', 'P', 'This_is_OK', 'foo=18;20;50'], + ['node_1', 'P', 'Some_yet_other_Service', 'temp=40;30;50|humidity=28;50:100;0:50;0;100'], + ['node_2', 'P', 'Has-no-var', '-', 'This', 'has', 'no', 'variable'], + ['node_2', 'P', 'No-Text', 'hirn=-8;-20'], +] + + +discovery = { + '': [ + ('Bar_Service', {}), + ('Has-no-var', {}), + ('No-Text', {}), + ('NotGood', {}), + ('Service_FOO', {}), + ('Some_other_Service', {}), + ('Some_yet_other_Service', {}), + ('This_is_OK', {}), + ], +} + + +checks = { + '': [ + ('Bar_Service', {}, [ + (1, 'On node node_1: This is WARNING and has no performance data', []), + ]), + ('Has-no-var', {}, [ + (0, 'On node node_2: This has no variable', []), + ]), + ('No-Text', {}, [ + (0, 'On node node_2: ', [ + ('hirn', -8, -20, None, None, None), + ]), + ]), + ('NotGood', {}, [ + (2, 'On node node_1: A critical check', [ + ('V', 120, 50, 100, 0, 1000), + ]), + ]), + ('Service_FOO', {}, [ + (0, 'On node node_1: This Check is OK', [ + ('V', 1, None, None, None, None), + ]), + ]), + ('Some_other_Service', {}, [ + (0, 'On node node_1: Result is computed from two values', [ + ('value1', 10, 30, 50, None, None), + ('value2', 20, 20, 50, 0, 100), + ]), + ]), + ('Some_yet_other_Service', {}, [ + (0, 'On node node_1: ', [ + ('temp', 40, 30, 50, None, None), + ('humidity', 28, 100, 50, 0, 100), + ]), + ]), + ('This_is_OK', {}, [ + (0, 'On node node_1: ', [ + ('foo', 18, 20, 50, None, None), + ]), + ]), + ], +}

5 years, 5 months

Reserved 20 Werk IDS

by Simon Betz

Module: check_mk Branch: master Commit: 5cace1f313097c9356c7902db421ebdd1463c582 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5cace1f313097c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 12:05:12 2019 +0200 Reserved 20 Werk IDS Change-Id: Ief28244ca4d00988cb755d2ccd36c8064004a31a --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 4e81df2..0f8012e 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -7454 +7474

5 years, 5 months

check_mk_agent.aix: remove fi if

by Moritz Kiemer

Module: check_mk Branch: master Commit: 01f568d79f0f1c4de91944504953afe075df335d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=01f568d79f0f1c… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 17 11:23:53 2019 +0200 check_mk_agent.aix: remove fi if Change-Id: I7e08f7d1b71020deb11353e05256ff2f716d30c6 --- agents/check_mk_agent.aix | 3 --- 1 file changed, 3 deletions(-) diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index 1081fb8..a678c5c 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,9 +124,6 @@ function run_cached { if (( $MTIME < $MAXAGE )) ; then USE_CACHE_FILE=1 fi - fi - if [ -s "$CACHE_FILE" ] - then cat $CACHE_FILE fi if [ -z "$USE_CACHE_FILE" -a ! -e "$CACHE_FILE.new" ]

5 years, 5 months

agent_aws: Prepare summary and labels section for ELB and ELBv2

by Simon Betz

Module: check_mk Branch: master Commit: 56c7b855373db78bd566ff21c21fdc2691470c7b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=56c7b855373db7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 09:21:35 2019 +0200 agent_aws: Prepare summary and labels section for ELB and ELBv2 Change-Id: Ica723bdd373513451f824e2412ba77a9bd23f18b --- cmk/special_agents/agent_aws.py | 29 ++++++++++++++-------- .../unit/cmk/special_agents/test_agent_aws_elb.py | 9 ++++--- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/cmk/special_agents/agent_aws.py b/cmk/special_agents/agent_aws.py index f9d884d..d9c335b 100644 --- a/cmk/special_agents/agent_aws.py +++ b/cmk/special_agents/agent_aws.py @@ -1581,22 +1581,24 @@ class ELBLimits(AWSSectionLimits): return AWSComputedContent(load_balancers, raw_content.cache_timestamp) -class ELBSummary(AWSSectionGeneric): - def __init__(self, client, region, config, distributor=None): - super(ELBSummary, self).__init__(client, region, config, distributor=distributor) - self._names = self._config.service_config['elb_names'] - self._tags = self._prepare_tags_for_api_response(self._config.service_config['elb_tags']) +class ELBSummaryGeneric(AWSSectionGeneric): + def __init__(self, client, region, config, distributor=None, resource=""): + self._resource = resource + super(ELBSummaryGeneric, self).__init__(client, region, config, distributor=distributor) + self._names = self._config.service_config['%s_names' % resource] + self._tags = self._prepare_tags_for_api_response( + self._config.service_config['%s_tags' % resource]) @property def name(self): - return "elb_summary" + return "%s_summary" % self._resource @property def interval(self): return 300 def _get_colleague_contents(self): - colleague = self._received_results.get('elb_limits') + colleague = self._received_results.get('%s_limits' % self._resource) if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents([], 0.0) @@ -1653,13 +1655,17 @@ class ELBSummary(AWSSectionGeneric): return [AWSSectionResult("", computed_content.content.values())] -class ELBLabels(AWSSectionLabels): +class ELBLabelsGeneric(AWSSectionLabels): + def __init__(self, client, region, config, distributor=None, resource=""): + super(ELBLabelsGeneric, self).__init__(client, region, config, distributor=distributor) + self._resource = resource + @property def interval(self): return 300 def _get_colleague_contents(self): - colleague = self._received_results.get('elb_summary') + colleague = self._received_results.get('%s_summary' % self._resource) if colleague and colleague.content: return AWSColleagueContents(colleague.content, colleague.cache_timestamp) return AWSColleagueContents({}, 0.0) @@ -2583,7 +2589,8 @@ class AWSSectionsGeneric(AWSSections): ebs_summary = EBSSummary(ec2_client, region, config, ebs_summary_distributor) elb_limits = ELBLimits(elb_client, region, config, elb_limits_distributor) - elb_summary = ELBSummary(elb_client, region, config, elb_summary_distributor) + elb_summary = ELBSummaryGeneric( + elb_client, region, config, elb_summary_distributor, resource='elb') elbv2_limits = ELBv2Limits(elbv2_client, region, config, elbv2_limits_distributor) @@ -2602,7 +2609,7 @@ class AWSSectionsGeneric(AWSSections): ebs = EBS(cloudwatch_client, region, config) - elb_labels = ELBLabels(elb_client, region, config) + elb_labels = ELBLabelsGeneric(elb_client, region, config, resource='elb') elb_health = ELBHealth(elb_client, region, config) elb = ELB(cloudwatch_client, region, config) diff --git a/tests/unit/cmk/special_agents/test_agent_aws_elb.py b/tests/unit/cmk/special_agents/test_agent_aws_elb.py index 0f8798e..f30faa2 100644 --- a/tests/unit/cmk/special_agents/test_agent_aws_elb.py +++ b/tests/unit/cmk/special_agents/test_agent_aws_elb.py @@ -6,8 +6,8 @@ from cmk.special_agents.agent_aws import ( AWSConfig, ResultDistributor, ELBLimits, - ELBSummary, - ELBLabels, + ELBSummaryGeneric, + ELBLabelsGeneric, ELBHealth, ELB, ) @@ -397,8 +397,9 @@ def test_agent_aws_elb_result_distribution(tags, found_instances, found_instance elb_summary_distributor = ResultDistributor() elb_limits = ELBLimits(fake_elb_client, region, config, elb_limits_distributor) - elb_summary = ELBSummary(fake_elb_client, region, config, elb_summary_distributor) - elb_labels = ELBLabels(fake_elb_client, region, config) + elb_summary = ELBSummaryGeneric( + fake_elb_client, region, config, elb_summary_distributor, resource='elb') + elb_labels = ELBLabelsGeneric(fake_elb_client, region, config, resource='elb') elb_health = ELBHealth(fake_elb_client, region, config) elb = ELB(fake_cloudwatch_client, region, config)

5 years, 5 months

7402 check_mk_agent: Plugins cache age info in section header

by Moritz Kiemer

Module: check_mk Branch: master Commit: aca7b7eac4d27e9d343d3c72146ab71e5e299e80 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=aca7b7eac4d27e… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Apr 17 13:08:32 2019 +0200 7402 check_mk_agent: Plugins cache age info in section header For plugins running asynchronously the cache age information is now included in the section header. Services corresponding to outdated plugin sections will become stale. Affected agents: AIX, freebsd, linux, openwrt, solaris CMK-1313 Change-Id: I27e75d60d027160c3fa6462eb92b7626f93d8952 --- .werks/7402 | 12 ++++++++++++ agents/check_mk_agent.aix | 5 ++++- agents/check_mk_agent.freebsd | 5 ++++- agents/check_mk_agent.linux | 5 ++++- agents/check_mk_agent.openwrt | 5 ++++- agents/check_mk_agent.solaris | 5 ++++- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/.werks/7402 b/.werks/7402 new file mode 100644 index 0000000..2368f92 --- /dev/null +++ b/.werks/7402 @@ -0,0 +1,12 @@ +Title: check_mk_agent: Plugins cache age info in section header +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1555498273 +Class: feature + +For plugins running asynchronously the cache age information is now included in +the section header. Services corresponding to outdated plugin sections will +become stale. diff --git a/agents/check_mk_agent.aix b/agents/check_mk_agent.aix index a678c5c..a2c1b94 100755 --- a/agents/check_mk_agent.aix +++ b/agents/check_mk_agent.aix @@ -124,7 +124,10 @@ function run_cached { if (( $MTIME < $MAXAGE )) ; then USE_CACHE_FILE=1 fi - cat $CACHE_FILE + CACHE_INFO=":cached($MTIME,$MAXAGE)" + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHE_FILE" fi if [ -z "$USE_CACHE_FILE" -a ! -e "$CACHE_FILE.new" ] then diff --git a/agents/check_mk_agent.freebsd b/agents/check_mk_agent.freebsd index e097643..f187bbd 100755 --- a/agents/check_mk_agent.freebsd +++ b/agents/check_mk_agent.freebsd @@ -97,7 +97,10 @@ function run_cached() { if [ $((NOW - MTIME)) -le $MAXAGE ] ; then local USE_CACHEFILE=1 ; fi # Output the file in any case, even if it is # outdated. The new file will not yet be available - cat "$CACHEFILE" + CACHE_INFO=":cached($MTIME,$MAXAGE)" + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" fi # Cache file outdated and new job not yet running? Start it diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index e774b9a..90c8c34 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -290,7 +290,10 @@ function run_cached () { # all further lines are long output) sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" < "$CACHEFILE" else - cat "$CACHEFILE" + CACHE_INFO=":cached($MTIME,$MAXAGE)" + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" fi fi diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 8deb826..5718e5d 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -165,7 +165,10 @@ run_cached () { # all further lines are long output) cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" else - cat "$CACHEFILE" + CACHE_INFO=":cached($MTIME,$MAXAGE)" + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" fi fi diff --git a/agents/check_mk_agent.solaris b/agents/check_mk_agent.solaris index b3e843b..88e6a30 100755 --- a/agents/check_mk_agent.solaris +++ b/agents/check_mk_agent.solaris @@ -127,7 +127,10 @@ function run_cached () { # all further lines are long output) cat "$CACHEFILE" | sed -e "2s/|/ (Cached: ${AGE}\/${MAXAGE}s)|/" -e t -e "2s/$/ (Cached: ${AGE}\/${MAXAGE}s)/" else - cat "$CACHEFILE" + CACHE_INFO=":cached($MTIME,$MAXAGE)" + # insert the cache info in the section header (^= after '!'), + # if none is present (^= before '!') + sed -e '/^<<<.*$:cached($.*>>>/!s/^<<<$[^>]*$>>>$/<<<\1'$CACHE_INFO'>>>/' "$CACHEFILE" fi fi

5 years, 5 months

Trace output to log file is enabled

by Sergey Kipnis

Module: check_mk Branch: master Commit: f155dc6d049dcc243c0bcbe449fd59f15473ad26 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f155dc6d049dcc… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Thu Apr 18 10:11:53 2019 +0200 Trace output to log file is enabled Change-Id: Ic9f37f5b7bb4bb567a812cedd2ec6aa82a1ebc99 --- agents/wnx/src/engine/cfg.h | 5 ++++- agents/wnx/src/engine/cma_core.cpp | 10 ++++++---- agents/wnx/src/engine/logger.cpp | 5 ++++- agents/wnx/src/engine/providers/mrpe.cpp | 20 +++++++++----------- 4 files changed, 23 insertions(+), 17 deletions(-) diff --git a/agents/wnx/src/engine/cfg.h b/agents/wnx/src/engine/cfg.h index 18f41bd..dd2001b 100644 --- a/agents/wnx/src/engine/cfg.h +++ b/agents/wnx/src/engine/cfg.h @@ -1017,7 +1017,7 @@ private: bool async_start_; int max_wait_; -}; // namespace cma::cfg +}; void LoadExeUnitsFromYaml(std::vector<Plugins::ExeUnit>& ExeUnit, const std::vector<YAML::Node> Yaml); @@ -1031,6 +1031,9 @@ extern Plugins plugins; extern Plugins localGroup; } // namespace groups +inline bool LogPluginOutput() { return false; } +inline bool LogMrpeOutput() { return false; } + } // namespace cma::cfg #include "cfg_details.h" diff --git a/agents/wnx/src/engine/cma_core.cpp b/agents/wnx/src/engine/cma_core.cpp index f86c698..b38ec7b 100644 --- a/agents/wnx/src/engine/cma_core.cpp +++ b/agents/wnx/src/engine/cma_core.cpp @@ -237,8 +237,9 @@ std::vector<char> PluginEntry::getResultsSync(const std::wstring& Id, auto data = wtools::ConditionallyConvertFromUTF16(Data); cma::tools::AddVector(accu, data); storeData(Pid, accu); - XLOG::t("Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", - wtools::ConvertToUTF8(CmdLine), Pid, Code, data.data()); + if (cma::cfg::LogPluginOutput()) + XLOG::t("Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", + wtools::ConvertToUTF8(CmdLine), Pid, Code, data.data()); }); } else { @@ -311,8 +312,9 @@ void PluginEntry::threadCore(const std::wstring& Id) { std::lock_guard l(data_lock_); storeData(Pid, accu); } - XLOG::t("Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", - wtools::ConvertToUTF8(CmdLine), Pid, Code, data.data()); + if (cma::cfg::LogPluginOutput()) + XLOG::t("Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", + wtools::ConvertToUTF8(CmdLine), Pid, Code, data.data()); }); } else { // timeout or break signaled diff --git a/agents/wnx/src/engine/logger.cpp b/agents/wnx/src/engine/logger.cpp index 53f2846..77fba8c 100644 --- a/agents/wnx/src/engine/logger.cpp +++ b/agents/wnx/src/engine/logger.cpp @@ -26,7 +26,7 @@ public: GlobalLogSettings() { enable(LogType::log); enable(LogType::debug); - // enable(LogType::kTrace); + enable(LogType::trace); enable(LogType::stdio); } @@ -247,15 +247,18 @@ void ChangeDebugLogLevel(int Level) { case LogLevel::kLogAll: setup::EnableTraceLog(true); setup::EnableDebugLog(true); + XLOG::t("Enabled All"); break; case LogLevel::kLogDebug: setup::EnableTraceLog(false); setup::EnableDebugLog(true); + XLOG::d.t("Enabled Debug"); break; case LogLevel::kLogBase: default: setup::EnableTraceLog(false); setup::EnableDebugLog(false); + XLOG::l.t("Enabled Base"); break; } } diff --git a/agents/wnx/src/engine/providers/mrpe.cpp b/agents/wnx/src/engine/providers/mrpe.cpp index 2e2ee61..380b3e9 100644 --- a/agents/wnx/src/engine/providers/mrpe.cpp +++ b/agents/wnx/src/engine/providers/mrpe.cpp @@ -2,26 +2,22 @@ // provides basic api to start and stop service #include "stdafx.h" +#include "providers/mrpe.h" + #include <filesystem> #include <regex> #include <string> #include <string_view> #include <tuple> -#include "fmt/format.h" - -#include "tools/_raii.h" -#include "tools/_xlog.h" - -#include "common/wtools.h" - #include "cfg.h" #include "cma_core.h" +#include "common/wtools.h" +#include "fmt/format.h" #include "glob_match.h" - #include "logger.h" - -#include "providers/mrpe.h" +#include "tools/_raii.h" +#include "tools/_xlog.h" namespace cma::provider { @@ -283,7 +279,9 @@ void MrpeProvider::updateSectionStatus() { FixCrCnForMrpe(data); data += "\n"; - XLOG::t("Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", + if (cma::cfg::LogMrpeOutput()) + XLOG::t( + "Process [{}]\t Pid [{}]\t Code [{}]\n---\n{}\n---\n", wtools::ConvertToUTF8(CmdLine), Pid, Code, data.data()); hdr += std::to_string(Code) + " "; accu_ += hdr;

5 years, 5 months

agent_aws: Started AWS/ELBv2

by Simon Betz

Module: check_mk Branch: master Commit: 315e38452306be9c4761a8b120422082e54038d3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=315e38452306be… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Apr 18 09:07:10 2019 +0200 agent_aws: Started AWS/ELBv2 Change-Id: Ice5a8785c085b80342d86f1e1aae4c7c05e35438 --- .werks/7371 | 21 ++++ checkman/aws_elbv2_limits | 37 +++++++ checks/aws_elbv2_limits | 58 +++++++++++ cmk/gui/plugins/metrics/check_mk.py | 54 ++++++++++ cmk/gui/plugins/wato/check_parameters/aws.py | 48 +++++++++ cmk/gui/plugins/wato/datasource_programs.py | 14 ++- cmk/special_agents/agent_aws.py | 150 ++++++++++++++++++++++++++- 7 files changed, 379 insertions(+), 3 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=315e384523…

5 years, 5 months

← Newer
1
...
15
16
17
18
19
20
21
...
60
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits April 2019