Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

agent_aws: Use EC2 tag 'Name' as piggyback host if available

by Simon Betz

Module: check_mk Branch: master Commit: b1696b229ba76245238abf03f58108cc2fad8d1f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b1696b229ba762… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 14:19:42 2018 +0100 agent_aws: Use EC2 tag 'Name' as piggyback host if available Change-Id: I4b32275798274d1901b55b6b0baa751b280f1e60 --- agents/special/agent_aws | 96 +++++++++++++++++++++++++++++++++++------------- 1 file changed, 70 insertions(+), 26 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 8e6ee05..0790faf 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -213,13 +213,32 @@ class EC2Summary(AWSSection): def _extract_content_from(self, raw_result): try: - return raw_result['Reservations'] + reservations = raw_result['Reservations'] except KeyError, e: logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) - return + return [] + return { + "Reservations": reservations, + "mapping": self._map_instance_id_to_name(reservations), + } + + def _map_instance_id_to_name(self, reservations): + mapping = {} + for row in reservations: + for instance in row.get('Instances', []): + instance_id = instance['InstanceId'] + instance_name = self._extract_instance_name(instance, instance_id) + mapping.setdefault(instance_id, instance_name) + return mapping + + 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 def _format_content(self, content): - return [AWSSectionResult("", content)] + return [AWSSectionResult("", content['Reservations'])] class EC2(AWSSection): @@ -243,6 +262,8 @@ class EC2(AWSSection): # self._client.can_paginate('get_metric_data') = False raw_result = [] for chunk in _chunks(metrics): + if not chunk: + continue response = self._client.get_metric_data( MetricDataQueries=chunk, StartTime=start_time, @@ -257,10 +278,8 @@ class EC2(AWSSection): return raw_result def _get_metrics(self): - instance_ids = [] - for entry in self._received_results.get('ec2_summary', []): - for instance in entry.get('Instances', []): - instance_ids.append(instance['InstanceId']) + instance_ids = self._received_results.get('ec2_summary', {})\ + .get('mapping', {}).values() metrics = [] idx = 0 for instance_id in instance_ids: @@ -298,11 +317,7 @@ class EC2(AWSSection): return metrics def _extract_content_from(self, raw_result): - try: - return raw_result['MetricDataResults'] - except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) - return [] + return raw_result def _format_content(self, content): content_by_piggyback_hosts = {} @@ -474,6 +489,8 @@ class ELB(AWSSection): # self._client.can_paginate('get_metric_data') = False raw_result = [] for chunk in _chunks(metrics): + if not chunk: + continue response = self._client.get_metric_data( MetricDataQueries=chunk, StartTime=start_time, @@ -581,16 +598,26 @@ class EBSSummary(AWSSection): return [] def _format_content(self, content): + instance_ids = self._received_results.get('ec2_summary', {})\ + .get('mapping', {}) content_by_piggyback_hosts = {} for row in content: for attachment in row['Attachments']: - content_by_piggyback_hosts.setdefault(attachment['InstanceId'], [])\ + attachment_id = attachment['InstanceId'] + instance_name = instance_ids.get(attachment_id, attachment_id) + content_by_piggyback_hosts.setdefault(instance_name, [])\ .append(row) return [ AWSSectionResult(piggyback_hostname, rows) 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 @@ -617,11 +644,15 @@ class EBSHealth(AWSSection): return content def _format_content(self, content): + instance_ids = self._received_results.get('ec2_summary', {})\ + .get('mapping', {}) content_by_piggyback_hosts = {} for row in self._received_results.get('ebs_summary', []): vol_id = row['VolumeId'] - for attachement in row['Attachments']: - content_by_piggyback_hosts.setdefault(attachement['InstanceId'], [])\ + for attachment in row['Attachments']: + attachment_id = attachment['InstanceId'] + instance_name = instance_ids.get(attachment_id, attachment_id) + content_by_piggyback_hosts.setdefault(instance_name, [])\ .append({vol_id: content[vol_id]}) return [ AWSSectionResult(piggyback_hostname, rows) @@ -650,6 +681,8 @@ class EBS(AWSSection): # self._client.can_paginate('get_metric_data') = False raw_result = [] for chunk in _chunks(metrics): + if not chunk: + continue response = self._client.get_metric_data( MetricDataQueries=chunk, StartTime=start_time, @@ -664,12 +697,19 @@ class EBS(AWSSection): return raw_result def _get_metrics(self): + instance_ids = self._received_results.get('ec2_summary', {})\ + .get('mapping', {}) volumes = [] - for entry in self._received_results.get('ebs_summary', []): - volumes.append((entry['VolumeId'], entry['VolumeType'])) + for row in self._received_results.get('ebs_summary', []): + vol_id = row['VolumeId'] + vol_type = row['VolumeType'] + for attachment in row['Attachments']: + attachment_id = attachment['InstanceId'] + instance_name = instance_ids.get(attachment_id, attachment_id) + volumes.append((instance_name, vol_id, vol_type)) metrics = [] idx = 0 - for volume_name, volume_type in volumes: + for instance_name, volume_name, volume_type in volumes: for metric_name, unit, volume_types in [ # Disk IO ("VolumeReadOps", "Count", []), @@ -693,7 +733,7 @@ class EBS(AWSSection): continue metric = { 'Id': "%s_%s" % (metric_name.lower(), idx), - 'Label': volume_name, + 'Label': instance_name, 'MetricStat': { 'Metric': { 'Namespace': 'AWS/EBS', @@ -714,15 +754,16 @@ class EBS(AWSSection): return metrics def _extract_content_from(self, raw_result): - try: - return raw_result['MetricDataResults'] - except KeyError, e: - logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) - return [] + return raw_result def _format_content(self, content): - #TODO instance ID as piggyback hostname - return + content_by_piggyback_hosts = {} + for row in content: + content_by_piggyback_hosts.setdefault(row['Label'], []).append(row) + return [ + AWSSectionResult(piggyback_hostname, rows) + for piggyback_hostname, rows in content_by_piggyback_hosts.iteritems() + ] #. @@ -832,6 +873,9 @@ class AWSSections(object): #---register sections to distributors------------------------------- ec2_summary_distributor.add(ec2) + ec2_summary_distributor.add(ebs_summary) + ec2_summary_distributor.add(ebs_health) + ec2_summary_distributor.add(ebs) s3_summary_distributor.add(s3_objects) elb_summary_distributor.add(elb_health) elb_summary_distributor.add(elb)

