Skip to content

Commit 6c33825

Browse files
committed
Updated Postgres demo configs with v0.10.0
1 parent 555d42b commit 6c33825

12 files changed

+2499
-46
lines changed

examples/postgres/demo/config/jobmanager.properties

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,13 @@ redis.connection.url=redis://127.0.0.1:14001
3535
##### Credentials properties
3636
credentials.file.path=/opt/redislabs/redis-connect/config/samples/credentials
3737
#credentials.rotation.event.listener.enabled=false
38-
#credentials.rotation.event.listener.interval=60000
38+
#credentials.rotation.event.listener.interval=60000
39+
40+
##### Email Alert properties
41+
#mail.alert.enabled=false
42+
#mail.smtp.host=smtp.gmail.com
43+
#mail.smtp.port=587
44+
#mail.smtp.start.tls.enable=true
45+
#mail.smtp.start.tls.required=false
46+
#mail.to=
47+
#mail.debug=false

examples/postgres/demo/config/logback-cli.xml

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<configuration debug="false" scan="true" scanPeriod="15 seconds">
22

33
<property name="LOG_REDIS_CONNECT_PATH" value="logs/redis-connect"/>
4-
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager.log"/>
5-
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat.log"/>
4+
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager"/>
5+
<property name="LOG_REDIS_CONNECT_PIPELINE_PATH" value="logs/redis-connect-pipeline"/>
6+
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat"/>
7+
8+
<define name="PROCESS_ID" class="com.redis.connect.utils.PidPropertyDefiner"/>
69

