Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

by Simon Betz

Module: check_mk Branch: master Commit: a47473ed093f98f482629d67b905ef82cdf2fe75 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a47473ed093f98… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 21 11:41:19 2018 +0100 Removed dead code Change-Id: Ie96af40f42b1cdbab2ab043379bd6b25ead86c09 --- agents/special/agent_aws | 6 ------ 1 file changed, 6 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index b559b57..e8a1a9b 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -603,12 +603,6 @@ class EBSSummary(AWSSection): for piggyback_hostname, rows in content_by_piggyback_hosts.iteritems() ] - def _extract_instance_name(self, instance, instance_id): - for row in instance.get('Tags', []): - if row.get('Key') == 'Name': - return row['Value'] - return instance_id - class EBSHealth(AWSSection): @property

5 years, 6 months

dashboard.js: Refactored dashboard.js to be a module

by Lars Michelsen

Module: check_mk Branch: master Commit: ac058ce103bf9420977cf5d002744e942a023b45 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ac058ce103bf94… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:31 2018 +0100 dashboard.js: Refactored dashboard.js to be a module Change-Id: Icb5ecd877336247fba0955ae7484e842187ae662 --- cmk/gui/dashboard.py | 19 ++-- cmk/gui/htmllib.py | 2 +- web/htdocs/js/checkmk.js | 149 +++---------------------------- web/htdocs/js/index.js | 5 +- web/htdocs/js/{ => modules}/dashboard.js | 140 ++++++++++++++--------------- web/htdocs/js/modules/utils.js | 123 +++++++++++++++++++++++-- 6 files changed, 208 insertions(+), 230 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ac058ce103…

5 years, 6 months

dashboard.js: Fixed different eslint issues

by Lars Michelsen

Module: check_mk Branch: master Commit: 11bedee1ffc35c6c9df7411fbb8ec4b9b20ec142 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=11bedee1ffc35c… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:31 2018 +0100 dashboard.js: Fixed different eslint issues Change-Id: Ibdb10dc8d8b9a2d3f3a573514c80b3e96d08669e --- web/htdocs/js/dashboard.js | 103 +++++++++++++++++++++++---------------------- 1 file changed, 52 insertions(+), 51 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=11bedee1ff…

5 years, 6 months

Refactoring: Moved fireeye and generic check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 05c0ba383bab44a7753495d5b04ff2b398a6c4b9 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=05c0ba383bab44… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 20 13:51:51 2018 +0100 Refactoring: Moved fireeye and generic check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I99cacd27c12625382aca2617da165ff085e1a29d --- .../wato/check_parameters/fireeye_active_vms.py | 53 ++++++++ .../plugins/wato/check_parameters/fireeye_lic.py | 54 ++++++++ .../plugins/wato/check_parameters/fireeye_mail.py | 49 +++++++ .../plugins/wato/check_parameters/fireeye_mailq.py | 67 ++++++++++ .../wato/check_parameters/fireeye_quarantine.py | 53 ++++++++ .../wato/check_parameters/generic_number.py | 56 ++++++++ .../plugins/wato/check_parameters/generic_rate.py | 56 ++++++++ .../wato/check_parameters/generic_string.py | 49 +++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 145 --------------------- 9 files changed, 437 insertions(+), 145 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=05c0ba383b…

5 years, 6 months

dashboard.js: Changed all quotes to double quotes

by Lars Michelsen

Module: check_mk Branch: master Commit: 10e84be8635d54fd0ce24828d6cce85470b1fa7c URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=10e84be8635d54… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:30 2018 +0100 dashboard.js: Changed all quotes to double quotes Change-Id: I89bc0c285031a5d335b6f05e0f1d6c500a8cf325 --- web/htdocs/js/dashboard.js | 302 ++++++++++++++++++++++----------------------- 1 file changed, 151 insertions(+), 151 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=10e84be863…

5 years, 6 months

agent_aws: Refactored ELB sections; summary section collects state information

by Simon Betz