5 years, 6 months

EC: Minor refactoring

by Konstantin Büttner

Module: check_mk Branch: master Commit: 2df021a0efeb011b7c2490235461babd5d39ceb6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2df021a0efeb01… Author: Konstantin Büttner <kb(a)mathias-kettner.de> Date: Thu Dec 20 12:35:20 2018 +0100 EC: Minor refactoring Having the non-EOF-case first when reading data from a pipe is more readable. Change-Id: Ia173ab58a412bed6a4660998f7a3979d19c8e125 --- cmk/ec/main.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cmk/ec/main.py b/cmk/ec/main.py index a4372d0..4e10814 100644 --- a/cmk/ec/main.py +++ b/cmk/ec/main.py @@ -1002,17 +1002,7 @@ class EventServer(ECServerThread): if pipe in readable: try: data = os.read(pipe, 4096) - if len(data) == 0: # END OF FILE! - os.close(pipe) - pipe = self.open_pipe() - listen_list[0] = pipe - # Pending fragments from previos reads that are not terminated - # by a \n are ignored. - if pipe_fragment: - self._logger.warning( - "Ignoring incomplete message '%s' from pipe" % pipe_fragment) - pipe_fragment = "" - else: + if data: # Prepend previous beginning of message to read data data = pipe_fragment + data pipe_fragment = "" @@ -1026,6 +1016,16 @@ class EventServer(ECServerThread): pipe_fragment = data # keep beginning of message, wait for \n else: self.process_raw_lines(data) + else: # EOF + os.close(pipe) + pipe = self.open_pipe() + listen_list[0] = pipe + # Pending fragments from previos reads that are not terminated + # by a \n are ignored. + if pipe_fragment: + self._logger.warning( + "Ignoring incomplete message '%s' from pipe" % pipe_fragment) + pipe_fragment = "" except Exception: pass

