Checkmk git commits November 2018

checkmk-commits@lists.checkmk.com

15 participants
465 discussions

by Andreas Boesl

Module: check_mk Branch: master Commit: f8aa486bf6ed243abe0dee6f9e72dd5fd7fb75da URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f8aa486bf6ed24… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 29 09:45:09 2018 +0100 yapf: ldap_connector.py Change-Id: I366e9447d7ca8e72c07060432c03fd747d22015a --- cmk/gui/plugins/userdb/ldap_connector.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index b3fc8b9..951f820 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -2628,7 +2628,7 @@ def _sychronize_profile_worker(site_configuration): site_id, error_text=_("Site %s is dead") % site_id, failed=True) try: - result = watolib.push_user_profile_to_site(site, user_id, profile) + watolib.push_user_profile_to_site(site, user_id, profile) return SynchronizationResult(site_id, succeeded=True) except RequestTimeout: # This function is currently only used by the background job

5 years, 10 months

Add simple integration test for check_mkevents execution

by Lars Michelsen

Module: check_mk Branch: master Commit: ad81a56d6feaf114551111c5b65fa53c6813b402 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ad81a56d6feaf1… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Wed Nov 28 14:40:03 2018 +0100 Add simple integration test for check_mkevents execution Change-Id: I6d29e04f7da6c626a4bbeb2a191dbcbd4bd892d3 --- tests/integration/cmk/ec/test_check_mkevents.py | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/tests/integration/cmk/ec/test_check_mkevents.py b/tests/integration/cmk/ec/test_check_mkevents.py new file mode 100644 index 0000000..d889d11 --- /dev/null +++ b/tests/integration/cmk/ec/test_check_mkevents.py @@ -0,0 +1,16 @@ +import subprocess +import pytest + + +(a)pytest.mark.parametrize("args", [ + [], + ["-a"], +]) +def test_simple_check_mkevents_call(site, args): + p = site.execute( + ["./check_mkevents"] + args + ["somehost"], + stdout=subprocess.PIPE, + cwd=site.path("lib/nagios/plugins")) + output = p.stdout.read() + assert output == "OK - no events for somehost\n" + assert p.wait() == 0

5 years, 10 months

added WK 6691: LDAP sync: Sped up user profile synchronization to slave sites

by Andreas Boesl

