From 602d60281c5537fba1bfc194135a275b97b66fa4 Mon Sep 17 00:00:00 2001
From: ViacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Mon, 12 May 2025 12:50:03 +0300
Subject: [PATCH] Fixes for monitoring

---
 .../config/transport/TransportMonitoringTarget.java      | 5 +++++
 .../monitoring/service/MonitoringEntityService.java      | 9 ++++++++-
 monitoring/src/main/resources/rule_chain.json            | 2 +-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportMonitoringTarget.java b/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportMonitoringTarget.java
index e8a9ab03fa..5558f39c05 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportMonitoringTarget.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportMonitoringTarget.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.monitoring.config.transport;
 
+import com.google.common.base.Strings;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
 import org.thingsboard.monitoring.config.MonitoringTarget;
@@ -39,4 +40,8 @@ public class TransportMonitoringTarget implements MonitoringTarget {
         return StringUtils.defaultIfEmpty(queue, "Main");
     }
 
+    public String getNamePrefix() {
+        return Strings.nullToEmpty(namePrefix);
+    }
+
 }
diff --git a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
index 66dc9200e3..062104ecd5 100644
--- a/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
+++ b/monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
@@ -29,6 +29,7 @@ import org.thingsboard.monitoring.config.transport.TransportMonitoringConfig;
 import org.thingsboard.monitoring.config.transport.TransportMonitoringTarget;
 import org.thingsboard.monitoring.config.transport.TransportType;
 import org.thingsboard.monitoring.util.ResourceUtils;
+import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.DeviceProfile;
 import org.thingsboard.server.common.data.DeviceProfileType;
@@ -113,6 +114,8 @@ public class MonitoringEntityService {
         RuleChainMetaData metaData = JacksonUtil.fromString(metadataJson, RuleChainMetaData.class);
         metaData.setRuleChainId(ruleChainId);
         tbClient.saveRuleChainMetaData(metaData);
+        tbClient.saveEntityAttributesV2(ruleChainId, DataConstants.SERVER_SCOPE, JacksonUtil.newObjectNode()
+                .put("version", newVersion));
     }
 
     public Asset getOrCreateMonitoringAsset() {
@@ -184,7 +187,11 @@ public class MonitoringEntityService {
             credentials.setCredentialsValue(JacksonUtil.toString(lwm2mCreds));
         }
 
-        return tbClient.saveDeviceWithCredentials(device, credentials).get();
+        device = tbClient.saveDeviceWithCredentials(device, credentials).get();
+        if (calculatedFieldsMonitoringEnabled) {
+            createCalculatedField(device);
+        }
+        return device;
     }
 
     private DeviceProfile getOrCreateDeviceProfile(TransportMonitoringConfig config, TransportMonitoringTarget target) {
diff --git a/monitoring/src/main/resources/rule_chain.json b/monitoring/src/main/resources/rule_chain.json
index 96d2388636..2bc0e89a8a 100644
--- a/monitoring/src/main/resources/rule_chain.json
+++ b/monitoring/src/main/resources/rule_chain.json
@@ -154,7 +154,7 @@
           "tbelScript": "return msg.temperature > 20;"
         },
         "additionalInfo": {
-          "description": "dashboardId: ${MONITORING:dashboardId}",
+          "description": "",
           "layoutX": 251,
           "layoutY": 499
         }