From fd66c5f1773251fde5d016f7351843ea1caef8b3 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Mon, 12 May 2025 12:58:33 +0300
Subject: [PATCH] CF monitoring fixes

---
 .../thingsboard/monitoring/data/MonitoredServiceKey.java    | 1 -
 .../thingsboard/monitoring/service/BaseHealthChecker.java   | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
index 7579d75231..9c3ee5b786 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/data/MonitoredServiceKey.java
@@ -19,6 +19,5 @@ public class MonitoredServiceKey {
 
     public static final String GENERAL = "Monitoring";
     public static final String EDQS = "*EDQS*";
-    public static final String CF = "*CF*";
 
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
index d19e723332..072310fb67 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/BaseHealthChecker.java
@@ -117,11 +117,9 @@ public abstract class BaseHealthChecker<C extends MonitoringConfig, T extends Mo
             String cfTestValue = testValue + "-cf";
             String actualCfValue = latest.get(TEST_CF_TELEMETRY_KEY);
             if (actualCfValue == null) {
-                throw new ServiceFailureException(MonitoredServiceKey.CF, "No CF value arrived");
+                throw new ServiceFailureException(info, "No calculated field value arrived");
             } else if (!cfTestValue.equals(actualCfValue)) {
-                throw new ServiceFailureException(MonitoredServiceKey.CF, "Was expecting CF value " + cfTestValue + " but got " + actualCfValue);
-            } else {
-                reporter.serviceIsOk(MonitoredServiceKey.CF);
+                throw new ServiceFailureException(info, "Was expecting calculated field value " + cfTestValue + " but got " + actualCfValue);
             }
         }
         reporter.reportLatency(Latencies.wsUpdate(getKey()), stopWatch.getTime());