Module: check_mk Branch: master Commit: 68b68730033ab28b7bf1835f399614cb1c758331 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=68b68730033ab2… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Thu Nov 22 17:24:20 2018 +0100 added WK 6691: LDAP sync: Sped up user profile synchronization to slave sites Change-Id: I95abf6734227b44d83daa3f5568650c760c4267e --- .werks/6691 | 14 +++++ cmk/gui/plugins/userdb/ldap_connector.py | 94 +++++++++++++++++++++----------- 2 files changed, 75 insertions(+), 33 deletions(-) diff --git a/.werks/6691 b/.werks/6691 new file mode 100644 index 0000000..8dece46 --- /dev/null +++ b/.werks/6691 @@ -0,0 +1,14 @@ +Title: LDAP sync: Sped up user profile synchronization to slave sites +Level: 1 +Component: wato +Class: feature +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1542890636 + +The background job doing the user synchronization contacted one site after +another when updating the credentials for one user. +This werk changes the update mechanism. It now pushes the updated profile +to all sites at once through multithreading. diff --git a/cmk/gui/plugins/userdb/ldap_connector.py b/cmk/gui/plugins/userdb/ldap_connector.py index eac85c7..b3fc8b9 100644 --- a/cmk/gui/plugins/userdb/ldap_connector.py +++ b/cmk/gui/plugins/userdb/ldap_connector.py @@ -66,6 +66,8 @@ import ldap import ldap.filter from ldap.controls import SimplePagedResultsControl +from multiprocessing.pool import ThreadPool + import cmk import cmk.paths import cmk.log @@ -92,9 +94,11 @@ from cmk.gui.valuespec import ( ) from cmk.gui.i18n import _ from cmk.gui.globals import html -from cmk.gui.exceptions import MKGeneralException, MKUserError +from cmk.gui.exceptions import MKGeneralException, MKUserError, RequestTimeout from cmk.gui.plugins.userdb.utils import UserConnector, user_connector_registry +import cmk.gui.sites as sites + if cmk.is_managed_edition(): import cmk.gui.cme.managed as managed else: @@ -1249,7 +1253,7 @@ class LDAPUserConnector(UserConnector): self._logger.info( 'SYNC FINISHED - Duration: %0.3f sec, Queries: %d' % (duration, self._num_queries)) - import cmk.gui.watolib as watolib # TODO: Cleanup + import cmk.gui.watolib as watolib if changes and config.wato_enabled and not config.is_wato_slave_site(): watolib.add_change("edit-users", "<br>\n".join(changes), add_user=False) @@ -2100,7 +2104,7 @@ def ldap_needed_attributes_alias(connection, params): ldap_attribute_plugins['alias'] = { 'title': _('Alias'), - 'help': _('Populates the alias attribute of the WATO user by syncrhonizing an attribute ' + 'help': _('Populates the alias attribute of the WATO user by synchronizing an attribute ' 'from the LDAP user account. By default the LDAP attribute <tt>cn</tt> is used.'), 'needed_attributes': ldap_needed_attributes_alias, 'sync_func': ldap_sync_alias, @@ -2548,7 +2552,6 @@ ldap_attribute_plugins['groups_to_roles'] = { # | | # '----------------------------------------------------------------------' - # In case the sync is done on the master of a distributed setup the auth serial # is increased on the master, but not on the slaves. The user can not access the # slave sites anymore with the master sites cookie since the serials differ. In @@ -2562,49 +2565,74 @@ ldap_attribute_plugins['groups_to_roles'] = { # time. In this case the implementation does not scale well. We would need to # change this to some kind of profile bulk sync per site. # TODO: Should we move this to watolib? -def synchronize_profile_to_sites(logger, user_id, profile): - import cmk.gui.sites as sites - import cmk.gui.watolib as watolib # TODO: Cleanup + +class SynchronizationResult(object): + def __init__(self, site_id, error_text=None, disabled=False, succeeded=False, failed=False): + self.site_id = site_id + self.error_text = error_text + self.failed = failed + self.disabled = disabled + self.succeeded = succeeded + + +def synchronize_profile_to_sites(logger, user_id, profile): + import cmk.gui.watolib as watolib remote_sites = [(site_id, config.site(site_id)) for site_id in config.get_login_sites()] logger.info( 'Credentials changed: %s. Trying to sync to %d sites' % (user_id, len(remote_sites))) - num_disabled = 0 - num_succeeded = 0 - num_failed = 0 + synchronization_jobs = [] + states = sites.states() + for site_id, site in remote_sites: - if not site.get("replication"): - num_disabled += 1 - continue + synchronization_jobs.append((states, site_id, site, user_id, profile)) - if site.get("disabled"): - num_disabled += 1 - continue + pool = ThreadPool() + results = pool.map(_sychronize_profile_worker, synchronization_jobs) + pool.close() + pool.join() - status = sites.state(site_id, {}).get("state", "unknown") - if status == "dead": - result = "Site is dead" - else: - try: - result = watolib.push_user_profile_to_site(site, user_id, profile) - except Exception as e: - result = "%s" % e - - if result == True: - num_succeeded += 1 - else: - num_failed += 1 - logger.info(' FAILED [%s]: %s' % (site_id, result)) - # Add pending entry to make sync possible later for admins + for result in results: + if result.error_text: + logger.info(' FAILED [%s]: %s' % (result.site_id, result.error_text)) if config.wato_enabled: watolib.add_change( "edit-users", - _('Password changed (sync failed: %s)') % result, + _('Password changed (sync failed: %s)') % result.error_text, add_user=False, - sites=[site_id], + sites=[result.site_id], need_restart=False) + num_failed = sum([1 for result in results if result.failed]) + num_disabled = sum([1 for result in results if result.disabled]) + num_succeeded = sum([1 for result in results if result.succeeded]) logger.info( ' Disabled: %d, Succeeded: %d, Failed: %d' % (num_disabled, num_succeeded, num_failed)) + + +def _sychronize_profile_worker(site_configuration): + import cmk.gui.watolib as watolib + states, site_id, site, user_id, profile = site_configuration + + if not site.get("replication"): + return SynchronizationResult(site_id, disabled=True) + + if site.get("disabled"): + return SynchronizationResult(site_id, disabled=True) + + status = states.get(site_id, {}).get("state", "unknown") + if status == "dead": + return SynchronizationResult( + site_id, error_text=_("Site %s is dead") % site_id, failed=True) + + try: + result = watolib.push_user_profile_to_site(site, user_id, profile) + return SynchronizationResult(site_id, succeeded=True) + except RequestTimeout: + # This function is currently only used by the background job + # which does not have any request timeout set, just in case... + raise + except Exception, e: + return SynchronizationResult(site_id, error_text="%s" % e, failed=True)