5 years, 6 months

Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 953f883189bdacf35ec936f8e6d412f3913d5ec3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=953f883189bdac… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 6 14:37:45 2018 +0100 Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I3bbceaef6c34b5a28d3668175c03b92b5f822c6f --- .../plugins/wato/check_parameters/firewall_if.py | 71 +++++++ .../wato/check_parameters/kaspersky_av_client.py | 63 ++++++ .../wato/check_parameters/mcafee_av_client.py | 50 +++++ .../check_parameters/mcafee_emailgateway_bridge.py | 67 +++++++ .../wato/check_parameters/mcafee_web_gateway.py | 62 ++++++ .../check_parameters/mcafee_web_gateway_misc.py | 60 ++++++ .../wato/check_parameters/pfsense_counter.py | 102 ++++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 222 --------------------- 8 files changed, 475 insertions(+), 222 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=953f883189…

5 years, 6 months

agent_azure: always create agent info service for group host

by Moritz Kiemer

Module: check_mk Branch: master Commit: 13ce6cc5cfd8d57d1f19bc3fdd94bc2f35120108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=13ce6cc5cfd8d5… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 12:18:26 2018 +0100 agent_azure: always create agent info service for group host Change-Id: Ia922fb256b626a1c46c344418a030eb8b0035aac --- agents/special/agent_azure | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/agents/special/agent_azure b/agents/special/agent_azure index 3152c1e..3e86413 100755 --- a/agents/special/agent_azure +++ b/agents/special/agent_azure @@ -586,6 +586,10 @@ def write_groups(resources): section = Section('agent_info') section.add(('monitored-groups', json.dumps(groups))) section.write() + # create empty agent_info section for all groups, otherwise + # the service will only be discovered if something goes wrong + for group in groups: + Section('agent_info', group).write() def main(argv=None):

5 years, 6 months

aws_s3_objects: Made parse function more robust

by Simon Betz

Module: check_mk Branch: master Commit: ebac9a5655faa339000bb7d303dbc60cb3900832 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebac9a5655faa3… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 11:20:24 2018 +0100 aws_s3_objects: Made parse function more robust Change-Id: I16e2b331013d5d509f578c7296fcb6919df8c531 --- checks/aws_s3_objects | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/checks/aws_s3_objects b/checks/aws_s3_objects index 6c394eb..1c2b501 100644 --- a/checks/aws_s3_objects +++ b/checks/aws_s3_objects @@ -26,7 +26,10 @@ def parse_aws_s3_objects(info): - return parse_aws(info)[-1] + try: + return parse_aws(info)[-1] + except IndexError: + return {} def inventory_aws_s3_objects(parsed):

5 years, 6 months

agent_azure: Downgrade azure-mgmt-monitor

by Moritz Kiemer

