From a805c3c69628c6b478a030468a1cd5e2ae90b05b Mon Sep 17 00:00:00 2001
From: Igor Kulikov <ikulikov@thingsboard.io>
Date: Tue, 23 Oct 2018 10:14:15 +0300
Subject: [PATCH 1/2] Fix entity view tests. Fix transports docker configs.

---
 .../server/controller/BaseEntityViewControllerTest.java    | 7 +++++--
 msa/transport/coap/pom.xml                                 | 2 +-
 msa/transport/http/pom.xml                                 | 2 +-
 msa/transport/mqtt/pom.xml                                 | 2 +-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
index ce55e710b9..31869f798b 100644
--- a/application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java
+++ b/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());
diff --git a/msa/transport/coap/pom.xml b/msa/transport/coap/pom.xml
index 07c4e63342..94399c7715 100644
--- a/msa/transport/coap/pom.xml
+++ b/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>
 
diff --git a/msa/transport/http/pom.xml b/msa/transport/http/pom.xml
index 22eb299dd5..6bbfc3f782 100644
--- a/msa/transport/http/pom.xml
+++ b/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>
 
diff --git a/msa/transport/mqtt/pom.xml b/msa/transport/mqtt/pom.xml
index 975f9fcdd0..0a3b07771b 100644
--- a/msa/transport/mqtt/pom.xml
+++ b/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>
 

From c1675db1a1464839f9b8fab21dbf57b8684f8c72 Mon Sep 17 00:00:00 2001
From: Andrew Shvayka <ashvayka@thingsboard.io>
Date: Tue, 23 Oct 2018 16:30:44 +0300
Subject: [PATCH 2/2] Default partitioning is restored to MONTHS

To avoid issues with "lost telemetry" after upgrade.
---
 application/src/main/resources/thingsboard.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 6cb36218b0..da6db707f1 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/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}"