From b5321aff06d6ea8d730d62aec2ffd8e9271c1ffc Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 14 Apr 2022 20:12:10 +0200 Subject: Adding upstream version 1.34.0. Signed-off-by: Daniel Baumann --- collectors/python.d.plugin/hpssa/README.md | 1 - collectors/python.d.plugin/hpssa/hpssa.chart.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'collectors/python.d.plugin/hpssa') diff --git a/collectors/python.d.plugin/hpssa/README.md b/collectors/python.d.plugin/hpssa/README.md index 69c8d8a33..c1d218279 100644 --- a/collectors/python.d.plugin/hpssa/README.md +++ b/collectors/python.d.plugin/hpssa/README.md @@ -81,4 +81,3 @@ ssacli_path: /usr/sbin/ssacli Save the file and restart the Netdata Agent with `sudo systemctl restart netdata`, or the [appropriate method](/docs/configure/start-stop-restart.md) for your system. -[![analytics](https://www.google-analytics.com/collect?v=1&aip=1&t=pageview&_s=1&ds=github&dr=https%3A%2F%2Fgithub.com%2Fnetdata%2Fnetdata&dl=https%3A%2F%2Fmy-netdata.io%2Fgithub%2Fcollectors%2Fpython.d.plugin%2Fhpssa%2FREADME&_u=MAC~&cid=5792dfd7-8dc4-476b-af31-da2fdb9f93d2&tid=UA-64295674-3)]() diff --git a/collectors/python.d.plugin/hpssa/hpssa.chart.py b/collectors/python.d.plugin/hpssa/hpssa.chart.py index ce1b43009..4da73dc56 100644 --- a/collectors/python.d.plugin/hpssa/hpssa.chart.py +++ b/collectors/python.d.plugin/hpssa/hpssa.chart.py @@ -93,6 +93,7 @@ ignored_sections_regex = re.compile( re.X ) mirror_group_regex = re.compile(r'^Mirror Group \d+:$') +disk_partition_regex = re.compile(r'^Disk Partition Information$') array_regex = re.compile(r'^Array: (?P[A-Z]+)$') drive_regex = re.compile( r''' @@ -242,7 +243,7 @@ class HPSSA(object): } for line in self: - if mirror_group_regex.match(line): + if HPSSA.match_any(line, mirror_group_regex, disk_partition_regex): self.parse_ignored_section() continue -- cgit v1.2.3