Module: check_mk Branch: master Commit: 9bd06fa8c646262ccd08f5be3b218fc0b9874477 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=9bd06fa8c64626… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Thu Dec 20 11:53:41 2018 +0100 agent_azure: Downgrade azure-mgmt-monitor We have to downgrade azure-mgmt-monitor and its dependency msrestazure since the monitor version 0.5.0 will not deliver all metrics. Change-Id: I54d695f073feebdf24f604a7eb4d9f2085eeaf08 --- Pipfile | 7 +++++-- Pipfile.lock | 22 ++++++++++----------- omd/packages/python-modules/python-modules.make | 7 +++++-- .../src/azure-mgmt-monitor-0.4.0.zip | Bin 0 -> 118541 bytes .../src/azure-mgmt-monitor-0.5.2.zip | Bin 258952 -> 0 bytes .../python-modules/src/msrestazure-0.4.34.tar.gz | Bin 0 -> 29668 bytes .../python-modules/src/msrestazure-0.5.0.tar.gz | Bin 26781 -> 0 bytes 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/Pipfile b/Pipfile index a5359d3..11b34a6 100644 --- a/Pipfile +++ b/Pipfile @@ -83,8 +83,11 @@ isodate = "==0.6.0" oauthlib = "==2.1.0" requests-oauthlib = "==1.0.0" msrest = "==0.6.1" -msrestazure = "==0.5.0" -azure-mgmt-monitor = "==0.5.2" +# use azure-mgmt-monitor 0.4.0 and its dependency +# msrestazure 0.4.34 since the monitor version 0.5.0 +# will not deliver all metrics. +msrestazure = "==0.4.34" +azure-mgmt-monitor = "==0.4.0" azure-mgmt-resource = "==2.0.0" azure-mgmt-compute = "==4.3.1" configparser = "==3.5.0" diff --git a/Pipfile.lock b/Pipfile.lock index 0ce3a71..3dc8ef8 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "9505dfaedd438bfb82a7dad83417e836ff3995e41132a8a4d534162378ff74b5" + "sha256": "5d8f69a83ce41ca3d51d618ccc3b8be542e3028e8636a7ac3115eef8d01203d7" }, "pipfile-spec": 6, "requires": { @@ -50,11 +50,11 @@ }, "azure-mgmt-monitor": { "hashes": [ - "sha256:838867a150694837e9c6141760ff0f20fe9e5b7ab88f9ba868fde1810855895e", - "sha256:f1a58d483e3292ba4f7bbf3104573130c9265d6c9262e26b60cbfa950b5601e4" + "sha256:1c9457c38cfe6704de3ab7320a145bb3a25cd41f55242d53e5519bf3e676eb44", + "sha256:e0c04b05ed45e192215c75f63c7d3262cebd68337861545679119755645e9c18" ], "index": "pypi", - "version": "==0.5.2" + "version": "==0.4.0" }, "azure-mgmt-nspkg": { "hashes": [ @@ -348,11 +348,11 @@ }, "msrestazure": { "hashes": [ - "sha256:2e756de45ddc2ea7c34b8dc267a5d18804f2eb6a432626ace465ffed6081455d", - "sha256:73f31d3d0351a3f05b31b0b3018335dc78ee7664601198ee854f443e36df3660" + "sha256:4fc94a03ecd5b094ab904d929cc5be7a6a80262eab93948260cfe9081a9e6de4", + "sha256:89ec2d41bbcf9e38d12b61f923c2903059e87da2a8f1f6ac841bff85846b529e" ], "index": "pypi", - "version": "==0.5.0" + "version": "==0.4.34" }, "mysqlclient": { "hashes": [ @@ -961,7 +961,7 @@ "sha256:9d98697f088eb1b0fa451391f91afb5e3ebde16bbdb272819fd091151fda4f1a", "sha256:f0b0e4eba956de51238e17573b7087e852dfe9854afd2e9c873f73fc0ca0a6dd" ], - "markers": "python_version < '3.4'", + "markers": "python_version == '2.7'", "version": "==1.5" }, "backports.ssl-match-hostname": { @@ -1314,11 +1314,11 @@ }, "pytest": { "hashes": [ - "sha256:1d131cc532be0023ef8ae265e2a779938d0619bb6c2510f52987ffcba7fa1ee4", - "sha256:ca4761407f1acc85ffd1609f464ca20bb71a767803505bd4127d0e45c5a50e23" + "sha256:f689bf2fc18c4585403348dd56f47d87780bf217c53ed9ae7a3e2d7faa45f8e9", + "sha256:f812ea39a0153566be53d88f8de94839db1e8a05352ed8a49525d7d7f37861e9" ], "index": "pypi", - "version": "==4.0.1" + "version": "==4.0.2" }, "pytest-cov": { "hashes": [ diff --git a/omd/packages/python-modules/python-modules.make b/omd/packages/python-modules/python-modules.make index 1f77f24..ce49daa 100644 --- a/omd/packages/python-modules/python-modules.make +++ b/omd/packages/python-modules/python-modules.make @@ -164,8 +164,11 @@ PYTHON_MODULES_LIST += isodate-0.6.0.tar.gz PYTHON_MODULES_LIST += oauthlib-2.1.0.tar.gz PYTHON_MODULES_LIST += requests-oauthlib-1.0.0.tar.gz PYTHON_MODULES_LIST += msrest-0.6.1.tar.gz -PYTHON_MODULES_LIST += msrestazure-0.5.0.tar.gz -PYTHON_MODULES_LIST += azure-mgmt-monitor-0.5.2.zip +# use azure-mgmt-monitor 0.4.0 and its dependency +# msrestazure 0.4.34 since the monitor version 0.5.0 +# will not deliver all metrics. +PYTHON_MODULES_LIST += msrestazure-0.4.34.tar.gz +PYTHON_MODULES_LIST += azure-mgmt-monitor-0.4.0.zip PYTHON_MODULES_LIST += azure-mgmt-resource-2.0.0.zip PYTHON_MODULES_LIST += azure-mgmt-compute-4.3.1.zip PYTHON_MODULES_LIST += configparser-3.5.0.tar.gz diff --git a/omd/packages/python-modules/src/azure-mgmt-monitor-0.4.0.zip b/omd/packages/python-modules/src/azure-mgmt-monitor-0.4.0.zip new file mode 100644 index 0000000..caefb79 Binary files /dev/null and b/omd/packages/python-modules/src/azure-mgmt-monitor-0.4.0.zip differ diff --git a/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip b/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip deleted file mode 100644 index 99c3087..0000000 Binary files a/omd/packages/python-modules/src/azure-mgmt-monitor-0.5.2.zip and /dev/null differ diff --git a/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz b/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz new file mode 100644 index 0000000..f819e46 Binary files /dev/null and b/omd/packages/python-modules/src/msrestazure-0.4.34.tar.gz differ diff --git a/omd/packages/python-modules/src/msrestazure-0.5.0.tar.gz b/omd/packages/python-modules/src/msrestazure-0.5.0.tar.gz deleted file mode 100644 index 168ab6d..0000000 Binary files a/omd/packages/python-modules/src/msrestazure-0.5.0.tar.gz and /dev/null differ

