Remove the perfdata data_source

Fix #3 The üerformance data with the label data_source can not be evaluated by icinga.
Josef-Friedrich · Feb 19, 2024 · 62fd828 · 62fd828
1 parent d089418
commit 62fd828
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,15 @@
 
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Removed
+
+- Remove performance data `data_source`
+
 ## [3.1.0] - 2024-01-04
 
 ### Added

diff --git a/check_systemd.py b/check_systemd.py
@@ -1038,13 +1038,6 @@ def probe(self) -> typing.Generator[Metric, None, None]:
         )
 
 
-class PerformanceDataDataSourceResource(Resource):
-    def probe(self) -> typing.Generator[Metric, None, None]:
-        yield Metric(
-            name="data_source", value=opts.data_source, context="performance_data"
-        )
-
-
 class PerformanceDataContext(Context):
     def __init__(self):
         super(PerformanceDataContext, self).__init__("performance_data")
@@ -1464,7 +1457,6 @@ def main():
     if opts.performance_data:
         tasks += [
             PerformanceDataResource(),
-            PerformanceDataDataSourceResource(),
             PerformanceDataContext(),
         ]
 

diff --git a/tests/test_option_ignore_inactive_state.py b/tests/test_option_ignore_inactive_state.py
@@ -12,7 +12,7 @@ def test_with(self) -> None:
         result.assert_ok()
         result.assert_first_line(
             "SYSTEMD OK - ansible-pull.service: inactive | "
-            "count_units=2 data_source=cli startup_time=12.345;60;120 "
+            "count_units=2 startup_time=12.345;60;120 "
             "units_activating=0 units_active=1 units_failed=0 units_inactive=1"
         )
 
@@ -24,7 +24,7 @@ def test_ok(self) -> None:
         result.assert_ok()
         result.assert_first_line(
             "SYSTEMD OK - ansible-pull.service: inactive | "
-            "count_units=2 data_source=cli startup_time=12.345;60;120 "
+            "count_units=2 startup_time=12.345;60;120 "
             "units_activating=0 units_active=1 units_failed=0 units_inactive=1"
         )
 

diff --git a/tests/test_performance_data.py b/tests/test_performance_data.py
@@ -9,7 +9,7 @@ def test_ok(self) -> None:
         result.assert_ok()
         result.assert_first_line(
             "SYSTEMD OK - all "
-            "| count_units=386 data_source=cli startup_time=12.345;60;120 "
+            "| count_units=386 startup_time=12.345;60;120 "
             "units_activating=0 "
             "units_active=275 units_failed=0 units_inactive=111"
         )
@@ -26,7 +26,7 @@ def test_dead_timers(self) -> None:
         result.assert_critical()
         result.assert_first_line(
             "SYSTEMD CRITICAL - phpsessionclean.timer "
-            "| count_units=3 data_source=cli startup_time=12.345;60;120 "
+            "| count_units=3 startup_time=12.345;60;120 "
             "units_activating=0 "
             "units_active=3 units_failed=0 units_inactive=0"
         )
@@ -42,7 +42,6 @@ def test_options_exclude(self) -> None:
         result.assert_critical()
         result.assert_first_line(
             "SYSTEMD CRITICAL - smartd.service: failed | count_units=3 "
-            "data_source=cli "
             "startup_time=12.345;60;120 "
             "units_activating=0 units_active=1 units_failed=1 "
             "units_inactive=1"