5 years, 10 months

aws.include: Fixed joining entries

by Simon Betz

Module: check_mk Branch: master Commit: 95868c53ca63e73c231e7f8e7eeb871c959ef49e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=95868c53ca63e7… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 28 16:25:48 2018 +0100 aws.include: Fixed joining entries Change-Id: I69a11dfc33d0b777d5d37ae2a044fd50676d3f56 --- checks/aws.include | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/checks/aws.include b/checks/aws.include index 6792aec..f97c430 100644 --- a/checks/aws.include +++ b/checks/aws.include @@ -28,6 +28,6 @@ def parse_aws(info): import json try: - return json.loads("".join(info[0])) + return json.loads(" ".join(info[0])) except (TypeError, IndexError): return

5 years, 10 months

6820 aws_ec2_instances_summary: New check which gives an overview of AWS/ EC2 instances

by Simon Betz

Module: check_mk Branch: master Commit: ef28290c2d3deec193cf1da87d0e8f4a35f13e22 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ef28290c2d3dee… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 28 15:41:25 2018 +0100 6820 aws_ec2_instances_summary: New check which gives an overview of AWS/EC2 instances Change-Id: If248c2d6a89d5e820a95cdaab9a8d20893877172 --- .werks/6820 | 10 +++++++ agents/special/agent_aws | 10 +++++-- checkman/aws_ec2_instances_summary | 14 +++++++++ checks/aws.include | 33 +++++++++++++++++++++ checks/aws_ec2_instances_summary | 61 ++++++++++++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 3 deletions(-) diff --git a/.werks/6820 b/.werks/6820 new file mode 100644 index 0000000..5b63f91 --- /dev/null +++ b/.werks/6820 @@ -0,0 +1,10 @@ +Title: aws_ec2_instances_summary: New check which gives an overview of AWS/EC2 instances +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543416042 +Class: feature + + diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 29892e1..af9a8de 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -172,13 +172,17 @@ class EC2InstancesSummary(AWSSection): return "ec2_instances_summary" def _get_raw_result(self): - pass + return self._client.describe_instances() def _extract_content_from(self, raw_result): - pass + try: + return raw_result['Reservations'] + except KeyError, e: + logging.info(e) + return def _format_content(self, content): - pass + return [AWSSectionResult("", content)] class EC2Instance(AWSSection): diff --git a/checkman/aws_ec2_instances_summary b/checkman/aws_ec2_instances_summary new file mode 100644 index 0000000..d935fce --- /dev/null +++ b/checkman/aws_ec2_instances_summary @@ -0,0 +1,14 @@ +title: AWS EC2 Instances Summary +agents: aws +catalog: applications +license: GPL +distribution: check_mk +description: + This check monitors all AWS EC2 instances and reports + a summary of their states. + + If at least one instance is not running the state is WARN + otherwise it is OK. + +inventory: + One summary service is created. diff --git a/checks/aws.include b/checks/aws.include new file mode 100644 index 0000000..6792aec --- /dev/null +++ b/checks/aws.include @@ -0,0 +1,33 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def parse_aws(info): + import json + try: + return json.loads("".join(info[0])) + except (TypeError, IndexError): + return diff --git a/checks/aws_ec2_instances_summary b/checks/aws_ec2_instances_summary new file mode 100644 index 0000000..50637fe --- /dev/null +++ b/checks/aws_ec2_instances_summary @@ -0,0 +1,61 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inventory_aws_ec2_instances_summary(parsed): + if parsed: + return [(None, {})] + + +def check_aws_ec2_instances_summary(item, params, parsed): + instances_by_state = {} + for reservation in parsed: + for instance in reservation['Instances']: + instances_by_state.setdefault(instance['State']['Name'], [])\ + .append(instance['InstanceId']) + + yield 0, "Instances: %s" % sum([len(v) for v in instances_by_state.itervalues()]) + + long_output = [] + for instance_state, instances in instances_by_state.iteritems(): + if instance_state == 'running': + state = 0 + else: + state = 1 + long_output.append("%s: %s" % (instance_state, ", ".join(instances))) + yield state, "%s: %s" % (instance_state, len(instances)) + + if long_output: + yield 0, "\n%s" % "\n".join(long_output) + + +check_info['aws_ec2_instances_summary'] = { + 'parse_function': parse_aws, + 'inventory_function': inventory_aws_ec2_instances_summary, + 'check_function': check_aws_ec2_instances_summary, + 'service_description': 'AWS EC2 Instances', + 'includes': ['aws.include'], +}