5 years, 6 months

Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393)

by Kenneth Okoh

Module: check_mk Branch: master Commit: 234f8e67ec98bf267f65b4abd8a89ee794fb8340 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=234f8e67ec98bf… Author: Kenneth Okoh <ko(a)mathias-kettner.de> Date: Thu Dec 6 14:29:21 2018 +0100 Refactoring: Moved more application check parameters from unsorted.py to dedicated modules (CMK-1393) Change-Id: I8faab5273fc0dc413b49883070d19e1d9d209796 --- .../plugins/wato/check_parameters/plesk_backups.py | 80 +++++ .../plugins/wato/check_parameters/sshd_config.py | 145 +++++++++ cmk/gui/plugins/wato/check_parameters/unsorted.py | 334 --------------------- .../plugins/wato/check_parameters/websphere_mq.py | 118 ++++++++ .../wato/check_parameters/websphere_mq_channels.py | 105 +++++++ .../wato/check_parameters/websphere_mq_instance.py | 62 ++++ .../wato/check_parameters/websphere_mq_manager.py | 86 ++++++ 7 files changed, 596 insertions(+), 334 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=234f8e67ec…

5 years, 6 months

agent_aws: Adapted help text of region option

by Simon Betz

Module: check_mk Branch: master Commit: 58f351de2cefea6dc3be0c4e585d606ceb758dca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=58f351de2cefea… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 11:20:24 2018 +0100 agent_aws: Adapted help text of region option Change-Id: Icc1e0618af271505062a2bd7db28d4183cc9b1a6 --- agents/special/agent_aws | 41 ++++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 648958d..8e6ee05 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -958,6 +958,27 @@ class AWSSections(object): # | | # '----------------------------------------------------------------------' +AWSRegions = [ + ("ap-south-1", "Asia Pacific (Mumbai)"), + ("ap-northeast-3", "Asia Pacific (Osaka-Local)"), + ("ap-northeast-2", "Asia Pacific (Seoul)"), + ("ap-southeast-1", "Asia Pacific (Singapore)"), + ("ap-southeast-2", "Asia Pacific (Sydney)"), + ("ap-northeast-1", "Asia Pacific (Tokyo)"), + ("ca-central-1", "Canada (Central)"), + ("cn-north-1", "China (Beijing)"), + ("cn-northwest-1", "China (Ningxia)"), + ("eu-central-1", "EU (Frankfurt)"), + ("eu-west-1", "EU (Ireland)"), + ("eu-west-2", "EU (London)"), + ("eu-west-3", "EU (Paris)"), + ("sa-east-1", "South America (Sao Paulo)"), + ("us-east-2", "US East (Ohio)"), + ("us-east-1", "US East (N. Virginia)"), + ("us-west-1", "US West (N. California)"), + ("us-west-2", "US West (Oregon)"), +] + def parse_arguments(argv): parser = argparse.ArgumentParser( @@ -970,25 +991,7 @@ def parse_arguments(argv): parser.add_argument( "--region", required=True, - help="""The region to use: -ap-south-1 Asia Pacific (Mumbai) -ap-northeast-3 Asia Pacific (Osaka-Local) -ap-northeast-2 Asia Pacific (Seoul) -ap-southeast-1 Asia Pacific (Singapore) -ap-southeast-2 Asia Pacific (Sydney) -ap-northeast-1 Asia Pacific (Tokyo) -ca-central-1 Canada (Central) -cn-north-1 China (Beijing) -cn-northwest-1 China (Ningxia) -eu-central-1 EU (Frankfurt) -eu-west-1 EU (Ireland) -eu-west-2 EU (London) -eu-west-3 EU (Paris) -sa-east-1 South America (Sao Paulo) -us-east-2 US East (Ohio) -us-east-1 US East (N. Virginia) -us-west-1 US West (N. California) -us-west-2 US West (Oregon)""") + help="The region to use:\n%s" % "\n".join(["%-15s %s" % e for e in AWSRegions])) parser.add_argument( "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") parser.add_argument("hostname")

