Checkmk git commits January 2019

checkmk-commits@lists.checkmk.com

15 participants
490 discussions

by Simon Betz

Module: check_mk Branch: master Commit: 206cd35168cf883bf65919d404fe5e13aef26036 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=206cd35168cf88… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 30 12:48:49 2019 +0100 agent_aws: Minor cleanups Change-Id: I7725026523d787c6bee2d3ea825dfa2841e12693 --- agents/special/agent_aws | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index c51ff2b..d93fb7a 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -979,8 +979,6 @@ class AWSSections(object): self._session = session self._services = services self._sections = [] - self._results = {} - self._exceptions = [] @abc.abstractmethod def init_sections(self, **kwargs): @@ -999,26 +997,25 @@ class AWSSections(object): # during we execute an operation, eg. cloudwatch.get_metrics(**kwargs): # - botocore.exceptions.EndpointConnectionError logging.info(e) - self._exceptions.append(e) def run(self, use_cache=True): now = time.time() + exceptions = [] + results = {} for section in self._sections: if use_cache and self._section_cache_is_recent_enough(now, section): continue try: result = section.run() - except botocore.exceptions.EndpointConnectionError: - raise except Exception as e: logging.info(e) - self._exceptions.append(e) + exceptions.append(e) else: - self._results.setdefault((section.name, section.interval), result) + results.setdefault((section.name, section.interval), result) - self._write_exceptions() - self._write_section_results(now) + self._write_exceptions(exceptions) + self._write_section_results(now, results) def _section_cache_is_recent_enough(self, now, section): state_dir = AWSStateFilesPath / self._hostname @@ -1046,20 +1043,20 @@ class AWSSections(object): return False return True - def _write_exceptions(self): + def _write_exceptions(self, exceptions): sys.stdout.write("<<<aws_exceptions>>>\n") - if self._exceptions: - out = "\n".join([e.message for e in self._exceptions]) + if exceptions: + out = "\n".join([e.message for e in exceptions]) else: out = "No exceptions" sys.stdout.write("%s: %s\n" % (self.__class__.__name__, out)) - def _write_section_results(self, now): - if not self._results: + def _write_section_results(self, now, results): + if not results: logging.info("No results or cached data") return - for (section_name, section_interval), result in self._results.iteritems(): + for (section_name, section_interval), result in results.iteritems(): if not result: logging.info("No results of %s", section_name) continue

5 years, 8 months

agent_aws: Make steps 'fetching data', 'distribution of results' and ' creating output' clearer

by Simon Betz

Module: check_mk Branch: master Commit: 269a4a3373e2e50f4cc57d58e8e88ce89edccd57 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=269a4a3373e2e5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 30 11:53:46 2019 +0100 agent_aws: Make steps 'fetching data', 'distribution of results' and 'creating output' clearer Change-Id: I31e377a4a0f9f186a4d7c5915120e9e9f7e67a56 --- agents/special/agent_aws | 477 +++++++++++++++++++++++++---------------------- 1 file changed, 259 insertions(+), 218 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=269a4a3373…

5 years, 8 months

agent_aws: Skip S3 buckets with wrong region

by Simon Betz