5 years, 10 months

6819 aws_exceptions: New check which collects all exceptions during execution of AWS special agent

by Simon Betz

Module: check_mk Branch: master Commit: 06df86ec0181d602543797ed2b9bf4091ced1488 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=06df86ec0181d6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 28 14:20:49 2018 +0100 6819 aws_exceptions: New check which collects all exceptions during execution of AWS special agent Change-Id: I59c104ae3be3d991f2212e3fb50517783573edf5 --- .werks/6819 | 10 ++++++++++ checkman/aws_exceptions | 12 ++++++++++++ checks/aws_exceptions | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+) diff --git a/.werks/6819 b/.werks/6819 new file mode 100644 index 0000000..1f5f21d --- /dev/null +++ b/.werks/6819 @@ -0,0 +1,10 @@ +Title: aws_exceptions: New check which collects all exceptions during execution of AWS special agent +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543411225 +Class: feature + + diff --git a/checkman/aws_exceptions b/checkman/aws_exceptions new file mode 100644 index 0000000..8107b94 --- /dev/null +++ b/checkman/aws_exceptions @@ -0,0 +1,12 @@ +title: AWS Exceptions +agents: aws +catalog: applications +license: GPL +distribution: check_mk +description: + This check collects all exceptions during the execution of the + special agent {{agent_aws}} for monitoring Amazon Web Service. + If no exceptions occur the check is OK, otherwise CRIT. + +inventory: + One service is created. diff --git a/checks/aws_exceptions b/checks/aws_exceptions new file mode 100644 index 0000000..b2db9fb --- /dev/null +++ b/checks/aws_exceptions @@ -0,0 +1,47 @@ +#!/usr/bin/python +# -*- encoding: utf-8; py-indent-offset: 4 -*- +# +------------------------------------------------------------------+ +# | ____ _ _ __ __ _ __ | +# | / ___| |__ ___ ___| | __ | \/ | |/ / | +# | | | | '_ \ / _ \/ __| |/ / | |\/| | ' / | +# | | |___| | | | __/ (__| < | | | | . \ | +# | \____|_| |_|\___|\___|_|\_\___|_| |_|_|\_\ | +# | | +# | Copyright Mathias Kettner 2018 mk(a)mathias-kettner.de | +# +------------------------------------------------------------------+ +# +# This file is part of Check_MK. +# The official homepage is at http://mathias-kettner.de/check_mk. +# +# check_mk is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation in version 2. check_mk is distributed +# in the hope that it will be useful, but WITHOUT ANY WARRANTY; with- +# out even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. See the GNU General Public License for more de- +# tails. You should have received a copy of the GNU General Public +# License along with GNU Make; see the file COPYING. If not, write +# to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, +# Boston, MA 02110-1301 USA. + + +def inventory_aws_exceptions(info): + if info: + return [(None, {})] + + +def check_aws_exceptions(item, params, info): + for line in info: + joined_line = " ".join(line) + if joined_line == 'No exceptions': + state = 0 + else: + state = 2 + yield state, joined_line + + +check_info['aws_exceptions'] = { + 'inventory_function': inventory_aws_exceptions, + 'check_function': check_aws_exceptions, + 'service_description': 'AWS Exceptions', +}

