dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes for monitoring

Browse Source
This commit is contained in:
ViacheslavKlimov 2025-05-12 12:50:03 +03:00
parent 32212b9c51
commit 602d60281c
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
monitoring/src/main/java/org/thingsboard/monitoring/config/transport/TransportMonitoringTarget.java
View File

@ -15,6 +15,7 @@
*/ */
package org.thingsboard.monitoring.config.transport; package org.thingsboard.monitoring.config.transport;
import com.google.common.base.Strings;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.thingsboard.monitoring.config.MonitoringTarget; import org.thingsboard.monitoring.config.MonitoringTarget;
@ -39,4 +40,8 @@ public class TransportMonitoringTarget implements MonitoringTarget {
return StringUtils.defaultIfEmpty(queue, "Main"); return StringUtils.defaultIfEmpty(queue, "Main");
} }
public String getNamePrefix() {
return Strings.nullToEmpty(namePrefix);
}
} }

9
monitoring/src/main/java/org/thingsboard/monitoring/service/MonitoringEntityService.java
View File

@ -29,6 +29,7 @@ import org.thingsboard.monitoring.config.transport.TransportMonitoringConfig;
import org.thingsboard.monitoring.config.transport.TransportMonitoringTarget; import org.thingsboard.monitoring.config.transport.TransportMonitoringTarget;
import org.thingsboard.monitoring.config.transport.TransportType; import org.thingsboard.monitoring.config.transport.TransportType;
import org.thingsboard.monitoring.util.ResourceUtils; 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.Device;
import org.thingsboard.server.common.data.DeviceProfile; import org.thingsboard.server.common.data.DeviceProfile;
import org.thingsboard.server.common.data.DeviceProfileType; import org.thingsboard.server.common.data.DeviceProfileType;
@ -113,6 +114,8 @@ public class MonitoringEntityService {
RuleChainMetaData metaData = JacksonUtil.fromString(metadataJson, RuleChainMetaData.class); RuleChainMetaData metaData = JacksonUtil.fromString(metadataJson, RuleChainMetaData.class);
metaData.setRuleChainId(ruleChainId); metaData.setRuleChainId(ruleChainId);
tbClient.saveRuleChainMetaData(metaData); tbClient.saveRuleChainMetaData(metaData);
tbClient.saveEntityAttributesV2(ruleChainId, DataConstants.SERVER_SCOPE, JacksonUtil.newObjectNode()
.put("version", newVersion));
} }
public Asset getOrCreateMonitoringAsset() { public Asset getOrCreateMonitoringAsset() {
@ -184,7 +187,11 @@ public class MonitoringEntityService {
credentials.setCredentialsValue(JacksonUtil.toString(lwm2mCreds)); 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) { private DeviceProfile getOrCreateDeviceProfile(TransportMonitoringConfig config, TransportMonitoringTarget target) {

2
monitoring/src/main/resources/rule_chain.json
View File

@ -154,7 +154,7 @@
"tbelScript": "return msg.temperature > 20;" "tbelScript": "return msg.temperature > 20;"
}, },
"additionalInfo": { "additionalInfo": {
"description": "dashboardId: ${MONITORING:dashboardId}", "description": "",
"layoutX": 251, "layoutX": 251,
"layoutY": 499 "layoutY": 499
} }