Module: check_mk Branch: master Commit: a3f7e5b081187299dfe8ebc4c0e588640c064782 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a3f7e5b0811872… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Jan 30 12:26:46 2019 +0100 agent_aws: Skip S3 buckets with wrong region Change-Id: I1a63ecf3b5043bda7036b1004d55286a9b069bff --- agents/special/agent_aws | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4467372..c51ff2b 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -458,9 +458,10 @@ class EC2(AWSSectionCloudwatch): class S3Summary(AWSSectionGeneric): - def __init__(self, client, distributor=None, buckets=None): + def __init__(self, client, distributor=None, buckets=None, region=None): super(S3Summary, self).__init__(client, distributor=distributor) self._buckets = self._determine_buckets(buckets) + self._region = region def _determine_buckets(self, buckets): if buckets: @@ -484,6 +485,7 @@ class S3Summary(AWSSectionGeneric): return def _fetch_raw_content(self, colleague_contents): + buckets = [] for bucket in self._buckets: bucket_name = bucket['Name'] response = self._client.get_bucket_location(Bucket=bucket_name) @@ -492,8 +494,13 @@ class S3Summary(AWSSectionGeneric): except KeyError as e: logging.info("%s/%s: KeyError %s; Available are %s", self.name, bucket_name, e, response.keys()) - else: - bucket['LocationConstraint'] = location + location = None + + # We can request buckets globally but if a bucket is located in + # another region we do not get any results + if location is None or location != self._region: + continue + bucket['LocationConstraint'] = location try: response = self._client.get_bucket_tagging(Bucket=bucket_name) @@ -506,7 +513,8 @@ class S3Summary(AWSSectionGeneric): response.keys()) else: bucket['Tagging'] = tagging - return self._buckets + buckets.append(bucket) + return buckets def _compute_content(self, raw_content, colleague_contents): return raw_content @@ -1090,37 +1098,27 @@ class AWSSectionsUSEast(AWSSections): def init_sections(self, **kwargs): #---clients--------------------------------------------------------- ce_client = self._init_client('ce') - s3_client = self._init_client('s3') - cloudwatch_client = self._init_client('cloudwatch') #---distributors---------------------------------------------------- - s3_summary_distributor = ResultDistributor() #---sections with distributors-------------------------------------- - s3_summary = S3Summary( - s3_client, distributor=s3_summary_distributor, buckets=kwargs.get('buckets')) #---sections-------------------------------------------------------- ce = CostsAndUsage(ce_client) - s3 = S3(cloudwatch_client) #---register sections to distributors------------------------------- - s3_summary_distributor.add(s3) #---register sections for execution--------------------------------- if 'ce' in self._services: self._sections.append(ce) - if 's3' in self._services: - self._sections.append(s3_summary) - self._sections.append(s3) - class AWSSectionsGeneric(AWSSections): def init_sections(self, **kwargs): #---clients--------------------------------------------------------- ec2_client = self._init_client('ec2') elb_client = self._init_client('elb') + s3_client = self._init_client('s3') cloudwatch_client = self._init_client('cloudwatch') #---distributors---------------------------------------------------- @@ -1128,18 +1126,25 @@ class AWSSectionsGeneric(AWSSections): ec2_summary_distributor = ResultDistributor() elb_summary_distributor = ResultDistributor() ebs_summary_distributor = ResultDistributor() + s3_summary_distributor = ResultDistributor() #---sections with distributors-------------------------------------- security_groups = SecurityGroups(ec2_client, security_groups_distributor) ec2_summary = EC2Summary(ec2_client, ec2_summary_distributor) ebs_summary = EBSSummary(ec2_client, ebs_summary_distributor) elb_summary = ELBSummary(elb_client, elb_summary_distributor) + s3_summary = S3Summary( + s3_client, + distributor=s3_summary_distributor, + buckets=kwargs.get('buckets'), + region=kwargs.get('region')) #---sections-------------------------------------------------------- elb_health = ELBHealth(elb_client) ec2 = EC2(cloudwatch_client) ebs = EBS(cloudwatch_client) elb = ELB(cloudwatch_client) + s3 = S3(cloudwatch_client) #---register sections to distributors------------------------------- security_groups_distributor.add(ec2_summary) @@ -1149,6 +1154,7 @@ class AWSSectionsGeneric(AWSSections): ebs_summary_distributor.add(ebs) elb_summary_distributor.add(elb_health) elb_summary_distributor.add(elb) + s3_summary_distributor.add(s3) #---register sections for execution--------------------------------- # Dependencies: First append sections which distribute their results: @@ -1183,6 +1189,10 @@ class AWSSectionsGeneric(AWSSections): self._sections.append(elb_health) self._sections.append(elb) + if 's3' in self._services: + self._sections.append(s3_summary) + self._sections.append(s3) + #. # .--main----------------------------------------------------------------. @@ -1296,7 +1306,7 @@ def main(args=None): try: session = create_session(access_key_id, secret_access_key, region) aws_sections = AWSSectionsGeneric(hostname, session, services) - aws_sections.init_sections() + aws_sections.init_sections(region=region) aws_sections.run(use_cache=use_cache) except Exception as e: if args.debug:

5 years, 8 months

aws_elb*: New checks for AWS/ELB

by Simon Betz

