Merge pull request #414 from greenbone/mergify/bp/master/pr-413

Fix regex of gvmcg titles for get_performance command (backport #413)
greenbone · Jun 14, 2021 · cd60fb4 · cd60fb4
2 parents 4937b40 + be5ceb7
commit cd60fb4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ### Fixed
 - Do not start all queued scans simultaneously once available memory is enough. [#401](https://github.com/greenbone/ospd/pull/401)
 - Remove the pid file if there is no process for the pid or the process name does not match. [#405](https://github.com/greenbone/ospd/pull/405)
+- Fix regex of gvmcg titles for get_performance command. [#413](https://github.com/greenbone/ospd/pull/413)
 
 [Unreleased]: https://github.com/greenbone/ospd/compare/v20.8.2...HEAD
 

diff --git a/ospd/command/command.py b/ospd/command/command.py
@@ -162,21 +162,21 @@ def handle_xml(self, xml: Element) -> bytes:
 
 
 GVMCG_TITLES = [
-    'cpu-*',
+    'cpu-.*',
     'proc',
     'mem',
     'swap',
     'load',
-    'df-*',
+    'df-.*',
     'disk-sd[a-z][0-9]-rw',
     'disk-sd[a-z][0-9]-load',
     'disk-sd[a-z][0-9]-io-load',
-    'interface-eth*-traffic',
-    'interface-eth*-err-rate',
-    'interface-eth*-err',
-    'sensors-*_temperature-*',
-    'sensors-*_fanspeed-*',
-    'sensors-*_voltage-*',
+    'interface-eth.*-traffic',
+    'interface-eth.*-err-rate',
+    'interface-eth.*-err',
+    'sensors-.*_temperature-.*',
+    'sensors-.*_fanspeed-.*',
+    'sensors-.*_voltage-.*',
     'titles',
 ]  # type: List[str]