Module: check_mk Branch: master Commit: 18f386f194289025ebeae4db846d66d0ccc69641 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=18f386f1942890… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 21 11:12:16 2018 +0100 agent_aws: Refactored ELB sections; summary section collects state information Change-Id: I40b7c99d9fec8859bef89c6b872d0ab490e912e6 --- agents/special/agent_aws | 59 ++++++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index ddaa32f..b559b57 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -357,15 +357,15 @@ class S3(AWSSection): logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return [] - for entry in buckets: - bucket_name = entry['Name'] + for bucket in buckets: + bucket_name = bucket['Name'] response = self._client.get_bucket_location(Bucket=bucket_name) try: location = response['LocationConstraint'] except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) else: - entry['LocationConstraint'] = location + bucket['LocationConstraint'] = location response = self._client.list_objects(Bucket=bucket_name) try: @@ -373,8 +373,7 @@ class S3(AWSSection): except KeyError as e: logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) else: - entry['Contents'] = objects - + bucket['Contents'] = objects return buckets def _extract_content_from(self, raw_result): @@ -405,15 +404,27 @@ class ELBSummary(AWSSection): return 300 def _get_raw_result(self): - return self._client.describe_load_balancers() - - def _extract_content_from(self, raw_result): + response = self._client.describe_load_balancers() try: - return raw_result['LoadBalancerDescriptions'] + load_balancers = response['LoadBalancerDescriptions'] except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) return [] + for load_balancer in load_balancers: + load_balancer_name = load_balancer['LoadBalancerName'] + response = self._client.describe_instance_health(LoadBalancerName=load_balancer_name) + try: + states = response['InstanceStates'] + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, response.keys()) + else: + load_balancer['InstanceStates'] = states + return load_balancers + + def _extract_content_from(self, raw_result): + return raw_result + def _format_content(self, content): return [AWSSectionResult("", content)] @@ -428,26 +439,23 @@ class ELBHealth(AWSSection): return 300 def _get_raw_result(self): - load_balancers = {} - for entry in self._received_results.get('elb_summary', []): - name = entry['LoadBalancerName'] - load_balancers.setdefault(name, - self._client.describe_instance_health(LoadBalancerName=name)) - return load_balancers + return self._received_results.get('elb_summary', []) def _extract_content_from(self, raw_result): - content = {} - for name, row in raw_result.iteritems(): - try: - content.setdefault(name, row['InstanceStates']) - except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, row.keys()) - return content + return raw_result def _format_content(self, content): + content_by_piggyback_hosts = {} + for load_balancer in content: + try: + content_by_piggyback_hosts.setdefault(load_balancer['LoadBalancerName'], + load_balancer['InstanceStates']) + except KeyError, e: + logging.info("%s: KeyError %s; Available are %s", self.name, e, + load_balancer.keys()) return [ AWSSectionResult(piggyback_hostname, rows) - for piggyback_hostname, rows in content.iteritems() + for piggyback_hostname, rows in content_by_piggyback_hosts.iteritems() ] @@ -956,7 +964,8 @@ class AWSSections(object): logging.info(msg) raise AWSSectionError(msg) - self._write_section_result(section_name, int(now + section_interval + 60), result) + if any([r.content for r in result]): + self._write_section_result(section_name, int(now + section_interval + 60), result) def _write_section_result(self, section_name, until, result): section_header = "<<<aws_%s:persist(%s)>>>\n" % (section_name, until)

5 years, 6 months

dashboard.js: Packed globals into dashboard_properties object

by Lars Michelsen

Module: check_mk Branch: master Commit: a7d055493c2f71622e4bc16ddd649202c870692b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a7d055493c2f71… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:30 2018 +0100 dashboard.js: Packed globals into dashboard_properties object Change-Id: I0b8caee435d7361961557a883d09b41fb9ba2822 --- cmk/gui/dashboard.py | 42 ++++++------- web/htdocs/js/dashboard.js | 148 +++++++++++++++++++++++---------------------- 2 files changed, 95 insertions(+), 95 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a7d055493c…

5 years, 6 months

agent_aws: Refactored S3 sections; merged aws_s3_summary and aws_s3_objects

by Simon Betz

Module: check_mk Branch: master Commit: 3b2392ba25c7d597a34eaefa4bec5e5f23bf89c5 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=3b2392ba25c7d5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 21 10:12:47 2018 +0100 agent_aws: Refactored S3 sections; merged aws_s3_summary and aws_s3_objects Change-Id: I3cfdae0c0420c827d86aca3cc29e5fd53fc7f2f8 --- agents/special/agent_aws | 71 +++++++------------ checkman/{aws_s3_summary => aws_s3} | 0 checkman/{aws_s3_objects => aws_s3.objects} | 2 +- checks/aws_s3 | 102 ++++++++++++++++++++++++++++ checks/aws_s3_objects | 63 ----------------- checks/aws_s3_summary | 56 --------------- 6 files changed, 128 insertions(+), 166 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=3b2392ba25…

5 years, 6 months

EC: Inline _shal_terminate method

by Konstantin Büttner

Module: check_mk Branch: master Commit: c453ff96ec081cdd367f772eeede4a32a2a43ae2 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=c453ff96ec081c… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Dec 20 16:37:41 2018 +0100 EC: Inline _shal_terminate method Change-Id: I5e6c95bac6f0c131d418775fd141768a1f59b82e --- cmk/ec/main.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index 0542d05..ab92c89 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -225,7 +225,7 @@ class ECServerThread(threading.Thread): def run(self): self._logger.info("Starting up") - while not self._shal_terminate(): + while not self._terminate_event.is_set(): try: with cmk.utils.profile.Profile( enabled=self._profiling_enabled, profile_file=str(self._profile_file)): @@ -238,9 +238,6 @@ class ECServerThread(threading.Thread): self._logger.info("Terminated") - def _shal_terminate(self): - return self._terminate_event.is_set() - def terminate(self): self._terminate_event.set() @@ -938,7 +935,7 @@ class EventServer(ECServerThread): # fd to (fileobject, data) client_sockets = {} select_timeout = 1 - while not self._shal_terminate(): + while not self._terminate_event.is_set(): try: readable = select.select(listen_list + client_sockets.keys(), [], [], select_timeout)[0] @@ -2978,7 +2975,7 @@ class StatusServer(ECServerThread): self._reopen_sockets = True def serve(self): - while not self._shal_terminate(): + while not self._terminate_event.is_set(): try: client_socket = None addr_info = None

5 years, 6 months

sidebar.js: Cleaned up indentation

by Lars Michelsen

Module: check_mk Branch: master Commit: 5a3a4bd11386ae20481808f8f8aff96ca36ef7e6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5a3a4bd11386ae… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Dec 21 10:08:28 2018 +0100 sidebar.js: Cleaned up indentation Change-Id: I1a27a36b52a979853ef350f939fa57a30f5576c1 --- web/htdocs/js/sidebar.js | 518 ++++++++++++++++++++++++----------------------- 1 file changed, 260 insertions(+), 258 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5a3a4bd113…

5 years, 6 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits December 2018