Module: check_mk Branch: master Commit: a5ef6187b22e7b8f14b3266b8b911d0d596bd108 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a5ef6187b22e7b… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Jan 25 15:19:00 2019 +0100 aws_elb*: New checks for AWS/ELB These checks are: aws_elb, aws_elb.backend_errors, aws_elb.healthy_hosts, aws_elb.http_backend, aws_elb.http_elb, aws_elb.latency Change-Id: Ie06b4c700093348365bf577fddd89d2c7f5e8915 --- agents/special/agent_aws | 14 +- checkman/aws_elb | 19 ++ checkman/aws_elb.backend_connection_errors | 15 ++ checkman/aws_elb.healthy_hosts | 14 ++ checkman/aws_elb.http_backend | 16 ++ checkman/aws_elb.http_elb | 16 ++ checkman/aws_elb.latency | 14 ++ checks/aws_elb | 318 +++++++++++++++++++++++++++ cmk/gui/plugins/metrics/check_mk.py | 50 ++++- cmk/gui/plugins/wato/check_parameters/aws.py | 109 +++++++++ cmk/gui/plugins/wato/datasource_programs.py | 2 + tests/unit/cmk/gui/watolib/test_rulespecs.py | 164 +++++++++++++- 12 files changed, 741 insertions(+), 10 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=a5ef6187b2…

5 years, 8 months

aws_s3: Use cloudwatch for gathering the bucket size and the number of objects

by Simon Betz

Module: check_mk Branch: master Commit: 297ac20c485777ba0a73e9af24ed4ae7c5992950 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=297ac20c485777… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Jan 29 09:29:32 2019 +0100 aws_s3: Use cloudwatch for gathering the bucket size and the number of objects Change-Id: I50e79e2f0f4654a15f30e7cf26be4e38a9873e8b --- agents/special/agent_aws | 88 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 75 insertions(+), 13 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4e89125..d69a771 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -464,7 +464,7 @@ class S3Summary(AWSSectionGeneric): return 86400 def _extract_content_from_raw_result(self): - paginator = self._client.get_paginator('list_objects') + #paginator = self._client.get_paginator('list_objects') for bucket in self._buckets: bucket_name = bucket['Name'] response = self._client.get_bucket_location(Bucket=bucket_name) @@ -488,23 +488,73 @@ class S3Summary(AWSSectionGeneric): else: bucket['Tagging'] = tagging - contents = [] - pages = paginator.paginate(Bucket=bucket_name) - for page in pages: - try: - objects = page['Contents'] - except KeyError as e: - logging.info("%s/%s: KeyError %s; Available are %s", self.name, bucket_name, e, - page.keys()) - else: - contents += objects - bucket['Contents'] = contents + #contents = [] + #pages = paginator.paginate(Bucket=bucket_name) + #for page in pages: + # try: + # objects = page['Contents'] + # except KeyError as e: + # logging.info("%s/%s: KeyError %s; Available are %s", self.name, bucket_name, e, + # page.keys()) + # else: + # contents += objects + #bucket['Contents'] = contents return self._buckets def _format_content(self, content): return [AWSSectionResult("", content)] +class S3(AWSSectionCloudwatch): + @property + def name(self): + return "s3" + + @property + def interval(self): + return 86400 + + def _get_metrics(self): + metrics = [] + idx = 0 + for bucket in self._received_results.get('s3_summary', []): + bucket_name = bucket['Name'] + for metric_name, unit, storage_classes in [ + ("BucketSizeBytes", "Bytes", [ + "StandardStorage", + "StandardIAStorage", + "ReducedRedundancyStorage", + ]), + ("NumberOfObjects", "Count", ["AllStorageTypes"]), + ]: + for storage_class in storage_classes: + metrics.append({ + 'Id': "%s_%s_%s" % (metric_name.lower(), storage_class.lower(), idx), + 'Label': bucket_name, + 'MetricStat': { + 'Metric': { + 'Namespace': 'AWS/S3', + 'MetricName': metric_name, + 'Dimensions': [{ + 'Name': "BucketName", + 'Value': bucket_name, + }, { + 'Name': 'StorageType', + 'Value': storage_class, + }] + }, + 'Period': self.period, + 'Stat': 'Average', + 'Unit': unit, + }, + }) + idx += 1 + return metrics + + def _format_content(self, content): + return [AWSSectionResult("", content)] + + #. # .--ELB-----------------------------------------------------------------. # | _____ _ ____ | @@ -988,10 +1038,21 @@ class AWSSectionsUSEast(AWSSections): #---clients--------------------------------------------------------- ce_client = self._init_client('ce') s3_client = self._init_client('s3') + cloudwatch_client = self._init_client('cloudwatch') + + #---distributors---------------------------------------------------- + s3_summary_distributor = ResultDistributor() + + #---sections with distributors-------------------------------------- + s3_summary = S3Summary( + s3_client, distributor=s3_summary_distributor, buckets=kwargs.get('buckets')) #---sections-------------------------------------------------------- ce = CostsAndUsage(ce_client) - s3_summary = S3Summary(s3_client, buckets=kwargs.get('buckets')) + s3 = S3(cloudwatch_client) + + #---register sections to distributors------------------------------- + s3_summary_distributor.add(s3) #---register sections for execution--------------------------------- if 'ce' in self._services: @@ -999,6 +1060,7 @@ class AWSSectionsUSEast(AWSSections): if 's3' in self._services: self._sections.append(s3_summary) + self._sections.append(s3) class AWSSectionsGeneric(AWSSections):

