Checkmk git commits December 2018

checkmk-commits@lists.checkmk.com

15 participants
342 discussions

6996 FIX docker_node_network: Fixed crash of HW/ SW inventory service if bridge name is missing

by Simon Betz

Module: check_mk Branch: master Commit: 217f8512f4cbc156502975018ca356cc9f45687d URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=217f8512f4cbc1… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 19 12:58:06 2018 +0100 6996 FIX docker_node_network: Fixed crash of HW/SW inventory service if bridge name is missing Change-Id: I5a1a5cd809696eb62730d5111296162291d8467c --- .werks/6996 | 10 ++++++++++ inventory/docker_node_network | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.werks/6996 b/.werks/6996 new file mode 100644 index 0000000..f8f3bf7 --- /dev/null +++ b/.werks/6996 @@ -0,0 +1,10 @@ +Title: docker_node_network: Fixed crash of HW/SW inventory service if bridge name is missing +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1545220260 +Class: fix + + diff --git a/inventory/docker_node_network b/inventory/docker_node_network index 2888b2f..fb6f972 100644 --- a/inventory/docker_node_network +++ b/inventory/docker_node_network @@ -53,11 +53,15 @@ def inv_docker_node_network_networks(info, inventory_tree, status_data_tree): network_ = { "name": network_name, - "host_ifname": network["Options"]["com.docker.network.bridge.name"], "network_id": _docker_trunc_id(network["Id"]), "scope": network["Scope"], } + try: + network["host_ifname"] = network["Options"]["com.docker.network.bridge.name"] + except KeyError: + pass + labels = sorted(["%s: %s" % (k, v) for k, v in network.get("Labels", {}).items()]) if labels: network_["labels"] = ", ".join(labels)

5 years, 6 months

aws_ebs: Started

by Simon Betz

Module: check_mk Branch: master Commit: 72e4829691a1d570602c61541837397052d185ba URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=72e4829691a1d5… Author: Simon Betz <si(a)mathias-kettner.de> Date: Fri Dec 14 13:08:58 2018 +0100 aws_ebs: Started Change-Id: Ifaf8af578ac4d0cb7f913f5033c35b3f3ac398f4 --- checkman/aws_ebs | 12 ++++++++ checks/aws_ebs | 85 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+) diff --git a/checkman/aws_ebs b/checkman/aws_ebs new file mode 100644 index 0000000..44e8fdf --- /dev/null +++ b/checkman/aws_ebs @@ -0,0 +1,12 @@ +title: AWS EBS Disk IO +agents: aws +catalog: cloud/aws +license: GPL +distribution: check_mk +description: + This check monitors disk IO of AWS EBS. + To make this check work you have to configure the related + special agent {{Amazon Web Services (AWS)}}. + +inventory: + One service per volume is created. diff --git a/checks/aws_ebs b/checks/aws_ebs new file mode 100644 index 0000000..e0b2f84 --- /dev/null +++ b/checks/aws_ebs @@ -0,0 +1,85 @@ +#!/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_ebs(info): + return _extract_aws_metrics_by_labels([ + "VolumeReadOps", + "VolumeWriteOps", + "VolumeReadBytes", + "VolumeWriteBytes", + "VolumeQueueLength", + "VolumeThroughputPercentage", + "VolumeConsumedReadWriteOps", + "VolumeTotalReadTime", + "VolumeTotalWriteTime", + "VolumeIdleTime", + "BurstBalance", + "IOPerformance", + ], parse_aws(info)) + + +# .--Disk IO-------------------------------------------------------------. +# | ____ _ _ ___ ___ | +# | | _ \(_)___| | __ |_ _/ _ \ | +# | | | | | / __| |/ / | | | | | | +# | | |_| | \__ \ < | | |_| | | +# | |____/|_|___/_|\_\ |___\___/ | +# | | +# +----------------------------------------------------------------------+ +# | main check | +# '----------------------------------------------------------------------' + + +def check_aws_ebs(item, params, parsed): + now = time.time() + disks = {} + for disk_name, metrics in parsed.iteritems(): + disks.setdefault( + disk_name, { + "read_ios": get_rate("aws_ebs_disk_io_read_ios.%s" % item, now, + metrics['VolumeReadOps']), + "write_ios": get_rate("aws_ebs_disk_io_write_ios.%s" % item, now, + metrics['VolumeWriteOps']), + "read_throughput": get_rate("aws_ebs_disk_io_read_throughput.%s" % item, now, + metrics['VolumeReadBytes']), + "write_throughput": get_rate("aws_ebs_disk_io_write_throughput.%s" % item, now, + metrics['VolumeWriteBytes']), + "queue_length": get_rate("aws_ebs_disk_io_queue_len.%s" % item, now, + metrics['VolumeQueueLength']), + }) + return check_diskstat_dict(item, params, disks) + + +check_info['aws_ebs'] = { + 'parse_function': parse_aws_ebs, + 'inventory_function': discover(), + 'check_function': check_aws_ebs, + 'service_description': 'AWS/EBS Disk IO %s', + 'includes': ['diskstat.include', 'aws.include'], + 'group': 'diskstat', + 'has_perfdata': True, +}

