Merge remote-tracking branch 'upstream/master'

application/src/main/resources/thingsboard.yml

@@ -135,7 +135,7 @@ cassandra:
     write_consistency_level: "${CASSANDRA_WRITE_CONSISTENCY_LEVEL:ONE}"
     default_fetch_size: "${CASSANDRA_DEFAULT_FETCH_SIZE:2000}"
     # Specify partitioning size for timestamp key-value storage. Example MINUTES, HOURS, DAYS, MONTHS,INDEFINITE
-    ts_key_value_partitioning: "${TS_KV_PARTITIONING:INDEFINITE}"
+    ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}"
     ts_key_value_ttl: "${TS_KV_TTL:0}"
     buffer_size: "${CASSANDRA_QUERY_BUFFER_SIZE:200000}"
     concurrent_limit: "${CASSANDRA_QUERY_CONCURRENT_LIMIT:1000}"

application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java

@@ -329,9 +329,11 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
         Set<String> expectedActualAttributesSet =
                 new HashSet<>(Arrays.asList("caKey1", "caKey2", "caKey3", "caKey4"));
         assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet));
-        Thread.sleep(1000);
 
         EntityView savedView = getNewSavedEntityView("Test entity view");
+
+        Thread.sleep(1000);
+
         List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() +
                 "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
 
@@ -348,7 +350,6 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
 
         Set<String> expectedActualAttributesSet = new HashSet<>(Arrays.asList("caKey1", "caKey2", "caKey3", "caKey4"));
         assertTrue(actualAttributesSet.containsAll(expectedActualAttributesSet));
-        Thread.sleep(1000);
 
         List<Map<String, Object>> valueTelemetryOfDevices = doGetAsync("/api/plugins/telemetry/DEVICE/" + testDevice.getId().getId().toString() +
                 "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
@@ -363,6 +364,8 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
         view.setEndTimeMs((long) getValue(valueTelemetryOfDevices, "lastActivityTime") / 10);
         EntityView savedView = doPost("/api/entityView", view, EntityView.class);
 
+        Thread.sleep(1000);
+
         List<Map<String, Object>> values = doGetAsync("/api/plugins/telemetry/ENTITY_VIEW/" + savedView.getId().getId().toString() +
                 "/values/attributes?keys=" + String.join(",", actualAttributesSet), List.class);
         assertEquals(0, values.size());

msa/transport/coap/pom.xml

@@ -37,7 +37,7 @@
         <pkg.name>tb-coap-transport</pkg.name>
         <docker.name>tb-coap-transport</docker.name>
         <pkg.user>thingsboard</pkg.user>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
+        <pkg.logFolder>/var/log/${pkg.name}</pkg.logFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
     </properties>
 

msa/transport/http/pom.xml

@@ -37,7 +37,7 @@
         <pkg.name>tb-http-transport</pkg.name>
         <docker.name>tb-http-transport</docker.name>
         <pkg.user>thingsboard</pkg.user>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
+        <pkg.logFolder>/var/log/${pkg.name}</pkg.logFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
     </properties>
 

msa/transport/mqtt/pom.xml

@@ -37,7 +37,7 @@
         <pkg.name>tb-mqtt-transport</pkg.name>
         <docker.name>tb-mqtt-transport</docker.name>
         <pkg.user>thingsboard</pkg.user>
-        <pkg.unixLogFolder>/var/log/${pkg.name}</pkg.unixLogFolder>
+        <pkg.logFolder>/var/log/${pkg.name}</pkg.logFolder>
         <pkg.installFolder>/usr/share/${pkg.name}</pkg.installFolder>
     </properties>