5 years, 8 months

Deleted unsused Docker documentation.

by Marcel Arentz

Module: check_mk Branch: master Commit: 72fc5a9b409efe897a4b6af2ea7f453f483d08ca URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72fc5a9b409efe… Author: Marcel Arentz <ma(a)mathias-kettner.de> Date: Mon Jan 28 13:16:36 2019 +0100 Deleted unsused Docker documentation. The documentation will be managed on DockerHub and on our own web documentation: https://www.mathias-kettner.com/cms_introduction_docker.html and https://www.mathias-kettner.com/cms_managing_docker.html Change-Id: I207104eba5eea6e0b68c373e8882f0ecd18bc98a --- docker/README.asciidoc | 338 ------------------------------------------------- 1 file changed, 338 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=72fc5a9b40…

5 years, 8 months

Icinga is dead => expected package sizes changed

by Sven Panne

Module: check_mk Branch: master Commit: 5eca39008b061357e9bcb885d9fd2ab78ae24828 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5eca39008b0613… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 30 14:17:01 2019 +0100 Icinga is dead => expected package sizes changed Change-Id: Ifb1c7d54f6f2c9aa6f1ed96dd96f06a88ea9c396 --- tests/packaging/test_files.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/packaging/test_files.py b/tests/packaging/test_files.py index ba974f7..2dc9075 100644 --- a/tests/packaging/test_files.py +++ b/tests/packaging/test_files.py @@ -23,10 +23,10 @@ def _get_package_paths(version_path, what): # In case packages grow/shrink this check has to be changed. @pytest.mark.parametrize("what,min_size,max_size", [ - ("rpm", 176 * 1024 * 1024, 253 * 1024 * 1024), - ("deb", 142 * 1024 * 1024, 155 * 1024 * 1024), - ("cma", 248 * 1024 * 1024, 259 * 1024 * 1024), - ("tar.gz", 349 * 1024 * 1024, 461 * 1024 * 1024), + ("rpm", 160 * 1024 * 1024, 235 * 1024 * 1024), + ("deb", 128 * 1024 * 1024, 139 * 1024 * 1024), + ("cma", 230 * 1024 * 1024, 241 * 1024 * 1024), + ("tar.gz", 358 * 1024 * 1024, 428 * 1024 * 1024), ]) def test_package_sizes(version_path, what, min_size, max_size): for pkg in _get_package_paths(version_path, what):

5 years, 8 months

7053 FIX tcp_conn_stat: resolve latency problems introduced by ss

by Tom Baerwinkel