5 years, 6 months

Started AWS/Cloudtrail

by Simon Betz

Module: check_mk Branch: master Commit: f0d5c85336644c81cbcd2d75f92b27dc55bec9a6 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f0d5c85336644c… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 18 13:47:59 2018 +0100 Started AWS/Cloudtrail Change-Id: I5f682dbf2960232e82126ca66fd074d322368353 --- agents/special/agent_aws | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 69037c8..a93be4a 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -792,6 +792,36 @@ class Glacier(AWSSection): #. +# .--cloud trail---------------------------------------------------------. +# | _ _ _ _ _ | +# | ___| | ___ _ _ __| | | |_ _ __ __ _(_) | | +# | / __| |/ _ \| | | |/ _` | | __| '__/ _` | | | | +# | | (__| | (_) | |_| | (_| | | |_| | | (_| | | | | +# | \___|_|\___/ \__,_|\__,_| \__|_| \__,_|_|_| | +# | | +# '----------------------------------------------------------------------' + + +class CloudTrail(AWSSection): + @property + def name(self): + return "cloud_trail" + + @property + def interval(self): + return 300 + + def _get_raw_result(self): + pass + + def _extract_content_from(self, raw_result): + pass + + def _format_content(self, content): + pass + + +#. # .--sections------------------------------------------------------------. # | _ _ | # | ___ ___ ___| |_(_) ___ _ __ ___ |

5 years, 6 months

Started AWS/Glacier

by Simon Betz

Module: check_mk Branch: master Commit: f5901f4347decf7ff54cbb143d1297d374400453 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f5901f4347decf… Author: Simon Betz <si(a)mathias-kettner.de> Date: Tue Dec 18 13:46:44 2018 +0100 Started AWS/Glacier Change-Id: I44b9fa3fb49a8f72c3b0e042948e3cc38e606889 --- agents/special/agent_aws | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index 4cb6d89..69037c8 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -762,6 +762,36 @@ class EBS(AWSSection): #. +# .--glacier-------------------------------------------------------------. +# | _ _ | +# | __ _| | __ _ ___(_) ___ _ __ | +# | / _` | |/ _` |/ __| |/ _ \ '__| | +# | | (_| | | (_| | (__| | __/ | | +# | \__, |_|\__,_|\___|_|\___|_| | +# | |___/ | +# '----------------------------------------------------------------------' + + +class Glacier(AWSSection): + @property + def name(self): + return "glacier" + + @property + def interval(self): + return 300 + + def _get_raw_result(self): + pass + + def _extract_content_from(self, raw_result): + pass + + def _format_content(self, content): + pass + + +#. # .--sections------------------------------------------------------------. # | _ _ | # | ___ ___ ___| |_(_) ___ _ __ ___ |

5 years, 6 months

agent_aws: Add stat type to ELB metrics and expand logging messages

by Simon Betz