710
<appender name="REDIS_CONNECT_HEARTBEAT" class="ch.qos.logback.core.rolling.RollingFileAppender">
8-
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}</file>
11+
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}-${PROCESS_ID}.log</file>
912
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
10-
<fileNamePattern>logs/archived/redis-connect-heartbeat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
13+
<fileNamePattern>logs/archived/redis-connect-heartbeat-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
1114
<!-- each archived file, size max 10MB -->
1215
<maxFileSize>10MB</maxFileSize>
1316
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -16,13 +19,13 @@
1619
<maxHistory>60</maxHistory>
1720
</rollingPolicy>
1821
<encoder>
19-
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
22+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
2023
</encoder>
2124
</appender>
2225
<appender name="REDIS_CONNECT_MANAGER" class="ch.qos.logback.core.rolling.RollingFileAppender">
23-
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}</file>
26+
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}-${PROCESS_ID}.log</file>
2427
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
25-
<fileNamePattern>logs/archived/redis-connect-manager.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
28+
<fileNamePattern>logs/archived/redis-connect-manager-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
2629
<!-- each archived file, size max 10MB -->
2730
<maxFileSize>10MB</maxFileSize>
2831
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -31,13 +34,28 @@
3134
<maxHistory>60</maxHistory>
3235
</rollingPolicy>
3336
<encoder>
34-
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
37+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
3538
</encoder>
3639
</appender>
3740
<appender name="REDIS_CONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
38-
<file>${LOG_REDIS_CONNECT_PATH}-${PID}.log</file>
41+
<file>${LOG_REDIS_CONNECT_PATH}-${PROCESS_ID}.log</file>
42+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
43+
<fileNamePattern>logs/archived/redis-connect-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
44+
<!-- each archived file, size max 10MB -->
45+
<maxFileSize>10MB</maxFileSize>
46+
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
47+
<totalSizeCap>20GB</totalSizeCap>
48+
<!-- 60 days to keep -->
49+
<maxHistory>60</maxHistory>
50+
</rollingPolicy>
51+
<encoder>
52+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
53+
</encoder>
54+
</appender>
55+
<appender name="REDIS_CONNECT_PIPELINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
56+
<file>${LOG_REDIS_CONNECT_PIPELINE_PATH}-${PROCESS_ID}.log</file>
3957
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
40-
<fileNamePattern>logs/archived/redis-connect-${PID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
58+
<fileNamePattern>logs/archived/redis-connect-pipeline-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
4159
<!-- each archived file, size max 10MB -->
4260
<maxFileSize>10MB</maxFileSize>
4361
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -46,7 +64,7 @@
4664
<maxHistory>60</maxHistory>
4765
</rollingPolicy>
4866
<encoder>
49-
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
67+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
5068
</encoder>
5169
</appender>
5270
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -57,23 +75,27 @@
5775

5876
<logger name="redis-connect-heartbeat" level="OFF" additivity="false">
5977
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
60-
<appender-ref ref="CONSOLE" />
78+
<appender-ref ref="CONSOLE"/>
6179
</logger>
6280
<logger name="redis-connect-manager" level="OFF" additivity="false">
6381
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
82+
<appender-ref ref="CONSOLE"/>
83+
</logger>
84+
<logger name="redis-connect-pipeline" level="OFF" additivity="false">
85+
<appender-ref ref="REDIS_CONNECT_PIPELINE"/>
6486
<appender-ref ref="CONSOLE" />
6587
</logger>
6688
<logger name="redis-connect" level="OFF" additivity="false">
6789
<appender-ref ref="REDIS_CONNECT"/>
68-
<appender-ref ref="CONSOLE" />
90+
<appender-ref ref="CONSOLE"/>
6991
</logger>
7092
<logger name="io.netty" level="OFF" additivity="false">
7193
<appender-ref ref="REDIS_CONNECT"/>
72-
<appender-ref ref="CONSOLE" />
94+
<appender-ref ref="CONSOLE"/>
7395
</logger>
7496
<logger name="io.lettuce" level="OFF" additivity="false">
7597
<appender-ref ref="REDIS_CONNECT"/>
76-
<appender-ref ref="CONSOLE" />
98+
<appender-ref ref="CONSOLE"/>
7799
</logger>
78100
<logger name="com.zaxxer" level="OFF" additivity="false">
79101
<appender-ref ref="REDIS_CONNECT"/>
@@ -101,13 +123,14 @@
101123
</logger>
102124
<logger name="Validator" level="OFF" additivity="false"/>
103125
<logger name="_org.springframework.web.servlet.HandlerMapping" level="OFF" additivity="false"/>
104-
<logger name="com.redis.connect.cluster.RedisConnectSpringBootApplication" level="OFF" additivity="false"/>
126+
<logger name="com.redis.connect.cluster.rest.RedisConnectSpringBootApplication" level="OFF" additivity="false"/>
105127
<logger name="reactor.util" level="OFF" additivity="false"/>
106128

107129
<root>
108130
<appender-ref ref="REDIS_CONNECT"/>
109131
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
132+
<appender-ref ref="REDIS_CONNECT_PIPELINE"/>
110133
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
111134
</root>
112135

113-
</configuration>
136+
</configuration>

examples/postgres/demo/config/logback.xml

Lines changed: 40 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<configuration debug="false" scan="true" scanPeriod="15 seconds">
22

33
<property name="LOG_REDIS_CONNECT_PATH" value="logs/redis-connect"/>
4-
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager.log"/>
5-
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat.log"/>
4+
<property name="LOG_REDIS_CONNECT_MANAGER_PATH" value="logs/redis-connect-manager"/>
5+
<property name="LOG_REDIS_CONNECT_PIPELINE_PATH" value="logs/redis-connect-pipeline"/>
6+
<property name="LOG_REDIS_CONNECT_HEARTBEAT_PATH" value="logs/redis-connect-heartbeat"/>
7+
8+
<define name="PROCESS_ID" class="com.redis.connect.utils.PidPropertyDefiner"/>
69

710
<appender name="REDIS_CONNECT_HEARTBEAT" class="ch.qos.logback.core.rolling.RollingFileAppender">
8-
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}</file>
11+
<file>${LOG_REDIS_CONNECT_HEARTBEAT_PATH}-${PROCESS_ID}.log</file>
912
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
10-
<fileNamePattern>logs/archived/redis-connect-heartbeat.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
13+
<fileNamePattern>logs/archived/redis-connect-heartbeat-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
1114
<!-- each archived file, size max 10MB -->
1215
<maxFileSize>10MB</maxFileSize>
1316
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -16,13 +19,13 @@
1619
<maxHistory>60</maxHistory>
1720
</rollingPolicy>
1821
<encoder>
19-
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
22+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
2023
</encoder>
2124
</appender>
2225
<appender name="REDIS_CONNECT_MANAGER" class="ch.qos.logback.core.rolling.RollingFileAppender">
23-
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}</file>
26+
<file>${LOG_REDIS_CONNECT_MANAGER_PATH}-${PROCESS_ID}.log</file>
2427
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
25-
<fileNamePattern>logs/archived/redis-connect-manager.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
28+
<fileNamePattern>logs/archived/redis-connect-manager-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
2629
<!-- each archived file, size max 10MB -->
2730
<maxFileSize>10MB</maxFileSize>
2831
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -31,13 +34,13 @@
3134
<maxHistory>60</maxHistory>
3235
</rollingPolicy>
3336
<encoder>
34-
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
37+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
3538
</encoder>
3639
</appender>
3740
<appender name="REDIS_CONNECT" class="ch.qos.logback.core.rolling.RollingFileAppender">
38-
<file>${LOG_REDIS_CONNECT_PATH}-${PID}.log</file>
41+
<file>${LOG_REDIS_CONNECT_PATH}-${PROCESS_ID}.log</file>
3942
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
40-
<fileNamePattern>logs/archived/redis-connect-${PID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
43+
<fileNamePattern>logs/archived/redis-connect-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
4144
<!-- each archived file, size max 10MB -->
4245
<maxFileSize>10MB</maxFileSize>
4346
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
@@ -49,6 +52,21 @@
4952
<pattern>%d %p %c{1.} [%t] %m%n</pattern>
5053
</encoder>
5154
</appender>
55+
<appender name="REDIS_CONNECT_PIPELINE" class="ch.qos.logback.core.rolling.RollingFileAppender">
56+
<file>${LOG_REDIS_CONNECT_PIPELINE_PATH}-${PROCESS_ID}.log</file>
57+
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
58+
<fileNamePattern>logs/archived/redis-connect-pipeline-${PROCESS_ID}.%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
59+
<!-- each archived file, size max 10MB -->
60+
<maxFileSize>10MB</maxFileSize>
61+
<!-- total size of all archive files, if total size > 20GB, it will delete old archived file -->
62+
<totalSizeCap>20GB</totalSizeCap>
63+
<!-- 60 days to keep -->
64+
<maxHistory>60</maxHistory>
65+
</rollingPolicy>
66+
<encoder>
67+
<pattern>%d %p %c{1} [%t] %m%n</pattern>
68+
</encoder>
69+
</appender>
5270
<appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
5371
<encoder>
5472
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
@@ -57,23 +75,27 @@
5775

5876
<logger name="redis-connect-heartbeat" level="INFO" additivity="false">
5977
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
60-
<appender-ref ref="CONSOLE" />
78+
<appender-ref ref="CONSOLE"/>
6179
</logger>
6280
<logger name="redis-connect-manager" level="INFO" additivity="false">
6381
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
64-
<appender-ref ref="CONSOLE" />
82+
<appender-ref ref="CONSOLE"/>
83+
</logger>
84+
<logger name="redis-connect-pipeline" level="INFO" additivity="false">
85+
<appender-ref ref="REDIS_CONNECT_PIPELINE"/>
86+
<appender-ref ref="CONSOLE"/>
6587
</logger>
6688
<logger name="redis-connect" level="INFO" additivity="false">
6789
<appender-ref ref="REDIS_CONNECT"/>
68-
<appender-ref ref="CONSOLE" />
90+
<appender-ref ref="CONSOLE"/>
6991
</logger>
7092
<logger name="io.netty" level="OFF" additivity="false">
7193
<appender-ref ref="REDIS_CONNECT"/>
72-
<appender-ref ref="CONSOLE" />
94+
<appender-ref ref="CONSOLE"/>
7395
</logger>
7496
<logger name="io.lettuce" level="OFF" additivity="false">
7597
<appender-ref ref="REDIS_CONNECT"/>
76-
<appender-ref ref="CONSOLE" />
98+
<appender-ref ref="CONSOLE"/>
7799
</logger>
78100
<logger name="com.zaxxer" level="OFF" additivity="false">
79101
<appender-ref ref="REDIS_CONNECT"/>
@@ -101,13 +123,14 @@
101123
</logger>
102124
<logger name="Validator" level="OFF" additivity="false"/>
103125
<logger name="_org.springframework.web.servlet.HandlerMapping" level="OFF" additivity="false"/>
104-
<logger name="com.redis.connect.cluster.RedisConnectSpringBootApplication" level="OFF" additivity="false"/>
126+
<logger name="com.redis.connect.cluster.rest.RedisConnectSpringBootApplication" level="OFF" additivity="false"/>
105127
<logger name="reactor.util" level="OFF" additivity="false"/>
106128

107129
<root>
108130
<appender-ref ref="REDIS_CONNECT"/>
109131
<appender-ref ref="REDIS_CONNECT_MANAGER"/>
132+
<appender-ref ref="REDIS_CONNECT_PIPELINE"/>
110133
<appender-ref ref="REDIS_CONNECT_HEARTBEAT"/>
111134
</root>
112135

113-
</configuration>
136+
</configuration>
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
jobmanager.username=
22
jobmanager.password=
3-
redis.truststore.password=
4-
redis.keystore.password=
3+
mail.smtp.username=
4+
mail.smtp.password=
5+
truststore.password=
6+
keystore.password=
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
target.username=
22
target.password=
3-
redis.truststore.password=
4-
redis.keystore.password=
3+
truststore.password=
4+
keystore.password=
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
apiVersion: 1
2+
3+
datasources:
4+
- name: JobManager
5+
type: redis-datasource
6+
url: redis://<REDIS_DB_ENDPOINT>:<REDIS_DB_PORT>
7+
jsonData:
8+
client: standalone
9+
poolSize: 5
10+
timeout: 10
11+
pingInterval: 0
12+
pipelineWindow: 0
13+
acl: true
14+
user: <REDIS_DB_USERNAME>
15+
editable: true
16+
secureJsonData:
17+
password: <REDIS_DB_PASSWORD>
18+
access: proxy
19+
orgId: 1
20+
isDefault: false
21+
version: 1
22+
- name: Target
23+
type: redis-datasource
24+
url: redis://<REDIS_DB_ENDPOINT>:<REDIS_DB_PORT>
25+
jsonData:
26+
client: standalone
27+
poolSize: 5
28+
timeout: 10
29+
pingInterval: 0
30+
pipelineWindow: 0
31+
acl: true
32+
user: <REDIS_DB_USERNAME>
33+
editable: true
34+
secureJsonData:
35+
password: <REDIS_DB_PASSWORD>
36+
access: proxy
37+
orgId: 1
38+
isDefault: false
39+
version: 1
40+
# - name: Prometheus
41+
# type: prometheus
42+
# url: http://localhost:9090
43+
# access: proxy
44+
# isDefault: false
45+
# editable: true
46+
# version: 1
47+
# orgId: 1
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
startDelaySeconds: 0
2+
ssl: false
3+
lowercaseOutputName: false
4+
lowercaseOutputLabelNames: false
5+
rules:
6+
- pattern : "kafka.connect<type=connect-worker-metrics>([^:]+):"
7+
name: "kafka_connect_worker_metrics_$1"
8+
- pattern : "kafka.connect<type=connect-metrics, client-id=([^:]+)><>([^:]+)"
9+
name: "kafka_connect_metrics_$2"
10+
labels:
11+
client: "$1"
12+
- pattern: "debezium.([^:]+)<type=connector-metrics, context=([^,]+), server=([^,]+), key=([^>]+)><>RowsScanned"
13+
name: "debezium_metrics_RowsScanned"
14+
labels:
15+
plugin: "$1"
16+
name: "$3"
17+
context: "$2"
18+
table: "$4"
19+
- pattern: "debezium.([^:]+)<type=connector-metrics, context=([^,]+), server=([^>]+)>([^:]+)"
20+
name: "debezium_metrics_$4"
21+
labels:
22+
plugin: "$1"
23+
name: "$3"
24+
context: "$2"

0 commit comments

Comments
 (0)