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

Save time series strategies: update time series node config in rule chain JSONs; add null-check for persistence settings

Browse Source
This commit is contained in:
Dmytro Skarzhynets 2025-01-12 14:27:46 +02:00
parent 6ca45f1962
commit 345e423973
5 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
View File

@ -34,7 +34,11 @@
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0,
"useServerTs": false,
"persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
}, },
"externalId": null "externalId": null
}, },

6
application/src/main/data/json/tenant/device_profile/rule_chain_template.json
View File

@ -20,7 +20,11 @@
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0,
"useServerTs": false,
"persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
} }
}, },
{ {

6
application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
View File

@ -19,7 +19,11 @@
"type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode", "type": "org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode",
"name": "Save Timeseries", "name": "Save Timeseries",
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0,
"useServerTs": false,
"persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
} }
}, },
{ {

18
monitoring/src/main/resources/root_rule_chain.json
View File

@ -23,7 +23,11 @@
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0,
"useServerTs": false,
"persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
}, },
"externalId": null "externalId": null
}, },
@ -275,7 +279,11 @@
"singletonMode": false, "singletonMode": false,
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
"defaultTTL": 0 "defaultTTL": 0,
"useServerTs": false,
"persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
}, },
"externalId": null "externalId": null
}, },
@ -310,8 +318,10 @@
"configurationVersion": 0, "configurationVersion": 0,
"configuration": { "configuration": {
"defaultTTL": 180, "defaultTTL": 180,
"skipLatestPersistence": null, "useServerTs": false,
"useServerTs": null "persistenceSettings": {
"type": "ON_EVERY_MESSAGE"
}
}, },
"externalId": null "externalId": null
} }

3
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java
View File

@ -83,6 +83,9 @@ public class TbMsgTimeseriesNode implements TbNode {
ctx.addTenantProfileListener(this::onTenantProfileUpdate); ctx.addTenantProfileListener(this::onTenantProfileUpdate);
onTenantProfileUpdate(ctx.getTenantProfile()); onTenantProfileUpdate(ctx.getTenantProfile());
persistenceSettings = config.getPersistenceSettings(); persistenceSettings = config.getPersistenceSettings();
if (persistenceSettings == null) {
throw new TbNodeException("Persistence settings cannot be null!", true);
}
} }
void onTenantProfileUpdate(TenantProfile tenantProfile) { void onTenantProfileUpdate(TenantProfile tenantProfile) {