5 years, 6 months

agent_aws: Added regions to help text

by Simon Betz

Module: check_mk Branch: master Commit: ebd453b7b1c2d6fdd4dff47b9e56f592f9cf1df6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ebd453b7b1c2d6… Author: Simon Betz <si(a)mathias-kettner.de> Date: Thu Dec 20 09:36:14 2018 +0100 agent_aws: Added regions to help text Change-Id: I6d7effa44f9235c71ea53932c474e082a971639e --- agents/special/agent_aws | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4afda0c..648958d 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -960,13 +960,35 @@ class AWSSections(object): def parse_arguments(argv): - parser = argparse.ArgumentParser(description=__doc__) + parser = argparse.ArgumentParser( + description=__doc__, formatter_class=argparse.RawTextHelpFormatter) parser.add_argument("--debug", action="store_true", help="Raise Python exceptions.") 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.") - parser.add_argument("--region", required=True, help="The region to use.") + parser.add_argument( + "--region", + required=True, + help="""The region to use: +ap-south-1 Asia Pacific (Mumbai) +ap-northeast-3 Asia Pacific (Osaka-Local) +ap-northeast-2 Asia Pacific (Seoul) +ap-southeast-1 Asia Pacific (Singapore) +ap-southeast-2 Asia Pacific (Sydney) +ap-northeast-1 Asia Pacific (Tokyo) +ca-central-1 Canada (Central) +cn-north-1 China (Beijing) +cn-northwest-1 China (Ningxia) +eu-central-1 EU (Frankfurt) +eu-west-1 EU (Ireland) +eu-west-2 EU (London) +eu-west-3 EU (Paris) +sa-east-1 South America (Sao Paulo) +us-east-2 US East (Ohio) +us-east-1 US East (N. Virginia) +us-west-1 US West (N. California) +us-west-2 US West (Oregon)""") parser.add_argument( "--no-cache", action="store_true", help="Execute all sections, do not rely on cached data.") parser.add_argument("hostname")

5 years, 6 months

[CMK-1454] - script to clean WMI "root/OpenHardwareMonitor"

by Sergey Kipnis

branch in Windows. Message-ID: <5c1b5f10.AKckFMlz1Q+7MnDJ%sk(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.5 6/20/10 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 38f6e99ce7cfeeeb5fdfc0fe427cafb8981c04bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=38f6e99ce7cfee… Author: Sergey Kipnis <sk(a)mathias-kettner.de> Date: Wed Dec 19 16:55:04 2018 +0100 [CMK-1454] - script to clean WMI "root/OpenHardwareMonitor" branch in Windows. - in some cases this branch which used to create the section openhardwaremonitor" may become not readable(not accessible) - the script stops agent and openhardwaremoniotr, deletes branch and restarts agent Change-Id: I825df5e87179aa5e9099ef6a2c76311cf05d4ab5 --- doc/treasures/windows/.gitignore | 3 ++- .../windows/openhardwaremonitor-clean.cmd | 23 ++++++++++++++++++++++ doc/treasures/windows/readme.txt | 8 +++++++- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/doc/treasures/windows/.gitignore b/doc/treasures/windows/.gitignore index 27485e2..797128b 100644 --- a/doc/treasures/windows/.gitignore +++ b/doc/treasures/windows/.gitignore @@ -1 +1,2 @@ -!*.exe \ No newline at end of file +!*.exe +!*.cmd \ No newline at end of file diff --git a/doc/treasures/windows/openhardwaremonitor-clean.cmd b/doc/treasures/windows/openhardwaremonitor-clean.cmd new file mode 100644 index 0000000..855fafe --- /dev/null +++ b/doc/treasures/windows/openhardwaremonitor-clean.cmd @@ -0,0 +1,23 @@ +@echo off +rem ************************************************************************************** +rem This small script is used to solve problems with OpenHardwareMonitor section +rem "Administrative Rights" are required +rem ************************************************************************************** +rem 1. If openhardwaremonitor section is absent, you may try this solution. +rem 2. The script is relative safe: stops OHM WMI provider and clean WMI data. +rem 3. As additional check you may also try in powershell command +rem Get-WmiObject -Namespace "root\OpenHardwareMonitor" -Class Sensor -Impersonation 3 +rem start powershell.exe, copy paste string above and hit Enter. +rem If output is absent or command is hanging up, then you should try this script +rem ************************************************************************************** +rem Do not forget: Your Agent must be configured to provide OpenHardwareMoniotr section +rem ************************************************************************************** +net session 2> nul +if %errorlevel% NEQ 0 powershell Write-Host "Administrative Rights are required to run this Script" -Foreground Red && exit /B 1 +powershell Write-Host "Stopping Windows Agent and OpenHardwareMonitor..." -Foreground Cyan +net stop check_mk_agent +taskkill.exe /F /IM OpenHardwareMonitorCLI.exe +powershell Write-Host "Cleaning WMI..." -Foreground Cyan +powershell.exe -command "Get-WmiObject -query \"Select * From __Namespace Where Name='OpenHardwareMonitor'\" -Namespace \"root\" | Remove-WmiObject" +powershell Write-Host "Starting Windows Agent again..." -Foreground Cyan +net start check_mk_agent diff --git a/doc/treasures/windows/readme.txt b/doc/treasures/windows/readme.txt index 86822bd..a059012 100644 --- a/doc/treasures/windows/readme.txt +++ b/doc/treasures/windows/readme.txt @@ -2,7 +2,7 @@ Assorted Windows Utilities 1. perf_reader.exe Synopsis: - Prevent Handle Leaks on some ( usually old ) Windows OS + Prevents Handle Leaks on some ( usually old ) Windows OS Usage: 1. Create in check_mk folder subfolder "utils". For example: mkdir "c:\Program Files (x86)\check_mk\utils" @@ -11,3 +11,9 @@ Usage: 3. Optionally you may test functionality: goto folder "check_mk" and run check_mk_agent perfread Note: you may need administrative privileges. + +2. openhardwaremonitor-clean.cmd +Synopsis: + Solves problems with OpenHardwareMonitor section. +Usage: + Run the script from Windows command line as Administrator

5 years, 6 months

← Newer
1
...
4
5
6
7
8
9
10
...
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