Fixes for monitoring

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);
+    }
+
 }

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) {

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
         }