5 years, 10 months

Added comment

by Simon Betz

Module: check_mk Branch: master Commit: 2165fd3dee4c1613fe328c538cd3cad764c8065e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2165fd3dee4c16… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 28 14:43:35 2018 +0100 Added comment Change-Id: I87a9c0cf744d080f7299c32e5c2c4bd4b462525b --- agents/special/agent_aws | 1 + 1 file changed, 1 insertion(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 50b51b1..29892e1 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -145,6 +145,7 @@ class AWSSection(object): Raw results basically consist of two sub results: - 'ResponseMetadata' - '<KEY>' + Returns raw_result['<KEY>']. """ pass

5 years, 10 months

Special agent AWS: improved basic layout

by Simon Betz

Module: check_mk Branch: master Commit: 2663a761be7028a64a2115f9701444297a13c219 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2663a761be7028… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Nov 28 10:07:22 2018 +0100 Special agent AWS: improved basic layout Change-Id: I2bf394197d5bf7e7868f24867a57222909951885 --- agents/special/agent_aws | 205 +++++++++++++++++++++++++++-------------------- 1 file changed, 116 insertions(+), 89 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 55740df..50b51b1 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -35,7 +35,7 @@ import botocore import datetime import json import logging -import time +from typing import NamedTuple, Any import cmk.password_store @@ -69,137 +69,130 @@ class AWSSectionError(Exception): pass -# ---section interface---------------------------------------------------- +# ---result distributor--------------------------------------------------- + + +class ResultDistributor(object): + """ + Mediator which distributes results from sections + in order to reduce queries to AWS account. + """ + + def __init__(self): + self._colleagues = [] + + def add(self, colleague): + self._colleagues.append(colleague) + + def distribute(self, sender, result): + for colleague in self._colleagues: + if colleague.name != sender.name: + colleague.receive(sender, result) + + +# ---sections/colleagues-------------------------------------------------- + +AWSSectionResult = NamedTuple("Result", [ + ("piggyback_hostname", str), + ("content", Any), +]) class AWSSection(object): __metaclass__ = abc.ABCMeta - def __init__(self, client): + def __init__(self, client, distributor=None): self._client = client + self._distributor = ResultDistributor() if distributor is None else distributor + self._received_results = {} - @abc.abstractmethod + @abc.abstractproperty def name(self): pass - def run(self, **kwargs): + def run(self): if self._client is None: msg = "%s: No client initialized" % self.__class__.__name__ logging.info(msg) raise AWSSectionError(msg) - name = self.name() - if name is None: + if self.name is None: msg = "%s: No name set" % self.__class__.__name__ logging.info(msg) raise AWSSectionError(msg) try: - raw_result = self._get_raw_result(**kwargs) + raw_result = self._get_raw_result() except botocore.exceptions.EndpointConnectionError as e: logging.info(e) raise content = self._extract_content_from(raw_result) - if content: - sys.stdout.write("<<<aws_%s>>>\n" % name) - sys.stdout.write("%s\n" % json.dumps(content, default=_datetime_converter)) - return content + self.send(content) + return self._format_content(content) @abc.abstractmethod - def _get_raw_result(self, **kwargs): + def _get_raw_result(self): + """ + Returns the raw result which we received from any API method, eg + response = ec2_client.describe_instances() + """ pass @abc.abstractmethod def _extract_content_from(self, raw_result): + """ + Raw results basically consist of two sub results: + - 'ResponseMetadata' + - '<KEY>' + """ pass + @abc.abstractmethod + def _format_content(self, content): + """ + Returns a list of named tuples. Each tuple contains + - piggyback hostname or "", and + - content + Use AWSSectionResult. + """ + pass -# ---sections------------------------------------------------------------- + def send(self, content): + self._distributor.distribute(self, content) + + def receive(self, sender, content): + self._received_results.setdefault(sender.name, content) class EC2InstancesSummary(AWSSection): + @property def name(self): return "ec2_instances_summary" - def _get_raw_result(self, **kwargs): - return self._client.describe_instances() + def _get_raw_result(self): + pass def _extract_content_from(self, raw_result): - try: - return raw_result['Reservations'] - except KeyError, e: - logging.info(e) - return + pass + + def _format_content(self, content): + pass class EC2Instance(AWSSection): - # Metrics for burstable performance instances: - # CPUCreditUsage - # CPUCreditBalance - # CPUSurplusCreditBalance - # CPUSurplusCreditsCharged - - # Instance metrics: - # CPUUtilization - # DiskReadOps - # DiskWriteOps - # DiskReadBytes - # DiskWriteBytes - # NetworkIn - # NetworkOut - # NetworkPacketsIn - # NetworkPacketsOut - - # StatusCheckFailed - # StatusCheckFailed_Instance - # StatusCheckFailed_System + @property def name(self): return "ec2_instance" - def _get_raw_result(self, **kwargs): + def _get_raw_result(self): pass def _extract_content_from(self, raw_result): pass - -class CostAndUsage(AWSSection): - def name(self): - return "cost_and_usage" - - def _get_raw_result(self, **kwargs): - # Note: - # If you return the UsageQuantity metric, the service aggregates all usage - # numbers without taking into account the units. For example, if you aggregate - # usageQuantity across all of EC2, the results aren't meaningful because EC2 - # compute hours and data transfer are measured in different units (for example, - # hours vs. GB). To get more meaningful UsageQuantity metrics, filter by - # UsageType or UsageTypeGroups. - - #TODO - - now = time.time() - start = time.strftime("%Y-%m-%d", time.localtime(now)) - # End time is exclusive - end = time.strftime("%Y-%m-%d", time.localtime(now + 86400)) - return self._client.get_cost_and_usage( - TimePeriod={ - 'Start': start, - 'End': end, - }, - Granularity='DAILY', - Metrics=[ - 'UsageQuantity', - ], - ) - - def _extract_content_from(self, raw_result): - try: - return raw_result['ResultsByTime'] - except KeyError, e: - logging.info(e) - return + def _format_content(self, content): + pass # ---sections handler----------------------------------------------------- @@ -209,20 +202,27 @@ class AWSSections(object): def __init__(self, session): self._session = session self._sections = [] + self._results = {} self._exceptions = [] #---clients--------------------------------------------------------- - client_cloudwatch = self._init_client('cloudwatch') - client_ec2 = self._init_client('ec2') - client_ce = self._init_client('ce') - #client_s3 = self._init_client('s3') - #client_elb = self._init_client('elb') - #client_ebs = self._init_client('ebs') + ec2_client = self._init_client('ec2') + cloudwatch_client = self._init_client('cloudwatch') + + #---distributors---------------------------------------------------- + ec2_instances_summary_distributor = ResultDistributor() #---sections-------------------------------------------------------- - self._sections.append(EC2InstancesSummary(client_ec2)) - self._sections.append(EC2Instance(client_cloudwatch)) - self._sections.append(CostAndUsage(client_ce)) + ec2_instances_summary_section = EC2InstancesSummary(ec2_client, + ec2_instances_summary_distributor) + ec2_instance = EC2Instance(cloudwatch_client) + + #---distributors registry------------------------------------------- + ec2_instances_summary_distributor.add(ec2_instance) + + #---section registry------------------------------------------------ + self._sections.append(ec2_instances_summary_section) + self._sections.append(ec2_instance) def _init_client(self, client_key): try: @@ -242,11 +242,20 @@ class AWSSections(object): def run(self): for section in self._sections: try: - section.run() + result = section.run() except Exception as e: logging.info(e) self._exceptions.append(e) + else: + self._results.setdefault(section.name, result) + if not self._results: + logging.info("No results") + return + + self._write_results() + + def _write_results(self): sys.stdout.write("<<<aws_exceptions>>>\n") if self._exceptions: for e in self._exceptions: @@ -254,6 +263,24 @@ class AWSSections(object): else: sys.stdout.write("No exceptions\n") + for section_name, result in self._results.iteritems(): + if not result: + msg = "No results of %s" % section_name + logging.info(msg) + continue + if not isinstance(result, list): + msg = "Section result must be formatted as a list of 'AWSSectionResult's" + logging.info(msg) + raise AWSSectionError(msg) + + for row in result: + if row.piggyback_hostname: + sys.stdout.write("<<<<%s>>>>\n" % row.piggyback_hostname) + sys.stdout.write("<<<aws_%s>>>\n" % section_name) + sys.stdout.write("%s\n" % json.dumps(row.content, default=_datetime_converter)) + if row.piggyback_hostname: + sys.stdout.write("<<<<>>>>\n") + #. # .--main----------------------------------------------------------------.

5 years, 10 months

6961 FIX Unbreak check_mkevents active check.

by Sven Panne

Module: check_mk Branch: master Commit: 82dddb3c032c3155c916b468dd66c823e2b8f2c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=82dddb3c032c31… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 28 13:25:05 2018 +0100 6961 FIX Unbreak check_mkevents active check. The check_mkevents active check was inadvertedly broken in 1.5.0p7 (it could not connect to the event console), this has been fixed. Change-Id: Iee1e709fc3acbba77aba9988cb7c453cd9b1eb52 --- .werks/6961 | 11 +++++++++++ active_checks/check_mkevents.cc | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/.werks/6961 b/.werks/6961 new file mode 100644 index 0000000..90ee44e --- /dev/null +++ b/.werks/6961 @@ -0,0 +1,11 @@ +Title: Unbreak check_mkevents active check. +Level: 2 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1543407796 +Class: fix + +The check_mkevents active check was inadvertedly broken in 1.5.0p7 (it could +not connect to the event console), this has been fixed. diff --git a/active_checks/check_mkevents.cc b/active_checks/check_mkevents.cc index eb18419..e448318 100644 --- a/active_checks/check_mkevents.cc +++ b/active_checks/check_mkevents.cc @@ -207,7 +207,7 @@ int main(int argc, char **argv) { sockaddr.sun_path[sizeof(sockaddr.sun_path) - 1] = '\0'; if (0 > connect(sock, reinterpret_cast<struct sockaddr *>(&sockaddr), - sizeof(struct sockaddr))) { + sizeof(sockaddr))) { ioError("Cannot connect to event daemon via UNIX socket " + unixsocket_path); }

5 years, 10 months

Reserved 20 Werk IDS

by Sven Panne

Module: check_mk Branch: master Commit: 7cc7181e218b6143810de9667175af305e3a0d9b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=7cc7181e218b61… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Nov 28 13:22:57 2018 +0100 Reserved 20 Werk IDS Change-Id: I09c68576a526aa74ab2836db4e4a6240a83e9373 --- .werks/first_free | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.werks/first_free b/.werks/first_free index 811c12a..97286e0 100644 --- a/.werks/first_free +++ b/.werks/first_free @@ -1 +1 @@ -6961 +6981

5 years, 10 months

← Newer
1
2
3
4
5
6
7
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits November 2018