Module: check_mk Branch: master Commit: 572a42810c77cb56d6ddbc8c62b7f9a41987a211 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=572a42810c77cb… Author: Tom Baerwinkel <tb(a)mathias-kettner.de> Date: Thu Jan 17 16:06:09 2019 +0100 7053 FIX tcp_conn_stat: resolve latency problems introduced by ss On some systems the ss command used for the tcp_conn_stat check introduced latency problems. To resolve this issue by default now "cat /proc/net/tcp /proc/net/tcp6" is used again. ss is only used as a fallback if cat runs into a timeout. Additionally, the maximum waiting time for cat is reduced from 10s to 5s and SIGTERM is sent by waitmax instead of SIGHUP. CMK-1352 Change-Id: I3b1af6faa2566ff86e6a764b9c395b059f6677f6 --- .werks/7053 | 17 +++++++++++++++++ agents/check_mk_agent.linux | 10 +++++----- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.werks/7053 b/.werks/7053 new file mode 100644 index 0000000..311cfaa --- /dev/null +++ b/.werks/7053 @@ -0,0 +1,17 @@ +Title: tcp_conn_stat: resolve latency problems introduced by ss +Level: 1 +Component: checks +Class: fix +Compatible: incomp +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1547736918 + +On some systems the ss command used for the tcp_conn_stat check +introduced latency problems. To resolve this issue by default +now "cat /proc/net/tcp /proc/net/tcp6" is used again. ss is only +used as a fallback if cat runs into a timeout. + +Additionally, the maximum waiting time for cat is reduced from +10s to 5s and SIGTERM is sent by waitmax instead of SIGHUP. diff --git a/agents/check_mk_agent.linux b/agents/check_mk_agent.linux index 2baf6fa..cb8ce67 100755 --- a/agents/check_mk_agent.linux +++ b/agents/check_mk_agent.linux @@ -484,13 +484,13 @@ fi # Number of TCP connections in the various states -echo '<<<tcp_conn_stats>>>' -if type ss > /dev/null ; then - ss -ant |grep -v ^State | awk ' /:/ { c[$1]++; } END { for (x in c) { print x, c[x]; } }' |sed -e 's/^ESTAB/01/g;s/^SYN-SENT/02/g;s/^SYN-RECV/03/g;s/^FIN-WAIT-1/04/g;s/^FIN-WAIT-2/05/g;s/^TIME-WAIT/06/g;s/^CLOSED/07/g;s/^CLOSE-WAIT/08/g;s/^LAST-ACK/09/g;s/^LISTEN/0A/g;s/^CLOSING/0B/g;' -elif type waitmax >/dev/null ; then - THIS=$(waitmax -s 1 10 cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }') +if type waitmax >/dev/null ; then + echo '<<<tcp_conn_stats>>>' + THIS=$(waitmax 5 cat /proc/net/tcp /proc/net/tcp6 2>/dev/null | awk ' /:/ { c[$4]++; } END { for (x in c) { print x, c[x]; } }') if [ $? == 0 ] ; then echo "$THIS" + elif type ss > /dev/null ; then + ss -ant |grep -v ^State | awk ' /:/ { c[$1]++; } END { for (x in c) { print x, c[x]; } }' | sed -e 's/^ESTAB/01/g;s/^SYN-SENT/02/g;s/^SYN-RECV/03/g;s/^FIN-WAIT-1/04/g;s/^FIN-WAIT-2/05/g;s/^TIME-WAIT/06/g;s/^CLOSED/07/g;s/^CLOSE-WAIT/08/g;s/^LAST-ACK/09/g;s/^LISTEN/0A/g;s/^CLOSING/0B/g;' fi fi

5 years, 8 months

Simplified cmk.util.paths.

by Sven Panne

Module: check_mk Branch: master Commit: ed5b4c807bba62b7ddfaee46decf3d11b0e578bc URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=ed5b4c807bba62… Author: Sven Panne <sp(a)mathias-kettner.de> Date: Wed Jan 30 10:30:19 2019 +0100 Simplified cmk.util.paths. Prepare for future Path() usage on the way. Note that a few unit tests had to be fixed, they implicitly relied on the fact that OMD_ROOT is not set and this in turn implies an empty string in cmk.util.paths.omd_root. This is a bit fragile and convoluted, perhaps unit tests should run under a known dummy OMD_ROOT? Change-Id: I0c7917da9044f3712f05d6edbe87605846782049 --- cmk/utils/paths.py | 208 ++++++++++----------------- tests/unit/cmk/gui/watolib/test_rulespecs.py | 6 +- 2 files changed, 77 insertions(+), 137 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=ed5b4c807b…

5 years, 8 months

mk_jolokia: minor cleanups

by Moritz Kiemer