Module: check_mk Branch: master Commit: b02983bdebfd57bcf236b93ea1a76f48b60ca388 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b02983bdebfd57… Author: Simon Betz <si(a)mathias-kettner.de> Date: Wed Dec 19 10:01:38 2018 +0100 agent_aws: Add stat type to ELB metrics and expand logging messages Change-Id: I47e077ffab19444eb9fdd6f63bc106c24e344c5d --- agents/special/agent_aws | 92 +++++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/agents/special/agent_aws b/agents/special/agent_aws index a029a5a..4cb6d89 100755 --- a/agents/special/agent_aws +++ b/agents/special/agent_aws @@ -211,7 +211,7 @@ class EC2Summary(AWSSection): try: return raw_result['Reservations'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return def _format_content(self, content): @@ -284,7 +284,7 @@ class EC2(AWSSection): try: return raw_result['MetricDataResults'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -324,7 +324,7 @@ class S3Summary(AWSSection): try: return raw_result['Buckets'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -400,7 +400,7 @@ class S3(AWSSection): try: return raw_result['MetricDataResults'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -437,7 +437,7 @@ class S3Objects(AWSSection): try: content.setdefault(row['Name'], []).extend(row['Contents']) except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, row.keys()) continue return content @@ -475,7 +475,7 @@ class ELBSummary(AWSSection): try: return raw_result['LoadBalancerDescriptions'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -501,11 +501,11 @@ class ELBHealth(AWSSection): def _extract_content_from(self, raw_result): content = {} - for name, attrs in raw_result.iteritems(): + for name, row in raw_result.iteritems(): try: - content.setdefault(name, attrs['InstanceStates']) + content.setdefault(name, row['InstanceStates']) except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, row.keys()) return content def _format_content(self, content): @@ -543,22 +543,22 @@ class ELB(AWSSection): metrics = [] idx = 0 for load_balancer in load_balancers: - for metric_name, unit in [ + for metric_name, stat in [ # Load balancer metrics - ("RequestCount", ""), - ("SurgeQueueLength", ""), - ("SpilloverCount", ""), - ("HTTPCode_ELB_4XX", ""), - ("HTTPCode_ELB_5XX", ""), + ("RequestCount", "Sum"), + ("SurgeQueueLength", "Maximum"), + ("SpilloverCount", "Sum"), + ("HTTPCode_ELB_4XX", "Sum"), + ("HTTPCode_ELB_5XX", "Sum"), # Backend metrics - ("HealthyHostCount", ""), - ("UnHealthyHostCount", ""), - ("Latency", ""), - ("HTTPCode_Backend_2XX", ""), - ("HTTPCode_Backend_3XX", ""), - ("HTTPCode_Backend_4XX", ""), - ("HTTPCode_Backend_5XX", ""), - ("BackendConnectionErrors", ""), + ("HealthyHostCount", "Average"), + ("UnHealthyHostCount", "Average"), + ("Latency", "Average"), + ("HTTPCode_Backend_2XX", "Sum"), + ("HTTPCode_Backend_3XX", "Sum"), + ("HTTPCode_Backend_4XX", "Sum"), + ("HTTPCode_Backend_5XX", "Sum"), + ("BackendConnectionErrors", "Sum"), ]: metrics.append({ 'Id': "%s_%s" % (metric_name.lower(), idx), @@ -573,8 +573,7 @@ class ELB(AWSSection): }] }, 'Period': self.period, - 'Stat': 'Average', - 'Unit': unit, + 'Stat': stat, }, }) idx += 1 @@ -584,7 +583,7 @@ class ELB(AWSSection): try: return raw_result['MetricDataResults'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -627,7 +626,7 @@ class EBSSummary(AWSSection): try: return raw_result['Volumes'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content): @@ -663,7 +662,7 @@ class EBSHealth(AWSSection): try: content.setdefault(row['VolumeId'], row['VolumeStatus']) except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, row.keys()) return content def _format_content(self, content): @@ -707,28 +706,28 @@ class EBS(AWSSection): metrics = [] idx = 0 for volume_name, volume_type in volumes: - for metric_name, volume_types in [ + for metric_name, unit, volume_types in [ # Disk IO - ("VolumeReadOps", []), - ("VolumeWriteOps", []), - ("VolumeReadBytes", []), - ("VolumeWriteBytes", []), - ("VolumeThroughputPercentage", ["io1"]), - ("VolumeConsumedReadWriteOps", ["io1"]), + ("VolumeReadOps", "Count", []), + ("VolumeWriteOps", "Count", []), + ("VolumeReadBytes", "Bytes", []), + ("VolumeWriteBytes", "Bytes", []), + ("VolumeThroughputPercentage", "Percent", ["io1"]), + ("VolumeConsumedReadWriteOps", "Count", ["io1"]), # Latency - ("VolumeTotalReadTime", []), - ("VolumeTotalWriteTime", []), + ("VolumeTotalReadTime", "Seconds", []), + ("VolumeTotalWriteTime", "Seconds", []), # Disk activity - ("VolumeQueueLength", []), - ("VolumeIdleTime", []), - ("BurstBalance", ["gp2", "st1", "sc1"]), + ("VolumeQueueLength", "Count", []), + ("VolumeIdleTime", "Seconds", []), + ("BurstBalance", "Percent", ["gp2", "st1", "sc1"]), # Status checks - ("VolumeStatus", []), - ("IOPerformance", ["io1"]), + ("VolumeStatus", None, []), + ("IOPerformance", None, ["io1"]), ]: if volume_types and volume_type not in volume_types: continue - metrics.append({ + metric = { 'Id': "%s_%s" % (metric_name.lower(), idx), 'Label': volume_name, 'MetricStat': { @@ -743,7 +742,10 @@ class EBS(AWSSection): 'Period': self.period, 'Stat': 'Average', }, - }) + } + if unit: + metric['MetricStat']['Unit'] = unit + metrics.append(metric) idx += 1 return metrics @@ -751,7 +753,7 @@ class EBS(AWSSection): try: return raw_result['MetricDataResults'] except KeyError, e: - logging.info("%s: KeyError %s ", self.name, e) + logging.info("%s: KeyError %s; Available are %s", self.name, e, raw_result.keys()) return [] def _format_content(self, content):

5 years, 6 months

azure parameters: replace Levels by Tuples

by Moritz Kiemer

Module: check_mk Branch: master Commit: 771a24e5286e34bcb0f53165a148057de1dda92b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=771a24e5286e34… Author: Moritz Kiemer <mo(a)mathias-kettner.de> Date: Tue Dec 18 15:29:24 2018 +0100 azure parameters: replace Levels by Tuples Change-Id: I426f358c46b4f97876e106318bc11cd95a19af28 --- cmk/gui/plugins/wato/check_parameters/azure.py | 72 ++++++++++++++++++-------- 1 file changed, 50 insertions(+), 22 deletions(-) diff --git a/cmk/gui/plugins/wato/check_parameters/azure.py b/cmk/gui/plugins/wato/check_parameters/azure.py index 8f54210..7f81705 100644 --- a/cmk/gui/plugins/wato/check_parameters/azure.py +++ b/cmk/gui/plugins/wato/check_parameters/azure.py @@ -36,7 +36,6 @@ from cmk.gui.valuespec import ( from cmk.gui.plugins.wato import ( RulespecGroupCheckParametersApplications, register_check_parameters, - Levels, ) register_check_parameters( @@ -118,35 +117,64 @@ register_check_parameters( 'azure_storageaccounts', _("Azure Storage"), Dictionary(elements=[ - ('ingress_levels', Levels( - title=_("Levels on ingress data in bytes"), - unit="B", - )), - ('egress_levels', Levels( - title=_("Levels on ingress data in bytes"), - unit="B", - )), - ('used_capacity_levels', Levels( - title=_("Levels on used capacity in bytes"), - unit="B", - )), + ('ingress_levels', + Tuple( + title=_("Levels on ingress data in bytes"), + elements=[ + Float(title=_("Warning at"), unit="B"), + Float(title=_("Critical at"), unit="B"), + ], + )), + ('egress_levels', + Tuple( + title=_("Levels on ingress data in bytes"), + elements=[ + Float(title=_("Warning at"), unit="B"), + Float(title=_("Critical at"), unit="B"), + ], + )), + ('used_capacity_levels', + Tuple( + title=_("Levels on used capacity in bytes"), + elements=[ + Float(title=_("Warning at"), unit="B"), + Float(title=_("Critical at"), unit="B"), + ], + )), ('server_latency_levels', - Levels( + Tuple( title=_("Levels on server latency in seconds"), help=_("Average latency used by Azure Storage to process a successful request"), - unit='s', + elements=[ + Float(title=_("Warning at"), unit="s"), + Float(title=_("Critical at"), unit="s"), + ], )), ('e2e_latency_levels', - Levels( + Tuple( title=_("Levels on end-to-end latency in seconds"), help=_("Average end-to-end latency of successful requests made to a storage service"), - unit='s', + elements=[ + Float(title=_("Warning at"), unit="s"), + Float(title=_("Critical at"), unit="s"), + ], + )), + ('transactions_levels', + Tuple( + title=_("Levels on transaction count"), + elements=[ + Integer(title=_("Warning at")), + Integer(title=_("Critical at")), + ], + )), + ('availability_levels', + Tuple( + title=_("Levels on availability in percent"), + elements=[ + Float(title=_("Warning at"), unit="%"), + Float(title=_("Critical at"), unit="%"), + ], )), - ('transactions_levels', Levels(title=_("Levels on transaction count"))), - ('availability_levels', Levels( - title=_("Levels on availability in percent"), - unit='%', - )), ]), TextAscii( title=_("Storage account name"),

5 years, 6 months

6899 alcatel_fans_aos7: Add support for new switches

by Florian Kromer

Module: check_mk Branch: master Commit: a49579be30f8db582415872e36d73c52bb66b14f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=a49579be30f8db… Author: Florian Kromer <fk(a)mathias-kettner.de> Date: Mon Dec 10 11:54:23 2018 +0100 6899 alcatel_fans_aos7: Add support for new switches This werk adds fan monitoring (alcatel_fans) support for the new switch devices running at least AOS7. The check alcatel_fans_aos7 reuses the default values of check alcatel_fans for consistent check behaviour. CMK-1188 Change-Id: I112cdc854fd9fa30237a317647de78ecd5c9ead4 --- .werks/6899 | 12 ++++++++++++ checkman/alcatel_fans_aos7 | 13 +++++++++++++ checks/alcatel_fans_aos7 | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) diff --git a/.werks/6899 b/.werks/6899 new file mode 100644 index 0000000..908bf4f --- /dev/null +++ b/.werks/6899 @@ -0,0 +1,12 @@ +Title: alcatel_fans_aos7: Add support for new switches +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1544439136 +Class: feature + +This werk adds fan monitoring (alcatel_fans) support for the new switch +devices running at least AOS7. The check alcatel_fans_aos7 reuses the +default values of check alcatel_fans for consistent check behaviour. diff --git a/checkman/alcatel_fans_aos7 b/checkman/alcatel_fans_aos7 new file mode 100644 index 0000000..e9ee994 --- /dev/null +++ b/checkman/alcatel_fans_aos7 @@ -0,0 +1,13 @@ +title: Alcatel switches (>=AOS7): Fan Status +agents: snmp +catalog: hw/network/alcatel +license: GPL +distribution: check_mk +description: + + This Check Monitors all Fans on new Alcatel switches running at least AOS7 supporting + the ALCATEL-IND1-CHASSIS-MIB (version for >=AOS7). The status is automaticly reported + by the device, so no configuration is needed. + +inventory: + One check is created diff --git a/checks/alcatel_fans_aos7 b/checks/alcatel_fans_aos7 new file mode 100644 index 0000000..1948174 --- /dev/null +++ b/checks/alcatel_fans_aos7 @@ -0,0 +1,36 @@ +#!/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. + +check_info["alcatel_fans_aos7"] = { + "check_function": check_alcatel_fans, + "inventory_function": inventory_alcatel_fans, + "service_description": "Fan %s", + "snmp_scan_function": alcatel_new_networking_products_scan_function, + "snmp_info": ( + ".1.3.6.1.4.1.6486.801.1.1.1.3.1.1.11.1", # MIB object "alaChasEntPhysFanEntry" + [2]), # MIB object "alaChasEntPhysFanStatus" + "includes": ["alcatel.include"], +}

5 years, 6 months

7013 FIX mk_mysql: Fixed detecting wrong MySQL instances

by Lars Michelsen

Module: check_mk Branch: master Commit: cb8c4bdc3d53f71d7d30de387fc4daf00a73f7cb URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cb8c4bdc3d53f7… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 16:53:55 2018 +0100 7013 FIX mk_mysql: Fixed detecting wrong MySQL instances On systems with mysqld running together with php-cgi using specific options on the command line (like it is done by Check_MK sites), it could happen that the mk_mysql agent plugin detects not existing MySQL instances which leads to UNKNOWN services in Check_MK. Processes that lead to wrong discovered services look like this: root 901 1 0 Dec10 ? 00:00:00 /bin/sh /usr/bin/mysqld_safe mysql 1274 901 0 Dec10 ? 01:27:32 /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin --user=mysql --log-error=/var/log/mysql/error.log --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --port=3306 wiki 16937 32282 0 13:21 ? 00:00:00 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock intern 27074 32276 0 10:39 ? 00:00:00 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/intern/tmp/php/session -d upload_tmp_dir=/omd/sites/intern/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/intern/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/intern/tmp/run/mysqld/mysqld.sock wiki 29129 32282 0 10:46 ? 00:00:02 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock root 29561 26105 0 16:51 pts/0 00:00:00 grep mysqld wiki 30673 32282 0 09:00 ? 00:00:03 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock Only the process 1274 should be detected as MySQL instance. Change-Id: I0740ace0d5b2b86b111cd0faafc17104b597a0ec --- .werks/7013 | 25 +++++++++++++++++++++++++ agents/plugins/mk_mysql | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/.werks/7013 b/.werks/7013 new file mode 100644 index 0000000..561a350 --- /dev/null +++ b/.werks/7013 @@ -0,0 +1,25 @@ +Title: mk_mysql: Fixed detecting wrong MySQL instances +Level: 1 +Component: checks +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545148271 + +On systems with mysqld running together with php-cgi using specific options on the command line +(like it is done by Check_MK sites), it could happen that the mk_mysql agent plugin detects not +existing MySQL instances which leads to UNKNOWN services in Check_MK. + +Processes that lead to wrong discovered services look like this: + +root 901 1 0 Dec10 ? 00:00:00 /bin/sh /usr/bin/mysqld_safe +mysql 1274 901 0 Dec10 ? 01:27:32 /usr/sbin/mysqld --basedir=/usr --datadir=/var/lib/mysql --plugin-dir=/usr/lib/mysql/plugin --user=mysql --log-error=/var/log/mysql/error.log --pid-file=/var/run/mysqld/mysqld.pid --socket=/var/run/mysqld/mysqld.sock --port=3306 +wiki 16937 32282 0 13:21 ? 00:00:00 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock +intern 27074 32276 0 10:39 ? 00:00:00 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/intern/tmp/php/session -d upload_tmp_dir=/omd/sites/intern/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/intern/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/intern/tmp/run/mysqld/mysqld.sock +wiki 29129 32282 0 10:46 ? 00:00:02 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock +root 29561 26105 0 16:51 pts/0 00:00:00 grep mysqld +wiki 30673 32282 0 09:00 ? 00:00:03 /usr/bin/php5-cgi -d session.save_handler=files -d session.save_path=/omd/sites/wiki/tmp/php/session -d upload_tmp_dir=/omd/sites/wiki/tmp/php/upload -d soap.wsdl_cache_dir=/omd/sites/wiki/tmp/php/wsdl-cache -d safe_mode=Off -d mysql.default_socket=/omd/sites/wiki/tmp/run/mysqld/mysqld.sock + +Only the process 1274 should be detected as MySQL instance. diff --git a/agents/plugins/mk_mysql b/agents/plugins/mk_mysql index 72593da..be2254e 100755 --- a/agents/plugins/mk_mysql +++ b/agents/plugins/mk_mysql @@ -26,7 +26,7 @@ # gets optional socket as argument function do_query() { INSTANCE=$(echo $1|awk -v FS="=" '{print $2}') - COUNT=$(ps -efww | grep [/]usr/sbin/mysqld | grep socket | wc -l) + COUNT=$(ps -fww -C mysqld | grep socket | wc -l) if [ $COUNT -gt 1 ] then INSTANCE_NAME=$(ps -efww|grep socket|grep "${INSTANCE}"|grep "[u]ser" | sed -ne 's/.*socket=$[^.]*$.*/\1/p') @@ -68,7 +68,7 @@ if which mysqladmin >/dev/null then mysql_sockets=$(fgrep socket $MK_CONFDIR/mysql.cfg|sed -ne 's/.*socket=$[^ ]*$.*/\1/p') if [ -z "$mysql_sockets" ] ; then - mysql_sockets=$(ps -efww | grep mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') + mysql_sockets=$(ps -fww -C mysqld | grep "[s]ocket" | sed -ne 's/.*socket=$[^ ]*$.*/\1/p') fi if [ -z "$mysql_sockets" ] ; then do_query "" @@ -81,7 +81,7 @@ then #mysql -V echo "<<<mysql_port>>>" - ps -efww|grep mysqld|while read LINE; do echo $LINE|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|grep mysqld | grep "[p]ort"|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 + ps -fww -C mysqld |while read LINE; do echo $LINE|grep "[u]ser" | sed -ne 's/.*user=$[^ ]*$.*/\1/p'; echo $LINE|grep mysqld | grep "[p]ort"|sed -ne 's/.*port=$[^ ]*$.*/\1/p' ; done|xargs -n2 #echo "<<<mysql_instances>>>" #mysql --defaults-extra-file=$MK_CONFDIR/mysql.cfg $1 -s \

5 years, 6 months

try inventory automation call: Updated test to changed caching behaviours

by Lars Michelsen

Module: check_mk Branch: master Commit: 5d56a66da836f4a5755f1e05d897cb04a430df71 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=5d56a66da836f4… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 15:49:40 2018 +0100 try inventory automation call: Updated test to changed caching behaviours Change-Id: Ie31ef249271da1c434bd751940b8b4f743281cbe --- tests/integration/cmk_base/test_data_sources.py | 199 ++++++++++++++++-------- 1 file changed, 133 insertions(+), 66 deletions(-) Diff: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commitdiff;h=5d56a66da8…

5 years, 6 months

7012 FIX Availability: Improved rendering of labelling options

by Lars Michelsen

Module: check_mk Branch: master Commit: 77c669c22ac5643aeca44557c12c3119da656f39 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=77c669c22ac564… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Dec 18 15:11:01 2018 +0100 7012 FIX Availability: Improved rendering of labelling options The labelling options of the availability were not using the whole space of the option box. CMK-1440 Change-Id: I492b1f7926a2012bbb39eb28d86743569685599d --- .werks/7012 | 12 ++++++++++++ web/htdocs/themes/facelift/theme.css | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/.werks/7012 b/.werks/7012 new file mode 100644 index 0000000..433a52c --- /dev/null +++ b/.werks/7012 @@ -0,0 +1,12 @@ +Title: Availability: Improved rendering of labelling options +Level: 1 +Component: multisite +Class: fix +Compatible: compat +Edition: cre +State: unknown +Version: 1.6.0i1 +Date: 1545142222 + +The labelling options of the availability were not using the whole space +of the option box. diff --git a/web/htdocs/themes/facelift/theme.css b/web/htdocs/themes/facelift/theme.css index 1865905..7225f34 100644 --- a/web/htdocs/themes/facelift/theme.css +++ b/web/htdocs/themes/facelift/theme.css @@ -1570,6 +1570,10 @@ div.info { letter-spacing: .5px; margin: 16px 0px 8px; } +div.floatfilter.double > div.content > table.listchoice { + height: 180px; +} + .filterform > tbody > tr > td div.floatfilter { height: auto; width: 372px;

5 years, 6 months

← Newer
1
...
7
8
9
10
11
12
13
...
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