简柏林 / thingskit · Commits

Commit a91a69c57f6737fbdd438e5aeb79eb5bf47e9a13

Authored by Andrii Shvaika
1 parent 9b0e92ca

Fixed Docker Compose

Inline Side-by-side
Showing 24 changed files with 53 additions and 93 deletions
... ... @@ -208,29 +208,5 @@ public class InstallScripts {
208 208 log.error("Unable to load dashboard from json", e);
209 209 throw new RuntimeException("Unable to load dashboard from json", e);
210 210 }
211   -
212   - try (DirectoryStream<Path> dirStream = Files.newDirectoryStream(ruleChainsDir, path -> path.toString().endsWith(JSON_EXT))) {
213   - dirStream.forEach(
214   - path -> {
215   - try {
216   - JsonNode ruleChainJson = objectMapper.readTree(path.toFile());
217   - RuleChain ruleChain = objectMapper.treeToValue(ruleChainJson.get("ruleChain"), RuleChain.class);
218   - RuleChainMetaData ruleChainMetaData = objectMapper.treeToValue(ruleChainJson.get("metadata"), RuleChainMetaData.class);
219   -
220   - ruleChain.setTenantId(tenantId);
221   - if (ruleChain.getName().equals("Root Rule Chain")) {
222   - ruleChain.setRoot(true);
223   - }
224   - ruleChain = ruleChainService.saveRuleChain(ruleChain);
225   -
226   - ruleChainMetaData.setRuleChainId(ruleChain.getId());
227   - ruleChainService.saveRuleChainMetaData(new TenantId(EntityId.NULL_UUID), ruleChainMetaData);
228   - } catch (Exception e) {
229   - log.error("Unable to load dashboard from json: [{}]", path.toString());
230   - throw new RuntimeException("Unable to load dashboard from json", e);
231   - }
232   - }
233   - );
234   - }
235 211 }
236 212 }
... ...
... ... @@ -46,7 +46,7 @@ import java.util.concurrent.atomic.AtomicInteger;
46 46 @Service
47 47 public class RemoteJsInvokeService extends AbstractJsInvokeService {
48 48
49   - @Value("${js.remote.max_requests_timeout}")
  49 + @Value("${queue.js.max_requests_timeout}")
50 50 private long maxRequestsTimeout;
51 51
52 52 @Getter
... ...
... ... @@ -59,8 +59,7 @@ services:
59 59 max-size: "200m"
60 60 max-file: "30"
61 61 environment:
62   - TB_HOST: tb1
63   - CLUSTER_NODE_ID: tb1
  62 + TB_SERVICE_ID: tb1
64 63 env_file:
65 64 - tb-node.env
66 65 volumes:
... ... @@ -81,8 +80,7 @@ services:
81 80 max-size: "200m"
82 81 max-file: "30"
83 82 environment:
84   - TB_HOST: tb2
85   - CLUSTER_NODE_ID: tb2
  83 + TB_SERVICE_ID: tb2
86 84 env_file:
87 85 - tb-node.env
88 86 volumes:
... ... @@ -98,8 +96,7 @@ services:
98 96 ports:
99 97 - "1883"
100 98 environment:
101   - TB_HOST: tb-mqtt-transport1
102   - CLUSTER_NODE_ID: tb-mqtt-transport1
  99 + TB_SERVICE_ID: tb-mqtt-transport1
103 100 env_file:
104 101 - tb-mqtt-transport.env
105 102 volumes:
... ... @@ -113,8 +110,7 @@ services:
113 110 ports:
114 111 - "1883"
115 112 environment:
116   - TB_HOST: tb-mqtt-transport2
117   - CLUSTER_NODE_ID: tb-mqtt-transport2
  113 + TB_SERVICE_ID: tb-mqtt-transport2
118 114 env_file:
119 115 - tb-mqtt-transport.env
120 116 volumes:
... ... @@ -128,8 +124,7 @@ services:
128 124 ports:
129 125 - "8081"
130 126 environment:
131   - TB_HOST: tb-http-transport1
132   - CLUSTER_NODE_ID: tb-http-transport1
  127 + TB_SERVICE_ID: tb-http-transport1
133 128 env_file:
134 129 - tb-http-transport.env
135 130 volumes:
... ... @@ -143,8 +138,7 @@ services:
143 138 ports:
144 139 - "8081"
145 140 environment:
146   - TB_HOST: tb-http-transport2
147   - CLUSTER_NODE_ID: tb-http-transport2
  141 + TB_SERVICE_ID: tb-http-transport2
148 142 env_file:
149 143 - tb-http-transport.env
150 144 volumes:
... ... @@ -158,8 +152,7 @@ services:
158 152 ports:
159 153 - "5683:5683/udp"
160 154 environment:
161   - TB_HOST: tb-coap-transport
162   - CLUSTER_NODE_ID: tb-coap-transport
  155 + TB_SERVICE_ID: tb-coap-transport
163 156 env_file:
164 157 - tb-coap-transport.env
165 158 volumes:
... ...
... ... @@ -4,7 +4,7 @@ KAFKA_LISTENERS=INSIDE://:9093,OUTSIDE://:9092
4 4 KAFKA_ADVERTISED_LISTENERS=INSIDE://:9093,OUTSIDE://kafka:9092
5 5 KAFKA_LISTENER_SECURITY_PROTOCOL_MAP=INSIDE:PLAINTEXT,OUTSIDE:PLAINTEXT
6 6 KAFKA_INTER_BROKER_LISTENER_NAME=INSIDE
7   -KAFKA_CREATE_TOPICS=js.eval.requests:100:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600,tb.transport.api.requests:30:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600,tb.rule-engine:30:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600
  7 +KAFKA_CREATE_TOPICS=js_eval.requests:3:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600,tb_transport.api.requests:3:1:delete --config=retention.ms=60000 --config=segment.bytes=26214400 --config=retention.bytes=104857600
8 8 KAFKA_AUTO_CREATE_TOPICS_ENABLE=false
9 9 KAFKA_LOG_RETENTION_BYTES=1073741824
10 10 KAFKA_LOG_SEGMENT_BYTES=268435456
... ...
... ... @@ -3,4 +3,5 @@ COAP_BIND_ADDRESS=0.0.0.0
3 3 COAP_BIND_PORT=5683
4 4 COAP_TIMEOUT=10000
5 5
  6 +TB_QUEUE_TYPE=kafka
6 7 TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
... ... @@ -3,4 +3,5 @@ HTTP_BIND_ADDRESS=0.0.0.0
3 3 HTTP_BIND_PORT=8081
4 4 HTTP_REQUEST_TIMEOUT=60000
5 5
  6 +TB_QUEUE_TYPE=kafka
6 7 TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
... ... @@ -3,4 +3,5 @@ MQTT_BIND_ADDRESS=0.0.0.0
3 3 MQTT_BIND_PORT=1883
4 4 MQTT_TIMEOUT=10000
5 5
  6 +TB_QUEUE_TYPE=kafka
6 7 TB_KAFKA_SERVERS=kafka:9092
\ No newline at end of file
... ...
... ... @@ -2,9 +2,9 @@
2 2
3 3 ZOOKEEPER_ENABLED=true
4 4 ZOOKEEPER_URL=zookeeper:2181
5   -RPC_HOST=${TB_HOST}
  5 +TB_QUEUE_TYPE=kafka
6 6 TB_KAFKA_SERVERS=kafka:9092
7   -JS_EVALUATOR=remote
  7 +JS_EVALUATOR=local
8 8 TRANSPORT_TYPE=remote
9 9 CACHE_TYPE=redis
10 10 REDIS_HOST=redis
... ...
... ... @@ -21,10 +21,10 @@
21 21
22 22 <appender name="fileLogAppender"
23 23 class="ch.qos.logback.core.rolling.RollingFileAppender">
24   - <file>/var/log/thingsboard/${TB_HOST}/thingsboard.log</file>
  24 + <file>/var/log/thingsboard/${TB_SERVICE_ID}/thingsboard.log</file>
25 25 <rollingPolicy
26 26 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
27   - <fileNamePattern>/var/log/thingsboard/${TB_HOST}/thingsboard.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  27 + <fileNamePattern>/var/log/thingsboard/${TB_SERVICE_ID}/thingsboard.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
28 28 <maxFileSize>100MB</maxFileSize>
29 29 <maxHistory>30</maxHistory>
30 30 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -15,7 +15,7 @@
15 15 #
16 16
17 17 export JAVA_OPTS="$JAVA_OPTS -Dplatform=deb -Dinstall.data_dir=/usr/share/thingsboard/data"
18   -export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/thingsboard/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/thingsboard/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  18 +export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/thingsboard/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/thingsboard/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
19 19 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
20 20 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
21 21 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ...
... ... @@ -21,10 +21,10 @@
21 21
22 22 <appender name="fileLogAppender"
23 23 class="ch.qos.logback.core.rolling.RollingFileAppender">
24   - <file>/var/log/tb-coap-transport/${TB_HOST}/tb-coap-transport.log</file>
  24 + <file>/var/log/tb-coap-transport/${TB_SERVICE_ID}/tb-coap-transport.log</file>
25 25 <rollingPolicy
26 26 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
27   - <fileNamePattern>/var/log/tb-coap-transport/${TB_HOST}/tb-coap-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  27 + <fileNamePattern>/var/log/tb-coap-transport/${TB_SERVICE_ID}/tb-coap-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
28 28 <maxFileSize>100MB</maxFileSize>
29 29 <maxHistory>30</maxHistory>
30 30 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -14,7 +14,7 @@
14 14 # limitations under the License.
15 15 #
16 16
17   -export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-coap-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-coap-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  17 +export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-coap-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-coap-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
18 18 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
19 19 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
20 20 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ...
... ... @@ -21,10 +21,10 @@
21 21
22 22 <appender name="fileLogAppender"
23 23 class="ch.qos.logback.core.rolling.RollingFileAppender">
24   - <file>/var/log/tb-http-transport/${TB_HOST}/tb-http-transport.log</file>
  24 + <file>/var/log/tb-http-transport/${TB_SERVICE_ID}/tb-http-transport.log</file>
25 25 <rollingPolicy
26 26 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
27   - <fileNamePattern>/var/log/tb-http-transport/${TB_HOST}/tb-http-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  27 + <fileNamePattern>/var/log/tb-http-transport/${TB_SERVICE_ID}/tb-http-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
28 28 <maxFileSize>100MB</maxFileSize>
29 29 <maxHistory>30</maxHistory>
30 30 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -14,7 +14,7 @@
14 14 # limitations under the License.
15 15 #
16 16
17   -export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-http-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-http-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  17 +export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-http-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-http-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
18 18 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
19 19 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
20 20 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ...
... ... @@ -21,10 +21,10 @@
21 21
22 22 <appender name="fileLogAppender"
23 23 class="ch.qos.logback.core.rolling.RollingFileAppender">
24   - <file>/var/log/tb-mqtt-transport/${TB_HOST}/tb-mqtt-transport.log</file>
  24 + <file>/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/tb-mqtt-transport.log</file>
25 25 <rollingPolicy
26 26 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
27   - <fileNamePattern>/var/log/tb-mqtt-transport/${TB_HOST}/tb-mqtt-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  27 + <fileNamePattern>/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/tb-mqtt-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
28 28 <maxFileSize>100MB</maxFileSize>
29 29 <maxHistory>30</maxHistory>
30 30 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -14,7 +14,7 @@
14 14 # limitations under the License.
15 15 #
16 16
17   -export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-mqtt-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-mqtt-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  17 +export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
18 18 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
19 19 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
20 20 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ...
... ... @@ -23,7 +23,7 @@ metadata:
23 23 name: tb-coap-transport-config
24 24 data:
25 25 conf: |
26   - export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-coap-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-coap-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  26 + export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-coap-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-coap-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
27 27 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
28 28 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
29 29 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ... @@ -36,10 +36,10 @@ data:
36 36
37 37 <appender name="fileLogAppender"
38 38 class="ch.qos.logback.core.rolling.RollingFileAppender">
39   - <file>/var/log/tb-coap-transport/${TB_HOST}/tb-coap-transport.log</file>
  39 + <file>/var/log/tb-coap-transport/${TB_SERVICE_ID}/tb-coap-transport.log</file>
40 40 <rollingPolicy
41 41 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
42   - <fileNamePattern>/var/log/tb-coap-transport/${TB_HOST}/tb-coap-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  42 + <fileNamePattern>/var/log/tb-coap-transport/${TB_SERVICE_ID}/tb-coap-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
43 43 <maxFileSize>100MB</maxFileSize>
44 44 <maxHistory>30</maxHistory>
45 45 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -23,7 +23,7 @@ metadata:
23 23 name: tb-http-transport-config
24 24 data:
25 25 conf: |
26   - export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-http-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-http-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  26 + export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-http-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-http-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
27 27 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
28 28 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
29 29 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ... @@ -36,10 +36,10 @@ data:
36 36
37 37 <appender name="fileLogAppender"
38 38 class="ch.qos.logback.core.rolling.RollingFileAppender">
39   - <file>/var/log/tb-http-transport/${TB_HOST}/tb-http-transport.log</file>
  39 + <file>/var/log/tb-http-transport/${TB_SERVICE_ID}/tb-http-transport.log</file>
40 40 <rollingPolicy
41 41 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
42   - <fileNamePattern>/var/log/tb-http-transport/${TB_HOST}/tb-http-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  42 + <fileNamePattern>/var/log/tb-http-transport/${TB_SERVICE_ID}/tb-http-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
43 43 <maxFileSize>100MB</maxFileSize>
44 44 <maxHistory>30</maxHistory>
45 45 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -23,7 +23,7 @@ metadata:
23 23 name: tb-mqtt-transport-config
24 24 data:
25 25 conf: |
26   - export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-mqtt-transport/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-mqtt-transport/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  26 + export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
27 27 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
28 28 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
29 29 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ... @@ -36,10 +36,10 @@ data:
36 36
37 37 <appender name="fileLogAppender"
38 38 class="ch.qos.logback.core.rolling.RollingFileAppender">
39   - <file>/var/log/tb-mqtt-transport/${TB_HOST}/tb-mqtt-transport.log</file>
  39 + <file>/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/tb-mqtt-transport.log</file>
40 40 <rollingPolicy
41 41 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
42   - <fileNamePattern>/var/log/tb-mqtt-transport/${TB_HOST}/tb-mqtt-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  42 + <fileNamePattern>/var/log/tb-mqtt-transport/${TB_SERVICE_ID}/tb-mqtt-transport.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
43 43 <maxFileSize>100MB</maxFileSize>
44 44 <maxHistory>30</maxHistory>
45 45 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -24,7 +24,7 @@ metadata:
24 24 data:
25 25 conf: |
26 26 export JAVA_OPTS="$JAVA_OPTS -Dplatform=deb -Dinstall.data_dir=/usr/share/thingsboard/data"
27   - export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/thingsboard/${TB_HOST}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/thingsboard/${TB_HOST}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
  27 + export JAVA_OPTS="$JAVA_OPTS -Xloggc:/var/log/thingsboard/${TB_SERVICE_ID}/gc.log -XX:+IgnoreUnrecognizedVMOptions -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/var/log/thingsboard/${TB_SERVICE_ID}/heapdump.bin -XX:+PrintGCDetails -XX:+PrintGCDateStamps"
28 28 export JAVA_OPTS="$JAVA_OPTS -XX:+PrintHeapAtGC -XX:+PrintTenuringDistribution -XX:+PrintGCApplicationStoppedTime -XX:+UseGCLogFileRotation -XX:NumberOfGCLogFiles=10"
29 29 export JAVA_OPTS="$JAVA_OPTS -XX:GCLogFileSize=10M -XX:-UseBiasedLocking -XX:+UseTLAB -XX:+ResizeTLAB -XX:+PerfDisableSharedMem -XX:+UseCondCardMark"
30 30 export JAVA_OPTS="$JAVA_OPTS -XX:CMSWaitDuration=10000 -XX:+UseParNewGC -XX:+UseConcMarkSweepGC -XX:+CMSParallelRemarkEnabled -XX:+CMSParallelInitialMarkEnabled"
... ... @@ -37,10 +37,10 @@ data:
37 37
38 38 <appender name="fileLogAppender"
39 39 class="ch.qos.logback.core.rolling.RollingFileAppender">
40   - <file>/var/log/thingsboard/${TB_HOST}/thingsboard.log</file>
  40 + <file>/var/log/thingsboard/${TB_SERVICE_ID}/thingsboard.log</file>
41 41 <rollingPolicy
42 42 class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
43   - <fileNamePattern>/var/log/thingsboard/${TB_HOST}/thingsboard.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
  43 + <fileNamePattern>/var/log/thingsboard/${TB_SERVICE_ID}/thingsboard.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
44 44 <maxFileSize>100MB</maxFileSize>
45 45 <maxHistory>30</maxHistory>
46 46 <totalSizeCap>3GB</totalSizeCap>
... ...
... ... @@ -247,18 +247,12 @@ spec:
247 247 - containerPort: 9001
248 248 name: rpc
249 249 env:
250   - - name: RPC_HOST
251   - valueFrom:
252   - fieldRef:
253   - fieldPath: status.podIP
254   - - name: CLUSTER_NODE_ID
255   - valueFrom:
256   - fieldRef:
257   - fieldPath: metadata.name
258   - - name: TB_HOST
  250 + - name: TB_SERVICE_ID
259 251 valueFrom:
260 252 fieldRef:
261 253 fieldPath: metadata.name
  254 + - name: TB_SERVICE_TYPE
  255 + value: "monolith"
262 256 - name: ZOOKEEPER_ENABLED
263 257 value: "true"
264 258 - name: ZOOKEEPER_URL
... ... @@ -334,14 +328,12 @@ spec:
334 328 - containerPort: 1883
335 329 name: mqtt
336 330 env:
337   - - name: CLUSTER_NODE_ID
338   - valueFrom:
339   - fieldRef:
340   - fieldPath: metadata.name
341   - - name: TB_HOST
  331 + - name: TB_SERVICE_ID
342 332 valueFrom:
343 333 fieldRef:
344 334 fieldPath: metadata.name
  335 + - name: TB_SERVICE_TYPE
  336 + value: "monolith"
345 337 - name: MQTT_BIND_ADDRESS
346 338 value: "0.0.0.0"
347 339 - name: MQTT_BIND_PORT
... ... @@ -409,14 +401,12 @@ spec:
409 401 - containerPort: 8080
410 402 name: http
411 403 env:
412   - - name: CLUSTER_NODE_ID
413   - valueFrom:
414   - fieldRef:
415   - fieldPath: metadata.name
416   - - name: TB_HOST
  404 + - name: TB_SERVICE_ID
417 405 valueFrom:
418 406 fieldRef:
419 407 fieldPath: metadata.name
  408 + - name: TB_SERVICE_TYPE
  409 + value: "monolith"
420 410 - name: HTTP_BIND_ADDRESS
421 411 value: "0.0.0.0"
422 412 - name: HTTP_BIND_PORT
... ... @@ -484,14 +474,12 @@ spec:
484 474 name: coap
485 475 protocol: UDP
486 476 env:
487   - - name: CLUSTER_NODE_ID
488   - valueFrom:
489   - fieldRef:
490   - fieldPath: metadata.name
491   - - name: TB_HOST
  477 + - name: TB_SERVICE_ID
492 478 valueFrom:
493 479 fieldRef:
494 480 fieldPath: metadata.name
  481 + - name: TB_SERVICE_TYPE
  482 + value: "monolith"
495 483 - name: COAP_BIND_ADDRESS
496 484 value: "0.0.0.0"
497 485 - name: COAP_BIND_PORT
... ...
... ... @@ -42,7 +42,7 @@ transport:
42 42 max_string_value_length: "${JSON_MAX_STRING_VALUE_LENGTH:0}"
43 43
44 44 queue:
45   - type: "${TB_QUEUE_TYPE:in-memory}" # kafka or in-memory or aws-sqs or pubsub or service-bus
  45 + type: "${TB_QUEUE_TYPE:kafka}" # kafka or aws-sqs or pubsub or service-bus or rabbitmq
46 46 kafka:
47 47 bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
48 48 acks: "${TB_KAFKA_ACKS:all}"
... ...
... ... @@ -43,7 +43,7 @@ transport:
43 43 max_string_value_length: "${JSON_MAX_STRING_VALUE_LENGTH:0}"
44 44
45 45 queue:
46   - type: "${TB_QUEUE_TYPE:in-memory}" # kafka or in-memory or aws-sqs or pubsub or service-bus
  46 + type: "${TB_QUEUE_TYPE:kafka}" # kafka or aws-sqs or pubsub or service-bus or rabbitmq
47 47 kafka:
48 48 bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
49 49 acks: "${TB_KAFKA_ACKS:all}"
... ...
... ... @@ -73,7 +73,7 @@ transport:
73 73 max_string_value_length: "${JSON_MAX_STRING_VALUE_LENGTH:0}"
74 74
75 75 queue:
76   - type: "${TB_QUEUE_TYPE:in-memory}" # kafka or in-memory or aws-sqs or pubsub or service-bus
  76 + type: "${TB_QUEUE_TYPE:kafka}" # kafka or aws-sqs or pubsub or service-bus or rabbitmq
77 77 kafka:
78 78 bootstrap.servers: "${TB_KAFKA_SERVERS:localhost:9092}"
79 79 acks: "${TB_KAFKA_ACKS:all}"
... ...