Module: check_mk Branch: master Commit: d1bc2c8532920a8e0386c6f18d63f32519c3cd10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d1bc2c8532920a… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Wed Jan 30 09:33:24 2019 +0100 mk_jolokia: minor cleanups Change-Id: Ifd35e6b05c7f39060e2e7d5d86a8739788c38d5f --- agents/plugins/mk_jolokia.py | 55 +++++++++++++++++++------------------------- 1 file changed, 24 insertions(+), 31 deletions(-) diff --git a/agents/plugins/mk_jolokia.py b/agents/plugins/mk_jolokia.py index fb0c739..90f4b44 100755 --- a/agents/plugins/mk_jolokia.py +++ b/agents/plugins/mk_jolokia.py @@ -38,7 +38,7 @@ try: except ImportError as import_error: sys.stdout.write( "<<<jolokia_info>>>\n" - "Error: mk_jolokia requires either the json or simplejson library\n" + "Error: mk_jolokia requires either the json or simplejson library.\n" "Please either use a Python version that contains the json library or install the" " simplejson library on the monitored system.") sys.exit(1) @@ -161,12 +161,6 @@ QUERY_SPECS_SPECIFIC = { False),], } -# ('*:j2eeType=WebModule,name=/--/localhost/-/%(app)s,*/state', None, [ "name" ]), -# ('*:j2eeType=Servlet,WebModule=/--/localhost/-/%(app)s,name=%(servlet)s,*/requestCount', -# None, [ "WebModule", "name" ]), -# ("Catalina:J2EEApplication=none,J2EEServer=none,WebModule=*,j2eeType=Servlet,name=*", -# None, [ "WebModule", "name" ]), - class SkipInstance(RuntimeError): pass @@ -213,11 +207,11 @@ class JolokiaInstance(object): required_keys.add("service_password") missing_keys = required_keys - set(config.keys()) if missing_keys: - raise ValueError(err_msg % ("Missing keys %s" % ", ".join(missing_keys))) + raise ValueError(err_msg % ("Missing key(s): %s" % ", ".join(missing_keys))) if not instance: - config["instance"] = str(config["port"]) - config["instance"] = config["instance"].replace(" ", "_") + instance = str(config["port"]) + config["instance"] = instance.replace(" ", "_") # port must be (or look like) an integer try: @@ -244,11 +238,11 @@ class JolokiaInstance(object): def __init__(self, config): super(JolokiaInstance, self).__init__() - self.config = self._sanitize_config(config) + self._config = self._sanitize_config(config) - self.name = self.config["instance"] - self.product = self.config.get("product") - self.custom_vars = self.config.get("custom_vars", []) + self.name = self._config["instance"] + self.product = self._config.get("product") + self.custom_vars = self._config.get("custom_vars", []) self.base_url = self._get_base_url() self.target = self._get_target() @@ -256,50 +250,50 @@ class JolokiaInstance(object): def _get_base_url(self): return "%s://%s:%d/%s" % ( - self.config["protocol"].strip('/'), - self.config["server"].strip('/'), - self.config["port"], - self.config["suburi"], + self._config["protocol"].strip('/'), + self._config["server"].strip('/'), + self._config["port"], + self._config["suburi"], ) def _get_target(self): - url = self.config.get("service_url") + url = self._config.get("service_url") if url is None: return {} - user = self.config.get("service_user") + user = self._config.get("service_user") if user is None: return {"url": url} return { "url": url, "user": user, - "password": self.config["service_password"], + "password": self._config["service_password"], } def _initialize_http_session(self): session = requests.Session() - session.verify = self.config["verify"] + session.verify = self._config["verify"] session.timeout = 1.0 - auth_method = self.config.get("mode") + auth_method = self._config.get("mode") if auth_method is None: return session # initialize authentication if auth_method == "https": session.cert = ( - self.config["client_cert"], - self.config["client_key"], + self._config["client_cert"], + self._config["client_key"], ) elif auth_method == 'digest': session.auth = HTTPDigestAuth( - self.config["user"], - self.config["password"], + self._config["user"], + self._config["password"], ) elif auth_method in ("basic", "basic_preemptive"): session.auth = ( - self.config["user"], - self.config["password"], + self._config["user"], + self._config["password"], ) else: raise NotImplementedError("Authentication method %r" % auth_method) @@ -382,8 +376,6 @@ def make_item_list(path, value, itemspec): # key = 'Catalina:host=localhost,path=\\/,type=Manager' # itemsepc = [ "path" ] # --> "/" - - def extract_item(key, itemspec): if not itemspec: return () @@ -420,6 +412,7 @@ def fetch_metric(inst, path, title, itemspec, inst_add=None): item = ",".join((inst.name, inst_add)) else: item = inst.name + if title: if subinstance: tit = title + "." + subinstance[-1]

5 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Checkmk git commits January 2019