Checkmk git commits February 2019

checkmk-commits@lists.checkmk.com

18 participants
457 discussions

Refactored remaining host attributes to new API

by Lars Michelsen

Module: check_mk Branch: master Commit: 335ae53aaf7bd0f6ce6ed2483b856fcc4d2b4b36 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=335ae53aaf7bd0… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Jan 30 18:14:13 2019 +0100 Refactored remaining host attributes to new API CMK-1588 Change-Id: I2c943ed2c09ea3efba0648e7c1bf435c4b9bf571 --- cmk/gui/plugins/wato/__init__.py | 5 +- cmk/gui/plugins/wato/builtin_attributes.py | 387 +++++++++++++++++++---------- cmk/gui/plugins/wato/utils/__init__.py | 5 +- 3 files changed, 261 insertions(+), 136 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=335ae53aaf…

5 years, 4 months

Improved service discovery status output

by Lars Michelsen

Module: check_mk Branch: master Commit: bee77aff513651d7fdebefd2c01a2b7e1f0c58f6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=bee77aff513651… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 1 13:53:01 2019 +0100 Improved service discovery status output Hosts that have not executed a service discovery yet show a more helpful status message. CMK-1556 Change-Id: Ifb60bd59eb4ffe6a6dc766bac05babb559be727c --- cmk/gui/wato/pages/services.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmk/gui/wato/pages/services.py b/cmk/gui/wato/pages/services.py index 8a627cb..187f936 100644 --- a/cmk/gui/wato/pages/services.py +++ b/cmk/gui/wato/pages/services.py @@ -525,10 +525,10 @@ class ModeAjaxServiceDiscovery(WatoWebApiMode): def _get_status_message(self, discovery_result): # type: (DiscoveryResult) -> Optional[Text] - if discovery_result.job_status[ - "state"] == JobStatus.state_initialized and discovery_result.job_status[ - "is_running"]: - return _("Initializing discovery...") + if discovery_result.job_status["state"] == JobStatus.state_initialized: + if self._is_running(discovery_result): + return _("Initializing discovery...") + return _("No discovery information available. Please perform a full scan.") job_title = discovery_result.job_status.get("title", _("Service discovery")) duration_txt = cmk.utils.render.Age(discovery_result.job_status["duration"])

5 years, 4 months

agent_aws: Fixed security group mapping

by Simon Betz

