Browse Source

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

pull/12413/head
Dmytro Skarzhynets 2 years ago
parent
commit
345e423973
  1. 8
      application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json
  2. 8
      application/src/main/data/json/tenant/device_profile/rule_chain_template.json
  3. 6
      application/src/main/data/json/tenant/rule_chains/root_rule_chain.json
  4. 20
      monitoring/src/main/resources/root_rule_chain.json
  5. 3
      rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbMsgTimeseriesNode.java

8
application/src/main/data/json/edge/rule_chains/edge_root_rule_chain.json

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

8
application/src/main/data/json/tenant/device_profile/rule_chain_template.json

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

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

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

20
monitoring/src/main/resources/root_rule_chain.json

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

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

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

Loading…
Cancel
Save