commit c00c19e0deb9dcc64113e8b37b75660fed543e30
author Patrick Williams <patrick@stwcx.xyz> Fri Feb 23 19:07:32 2024 -0600
committer Patrick Williams <patrick@stwcx.xyz> Fri Feb 23 20:42:16 2024 -0600
tree 359d6e4c1eac6e71cd3ab8e4a753f2932fa84df4
parent da72a8c3cb4f77009bc98d2f1a021d8e0adbb0c0

metric-config: remove thresholds on userspace and kernel CPU

We do not need a default threshold on the userspace and kernel CPU
metrics because we already have a threshold on the overall CPU usage.
Sustained CPU usage is likely what someone wants to identify, no matter
which side of the accounting it is attributed to.  Delete the extra
thresholds.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I56352169b3fc50f11410f054053c39c40a79b82e

test/test_health_metric_collection.cpp

diff --git a/test/test_health_metric_collection.cpp b/test/test_health_metric_collection.cpp
index 4cd6a6b..e9aa000 100644
--- a/test/test_health_metric_collection.cpp
+++ b/test/test_health_metric_collection.cpp
@@ -159,7 +159,7 @@
                 sd_bus_message_new_signal(IsNull(), NotNull(), NotNull(),
                                           StrEq(thresholdInterface),
                                           StrEq("AssertionChanged")))
-        .Times(12);
+        .Times(8);
 
     createCollection();
 }

test/test_health_metric_config.cpp

diff --git a/test/test_health_metric_config.cpp b/test/test_health_metric_config.cpp
index c13e819..2670dab 100644
--- a/test/test_health_metric_config.cpp
+++ b/test/test_health_metric_config.cpp
@@ -58,6 +58,7 @@
 TEST(HealthMonitorConfigTest, TestConfigValues)
 {
     auto healthMetricConfigs = getHealthMetricConfigs();
+    auto count_with_thresholds = 0;
     for (const auto& [type, configs] : healthMetricConfigs)
     {
         EXPECT_NE(type, metric::Type::unknown);
@@ -68,7 +69,12 @@
             EXPECT_TRUE(isValidSubType(type, config.subType));
             EXPECT_GE(config.collectionFreq, HealthMetric::defaults::frequency);
             EXPECT_GE(config.windowSize, HealthMetric::defaults::windowSize);
-            EXPECT_GE(config.thresholds.size(), minConfigSize);
+            if (config.thresholds.size())
+            {
+                count_with_thresholds++;
+            }
         }
+
+        EXPECT_GE(count_with_thresholds, 1);
     }
 }