Module: check_mk Branch: master Commit: 65ce17b9360c39f8d0e6138f5deb64e4ffc278f4 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=65ce17b9360c39… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 1 14:01:53 2019 +0100 agent_aws: Fixed security group mapping Change-Id: Ic11347bcdf2fff97f90214efdff647f4f7f5cdb6 --- agents/special/agent_aws | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 80ef1dc..7b01f2a 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -459,7 +459,7 @@ class EC2Summary(AWSSectionGeneric): for security_group in colleague_contents.content: for reservation in reservations: if security_group['OwnerId'] == reservation['OwnerId']: - reservation['SecurityGroup'] = security_group + reservation.setdefault('SecurityGroups', []).append(security_group) return AWSComputedContent({ "Reservations": reservations, "mapping": self._map_instance_id_to_name(reservations),

5 years, 4 months

7080 FIX Management board: Continue when firmware information can not be fetched

by Lars Michelsen

Module: check_mk Branch: master Commit: 101d5cc203df4fb9f91b3b9b40d85e956530bb8b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=101d5cc203df4f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 1 09:17:42 2019 +0100 7080 FIX Management board: Continue when firmware information can not be fetched The management board monitoring currently tries to fetch two types of information from the boards: Sensor states and information about the firmware version. In case the later could not be fetched the processing of the management board data was terminated. This has now been changed to continue with the data that could be fetched. Change-Id: I26e268e695f87fa867c98aa89659f9f481c433eb --- .werks/7080 | 15 +++++++++++++++ cmk_base/data_sources/ipmi.py | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/.werks/7080 b/.werks/7080 new file mode 100644 index 0000000..b5731ef --- /dev/null +++ b/.werks/7080 @@ -0,0 +1,15 @@ +Title: Management board: Continue when firmware information can not be fetched +Level: 1 +Component: core +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1549008780 + +The management board monitoring currently tries to fetch two types of information +from the boards: Sensor states and information about the firmware version. In +case the later could not be fetched the processing of the management board data +was terminated. This has now been changed to continue with the data that could +be fetched. diff --git a/cmk_base/data_sources/ipmi.py b/cmk_base/data_sources/ipmi.py index 12cd5f7..f060c30 100644 --- a/cmk_base/data_sources/ipmi.py +++ b/cmk_base/data_sources/ipmi.py @@ -177,9 +177,15 @@ class IPMIManagementBoardDataSource(ManagementBoardDataSource, CheckMKAgentDataS def _fetch_ipmi_firmware_section(self, connection): self._logger.debug("Fetching firmware information via UDP from %s:623" % (self._ipaddress)) + try: + firmware_entries = connection.get_firmware() + except Exception as e: + self._logger.verbose("Failed to fetch firmware information: %r" % e) + self._logger.debug("Exception", exc_info=True) + return "" output = "<<<mgmt_ipmi_firmware:sep(124)>>>\n" - for entity_name, attributes in connection.get_firmware(): + for entity_name, attributes in firmware_entries: for attribute_name, value in attributes.items(): output += "%s|%s|%s\n" % (entity_name, attribute_name, value)

5 years, 4 months

agent_aws: Encapsulate configuration for sections

by Simon Betz

Module: check_mk Branch: master Commit: a4efec8102f99a17453f0eac5dc06d4cc4bb761c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a4efec8102f99a… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Feb 1 09:58:13 2019 +0100 agent_aws: Encapsulate configuration for sections Change-Id: I6766ee016a1235f798e4b3ff4880955205cf1f3a --- agents/special/agent_aws | 77 +++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 33 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index e3f542d..80ef1dc 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -404,6 +404,7 @@ class SecurityGroups(AWSSectionGeneric): return AWSColleagueContents(None, 0) def _fetch_raw_content(self, colleague_contents): + # TODO Filter response = self._client.describe_security_groups() try: return response['SecurityGroups'] @@ -445,6 +446,7 @@ class EC2Summary(AWSSectionGeneric): return AWSColleagueContents([], 0) def _fetch_raw_content(self, colleague_contents): + # TODO Filter response = self._client.describe_instances() try: return response['Reservations'] @@ -567,6 +569,7 @@ class S3Summary(AWSSectionGeneric): def _determine_buckets(self, buckets): if buckets: return [{"Name": b} for b in buckets] + # TODO Filter response = self._client.list_buckets() try: return response['Buckets'] @@ -707,6 +710,7 @@ class ELBSummary(AWSSectionGeneric): return AWSColleagueContents(None, 0) def _fetch_raw_content(self, colleague_contents): + # TODO Filter response = self._client.describe_load_balancers() try: load_balancers = response['LoadBalancerDescriptions'] @@ -881,6 +885,7 @@ class EBSSummary(AWSSectionGeneric): return AWSColleagueContents({}, 0) def _fetch_raw_content(self, colleague_contents): + # TODO Filter response = self._client.describe_volumes() try: volumes = {r['VolumeId']: r for r in response['Volumes']} @@ -1088,15 +1093,13 @@ class EBS(AWSSectionCloudwatch): class AWSSections(object): __metaclass__ = abc.ABCMeta - def __init__(self, hostname, region, session, services): + def __init__(self, hostname, session): self._hostname = hostname - self._region = region self._session = session - self._services = services self._sections = [] @abc.abstractmethod - def init_sections(self, **kwargs): + def init_sections(self, hostname, region, services, buckets=None): pass def _init_client(self, client_key): @@ -1177,7 +1180,7 @@ class AWSSectionsUSEast(AWSSections): https://docs.aws.amazon.com/awsaccountbilling/latest/aboutv2/ce-api.html """ - def init_sections(self, **kwargs): + def init_sections(self, hostname, region, services, buckets=None): #---clients--------------------------------------------------------- ce_client = self._init_client('ce') @@ -1186,17 +1189,17 @@ class AWSSectionsUSEast(AWSSections): #---sections with distributors-------------------------------------- #---sections-------------------------------------------------------- - ce = CostsAndUsage(ce_client, self._hostname, self._region) + ce = CostsAndUsage(ce_client, hostname, region) #---register sections to distributors------------------------------- #---register sections for execution--------------------------------- - if 'ce' in self._services: + if 'ce' in services: self._sections.append(ce) class AWSSectionsGeneric(AWSSections): - def init_sections(self, **kwargs): + def init_sections(self, hostname, region, services, buckets=None): #---clients--------------------------------------------------------- ec2_client = self._init_client('ec2') elb_client = self._init_client('elb') @@ -1211,24 +1214,19 @@ class AWSSectionsGeneric(AWSSections): s3_summary_distributor = ResultDistributor() #---sections with distributors-------------------------------------- - security_groups = SecurityGroups(ec2_client, self._hostname, self._region, - security_groups_distributor) - ec2_summary = EC2Summary(ec2_client, self._hostname, self._region, ec2_summary_distributor) - ebs_summary = EBSSummary(ec2_client, self._hostname, self._region, ebs_summary_distributor) - elb_summary = ELBSummary(elb_client, self._hostname, self._region, elb_summary_distributor) + security_groups = SecurityGroups(ec2_client, hostname, region, security_groups_distributor) + ec2_summary = EC2Summary(ec2_client, hostname, region, ec2_summary_distributor) + ebs_summary = EBSSummary(ec2_client, hostname, region, ebs_summary_distributor) + elb_summary = ELBSummary(elb_client, hostname, region, elb_summary_distributor) s3_summary = S3Summary( - s3_client, - self._hostname, - self._region, - distributor=s3_summary_distributor, - buckets=kwargs.get('buckets')) + s3_client, hostname, region, distributor=s3_summary_distributor, buckets=buckets) #---sections-------------------------------------------------------- - elb_health = ELBHealth(elb_client, self._hostname, self._region) - ec2 = EC2(cloudwatch_client, self._hostname, self._region) - ebs = EBS(cloudwatch_client, self._hostname, self._region) - elb = ELB(cloudwatch_client, self._hostname, self._region) - s3 = S3(cloudwatch_client, self._hostname, self._region) + elb_health = ELBHealth(elb_client, hostname, region) + ec2 = EC2(cloudwatch_client, hostname, region) + ebs = EBS(cloudwatch_client, hostname, region) + elb = ELB(cloudwatch_client, hostname, region) + s3 = S3(cloudwatch_client, hostname, region) #---register sections to distributors------------------------------- security_groups_distributor.add(ec2_summary) @@ -1259,21 +1257,21 @@ class AWSSectionsGeneric(AWSSections): # |-- elb_health # | # |-- elb - if 'ec2' in self._services: + if 'ec2' in services: self._sections.append(security_groups) self._sections.append(ec2_summary) self._sections.append(ec2) - if 'ebs' in self._services: + if 'ebs' in services: self._sections.append(ebs_summary) self._sections.append(ebs) - if 'elb' in self._services: + if 'elb' in services: self._sections.append(elb_summary) self._sections.append(elb_health) self._sections.append(elb) - if 's3' in self._services: + if 's3' in services: self._sections.append(s3_summary) self._sections.append(s3) @@ -1324,6 +1322,9 @@ def parse_arguments(argv): description=__doc__, formatter_class=argparse.RawTextHelpFormatter) parser.add_argument("--debug", action="store_true", help="Raise Python exceptions.") parser.add_argument( + "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") + + parser.add_argument( "--aws-access-key-id", required=True, help="The access key for your AWS account.") parser.add_argument( "--aws-secret-access-key", required=True, help="The secret key for your AWS account.") @@ -1337,9 +1338,8 @@ def parse_arguments(argv): nargs='+', required=True, help="Services to monitor:\n%s" % "\n".join(["%-15s %s" % e for e in AWSServices])) + parser.add_argument('--buckets', nargs='+', help="Buckets to monitor") - parser.add_argument( - "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") parser.add_argument("--hostname", required=True) return parser.parse_args(argv) @@ -1374,12 +1374,20 @@ def main(args=None): use_cache = not args.no_cache services = args.services + config = { + "hostname": hostname, + "services": services, + } + exceptions = [] try: region_us_east_1 = "us-east-1" session = create_session(access_key_id, secret_access_key, region_us_east_1) - aws_sections_us_east = AWSSectionsUSEast(hostname, region_us_east_1, session, services) - aws_sections_us_east.init_sections() + config_us_east_1 = config.copy() + config_us_east_1.update({"region": region_us_east_1}) + + aws_sections_us_east = AWSSectionsUSEast(hostname, session) + aws_sections_us_east.init_sections(**config_us_east_1) aws_sections_us_east.run(use_cache=use_cache) except Exception as e: if args.debug: @@ -1389,8 +1397,11 @@ def main(args=None): for region in args.regions: try: session = create_session(access_key_id, secret_access_key, region) - aws_sections = AWSSectionsGeneric(hostname, region, session, services) - aws_sections.init_sections(buckets=args.buckets) + config_generic = config.copy() + config_generic.update({"region": region, "buckets": args.buckets}) + + aws_sections = AWSSectionsGeneric(hostname, session) + aws_sections.init_sections(**config_generic) aws_sections.run(use_cache=use_cache) except Exception as e: if args.debug:

5 years, 4 months

k8s_nodes: add WATO rule, move node names to inventory

by Tom Baerwinkel

Module: check_mk Branch: master Commit: d64433fafba9473facd0cc37d93951adcb0dcb53 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d64433fafba947… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 31 11:05:14 2019 +0100 k8s_nodes: add WATO rule, move node names to inventory Adapt the k8s_nodes check to only show the total number of nodes. Upper and lower levels for the number of nodes can now be defined via WATO. The names of the nodes that were shown previously in the check are now listed in the HW/SW Inventory. Change-Id: Iba367fcab511ca416ba3d2e82ec3c4196b5466a0 --- checkman/k8s_nodes | 2 +- checks/k8s_nodes | 16 ++++-- cmk/gui/plugins/views/inventory.py | 9 +++- cmk/gui/plugins/wato/check_parameters/k8s_nodes.py | 62 ++++++++++++++++++++++ inventory/k8s_nodes | 39 ++++++++++++++ tests/unit/cmk/gui/test_views.py | 8 +++ tests/unit/cmk/gui/watolib/test_rulespecs.py | 32 +++++++++++ 7 files changed, 162 insertions(+), 6 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=d64433fafb…

5 years, 4 months

6940 FIX Fix OnlyFrom entry in check_mk agent section

by Andreas Umbreit

Module: check_mk Branch: master Commit: a8bf7362eea66531eb4d1cd6232041de4f7fd54a URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a8bf7362eea665… Author: Andreas Umbreit <au(a)mathias-kettner.de> Date: Thu Jan 31 11:52:32 2019 +0100 6940 FIX Fix OnlyFrom entry in check_mk agent section Previously, the OnlyFrom entry, that represents the list of only-from IP entries within the xinetd-configuration, rendered empty for baked agents. The cause for this was that the agent was looking for the service name "check_mk", that only is used by the raw agent. The agent is now looking for the right service name set from the agent bakery, i.e. "check-mk-agent" or a user-specified name coming from the "name of agent packages" rule. (Jira: CMK-1540) Change-Id: I590c7d9f8914923c6e5b3bb12bcab82ed80599f8 --- .werks/6940 | 20 ++++++++++++++++++++ agents/check_mk_agent.linux | 6 +++++- agents/check_mk_agent.openwrt | 6 +++++- doc/treasures/agents/check_mk_agent.busybox | 6 +++++- 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/.werks/6940 b/.werks/6940 new file mode 100644 index 0000000..dedbd08 --- /dev/null +++ b/.werks/6940 @@ -0,0 +1,20 @@ +Title: Fix OnlyFrom entry in check_mk agent section +Level: 1 +Component: agents +Compatible: compat +Edition: cee +Version: 1.6.0i1 +Date: 1548937503 +Class: fix + +Previously, the OnlyFrom entry, that represents the list of +only-from IP entries within the xinetd-configuration, +rendered empty for baked agents. + +The cause for this was that the agent was looking for +the service name "check_mk", that only is used by the +raw agent. + +The agent is now looking for the right service name set +from the agent bakery, i.e. "check-mk-agent" or a user-specified +name coming from the "name of agent packages" rule. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index cb8ce67..f0fc7f4 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -43,6 +43,10 @@ elif [ "$SSH_CLIENT" ] ; then export REMOTE=${SSH_CLIENT%% *} fi +# The package name gets patched for baked agents to either +# "check-mk-agent" or the name set by the "name of agent packages" rule +XINETD_SERVICE_NAME=check_mk + # Make sure, locally installed binaries are found PATH=$PATH:/usr/local/bin @@ -369,7 +373,7 @@ echo "LocalDirectory: $LOCALDIR" if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1; echo + sed -n '/^service[[:space:]]*'$XINETD_SERVICE_NAME'/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1; echo fi section_df diff --git a/agents/check_mk_agent.openwrt b/agents/check_mk_agent.openwrt index 71d6381..6661bf5 100755 --- a/agents/check_mk_agent.openwrt +++ b/agents/check_mk_agent.openwrt @@ -35,6 +35,10 @@ export MK_VARDIR="/var/lib/check_mk_agent" # Optionally set a tempdir for all subsequent calls #export TMPDIR= +# The package name gets patched for baked agents to either +# "check-mk-agent" or the name set by the "name of agent packages" rule +XINETD_SERVICE_NAME=check_mk + # Provide information about the remote host. That helps when data # is being sent only once to each remote host. if [ "$REMOTE_HOST" ] ; then @@ -237,7 +241,7 @@ echo "LocalDirectory: $LOCALDIR" if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - echo $(sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) + echo $(sed -n '/^service[[:space:]]*'$XINETD_SERVICE_NAME'/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) fi # Print out Partitions / Filesystems. (-P gives non-wrapped POSIXed output) diff --git a/doc/treasures/agents/check_mk_agent.busybox b/doc/treasures/agents/check_mk_agent.busybox index 5980faf..596f6c2 100644 --- a/doc/treasures/agents/check_mk_agent.busybox +++ b/doc/treasures/agents/check_mk_agent.busybox @@ -34,6 +34,10 @@ export MK_LIBDIR="/usr/lib/check_mk_agent" export MK_CONFDIR="/etc/check_mk" export MK_VARDIR="/var/lib/check_mk_agent" +# The package name gets patched for baked agents to either +# "check-mk-agent" or the name set by the "name of agent packages" rule +XINETD_SERVICE_NAME=check_mk + # Provide information about the remote host. That helps when data # is being sent only once to each remote host. if [ "$REMOTE_HOST" ] ; then @@ -98,7 +102,7 @@ echo LocalDirectory: $LOCALDIR if [ -n "$REMOTE_HOST" ] then echo -n 'OnlyFrom: ' - echo $(sed -n '/^service[[:space:]]*check_mk/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) + echo $(sed -n '/^service[[:space:]]*'$XINETD_SERVICE_NAME'/,/}/s/^[[:space:]]*only_from[[:space:]]*=[[:space:]]*$.*$/\1/p' /etc/xinetd.d/* | head -n1) fi # Print out Partitions / Filesystems. (-P gives non-wrapped POSIXed output)

5 years, 4 months

Removed debug output and wrong asserts

by Lars Michelsen

Module: check_mk Branch: master Commit: d37c377bf465f800f15e1498e35528e4d1017235 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d37c377bf465f8… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 1 11:01:39 2019 +0100 Removed debug output and wrong asserts Change-Id: I140fe6d0ac6b34f0c428866536eecfbe75cf3374 --- tests/integration/cmk_base/test_automations.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tests/integration/cmk_base/test_automations.py b/tests/integration/cmk_base/test_automations.py index 8c9db82..5d37871 100644 --- a/tests/integration/cmk_base/test_automations.py +++ b/tests/integration/cmk_base/test_automations.py @@ -256,7 +256,7 @@ def test_automation_analyse_service_no_check(test_cfg, site): def test_automation_try_discovery_not_existing_host(test_cfg, site): - data = _execute_automation(site, "try-inventory", + _execute_automation(site, "try-inventory", args=["xxx-not-existing-host"], expect_stderr_pattern=r"Failed to lookup IPv4 address of xxx-not-existing-host " \ r"via DNS: (\[Errno -2\] Name or service not known" @@ -265,9 +265,6 @@ def test_automation_try_discovery_not_existing_host(test_cfg, site): expect_exit_code=2, parse_data=False, ) - assert isinstance(data, dict) - assert isinstance(data["output"], str) - assert isinstance(data["check_table"], list) def test_automation_try_discovery_host(test_cfg, site):

5 years, 4 months

7136 mk_jolokia: connection timeout is now configurable

by Moritz Kiemer

Module: check_mk Branch: master Commit: 8e45211be812934324b246f542eb8f15390fdf5d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8e45211be81293… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Jan 31 08:55:24 2019 +0100 7136 mk_jolokia: connection timeout is now configurable Previously the connection timeout was hardcoded to 1 second, based on the assumption that the jolokia server is most likely the local host. This assumption has been dropped, and the timeout can now be configured using the agent bakery or by adding (e.g.) "timeout=23.0" to your configuration file. Change-Id: Ib95da73beb3ae7e4d62246776219615b773cc90b --- .werks/7136 | 11 +++++++++++ agents/plugins/mk_jolokia.py | 18 ++++++++++-------- tests/unit/plugins/test_mk_jolokia.py | 20 ++++++++++++++------ 3 files changed, 35 insertions(+), 14 deletions(-) diff --git a/.werks/7136 b/.werks/7136 new file mode 100644 index 0000000..e2db581 --- /dev/null +++ b/.werks/7136 @@ -0,0 +1,11 @@ +Title: mk_jolokia: connection timeout is now configurable +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1548921175 +Class: feature + +Previously the connection timeout was hardcoded to 1 second, based on the assumption that the jolokia server is most likely the local host. +This assumption has been dropped, and the timeout can now be configured using the agent bakery or by adding (e.g.) "timeout=23.0" to your configuration file. diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index 252057a..648bdc9 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -60,6 +60,7 @@ DEFAULT_CONFIG = { "protocol": "http", "server": "localhost", "port": 8080, + "timeout": 1.0, "user": "monitoring", "password": None, "mode": "digest", @@ -197,7 +198,7 @@ class JolokiaInstance(object): if instance: err_msg += " for %s" % instance - required_keys = {"protocol", "server", "port", "suburi"} + required_keys = {"protocol", "server", "port", "suburi", "timeout"} auth_mode = config.get("mode") if auth_mode in ("digest", "basic", "basic_preemtive"): required_keys |= {"user", "password"} @@ -213,11 +214,13 @@ class JolokiaInstance(object): instance = str(config["port"]) config["instance"] = instance.replace(" ", "_") - # port must be (or look like) an integer - try: - config["port"] = int(config["port"]) - except ValueError: - raise ValueError(err_msg % ("Invalid port %r" % config["port"])) + # port must be (or look like) an integer, timeout like float + for key, type_ in (("port", int), ("timeout", float)): + val = config[key] + try: + config[key] = type_(val) + except ValueError: + raise ValueError(err_msg % ("Invalid %s %r" % (key, val))) if config.get("server") == "use fqdn": config["server"] = socket.getfqdn() @@ -272,8 +275,7 @@ class JolokiaInstance(object): def _initialize_http_session(self): session = requests.Session() session.verify = self._config["verify"] - - session.timeout = 1.0 + session.timeout = self._config["timeout"] auth_method = self._config.get("mode") if auth_method is None: diff --git a/tests/unit/plugins/test_mk_jolokia.py b/tests/unit/plugins/test_mk_jolokia.py index b7a69b2..e119e6b 100644 --- a/tests/unit/plugins/test_mk_jolokia.py +++ b/tests/unit/plugins/test_mk_jolokia.py @@ -10,11 +10,10 @@ sys.path.insert(0, os.path.join(cmk_path(), 'agents', 'plugins')) import mk_jolokia # pylint: disable=import-error,wrong-import-position - SANITIZE = mk_jolokia.JolokiaInstance._sanitize_config -(a)pytest.mark.parametrize("removed", ["protocol", "server", "port", "suburi"]) +(a)pytest.mark.parametrize("removed", ["protocol", "server", "port", "suburi", "timeout"]) def test_missing_config_basic(removed): config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) config.pop(removed) @@ -29,10 +28,19 @@ def test_config_instance(): assert SANITIZE(config).get("instance") == "some_spaces_in_string" -(a)pytest.mark.parametrize("config,base_url", [ - ({"protocol": "sftp", "server": "billy.theserver", "port": 42, - "suburi": "jolo-site"}, "sftp://billy.theserver:42/jolo-site/") -]) +def test_config_timeout(): + config = copy.deepcopy(mk_jolokia.DEFAULT_CONFIG) + config["timeout"] = '23' + assert isinstance(SANITIZE(config).get("timeout"), float) + + +(a)pytest.mark.parametrize("config,base_url", [({ + "protocol": "sftp", + "server": "billy.theserver", + "port": 42, + "suburi": "jolo-site", + "timeout": 2.0 +}, "sftp://billy.theserver:42/jolo-site/")]) def test_jolokia_instance_base_url(config, base_url): joloi = mk_jolokia.JolokiaInstance(config) assert joloi._get_base_url() == base_url

5 years, 4 months

YAPFed test file

by Lars Michelsen

Module: check_mk Branch: master Commit: 8ba758141759b7ea08ddd9a65703df4499df493c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ba758141759b7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Feb 1 10:00:47 2019 +0100 YAPFed test file Change-Id: I59df7ee891ab8e99b46874026a23cdee228e7bf8 --- tests/integration/cmk_base/test_automations.py | 179 +++++++++++++------------ 1 file changed, 90 insertions(+), 89 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=8ba7581417…

5 years, 4 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits February 2019