Skip to content

Commit 52ec33b

Browse files
committed
Add eureka and jdbc to statics; update databaseUrl and liveDatabaseTemplate in config files; enhance failover settings
1 parent 3438c83 commit 52ec33b

File tree

3 files changed

+26
-6
lines changed

3 files changed

+26
-6
lines changed

deploy/all-cr.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,15 +171,16 @@ data:
171171
- system
172172
statics:
173173
- dubbo
174+
- eureka
174175
- grpc
175176
- httpclient
177+
- jdbc
176178
- jdk
177179
- kafka
178180
- mariadb
179181
- mysql
180182
- mongodb
181183
- nacos
182-
- eureka
183184
- netty
184185
- okhttp
185186
- opengauss
@@ -212,6 +213,7 @@ data:
212213
spacesUrl: /workspaces
213214
spaceUrl: /workspaces/${space_id}/version/${space_version}
214215
serviceUrl: /services/${service_name}/version/${service_version}
216+
databaseUrl: /workspaces/${space_id}/databases/${database_version}
215217
# for multilive-openapi
216218
jdcloud:
217219
accessKey: ${CONFIG_MULTILIVE_ACCESS_KEY:}
@@ -225,6 +227,7 @@ data:
225227
liveSpacesKey: ${CONFIG_NACOS_KEY_LIVE_SPACES:govern-liveSpaces}
226228
liveSpaceKeyTemplate: ${CONFIG_NACOS_KEY_LIVE_SPACE_TEMPLATE:govern-liveSpace-${id}}
227229
liveServiceTemplate: ${CONFIG_NACOS_KEY_LIVE_SERVICE_TEMPLATE:govern-liveService-${name}}
230+
liveDatabaseTemplate: ${CONFIG_NACOS_KEY_LIVE_DATABASE_TEMPLATE:govern-liveDatabase-${id}}
228231
laneSpace:
229232
type: ${CONFIG_LANE_SPACE_API_TYPE:file} # [file,jmsf,nacos]
230233
url: ${CONFIG_LANE_SPACE_API_URL:http://api.jmsf.local:8080/v1}
@@ -290,7 +293,13 @@ data:
290293
flowcontrol:
291294
enabled: ${CONFIG_FLOW_CONTROL_ENABLED:false}
292295
localhost: ${CONFIG_LOCALHOST_ENABLED:false}
293-
virtual: ${CONFIG_VIRTUAL_ENABLED:false}
296+
virtualthread: ${CONFIG_VIRTUAL_THREAD_ENABLED:false}
297+
failover:
298+
enabled: ${CONFIG_FAILOVER_ENABLED:false}
299+
db: ${CONFIG_FAILOVER_DB_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
300+
mq: ${CONFIG_FAILOVER_MQ_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
301+
mongodb: ${CONFIG_FAILOVER_MONGODB_ENABLED:true}
302+
rocketmq: ${CONFIG_FAILOVER_ROCKETMQ_ENABLED:true}
294303
protect:
295304
enabled: ${CONFIG_PROTECT_ENABLED:false}
296305
db: ${CONFIG_PROTECT_DB_ENABLED:${CONFIG_PROTECT_ENABLED:false}}
@@ -341,12 +350,13 @@ data:
341350
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
342351
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${'_lane_'lane}}
343352
topics:
353+
db:
354+
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
344355
live:
345356
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
346357
lane:
347358
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
348359
router:
349-
virtual: ${CONFIG_VIRTUAL_SIZE:500}
350360
spring:
351361
discovery:
352362
disables: ${CONFIG_SPRING_DISCOVERY_DISABLES}

deploy/joylive-injector/config/config.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,16 @@ agent:
3434
- system
3535
statics:
3636
- dubbo
37+
- eureka
3738
- grpc
3839
- httpclient
40+
- jdbc
3941
- jdk
4042
- kafka
4143
- mariadb
4244
- mysql
4345
- mongodb
4446
- nacos
45-
- eureka
4647
- netty
4748
- okhttp
4849
- opengauss
@@ -75,6 +76,7 @@ agent:
7576
spacesUrl: /workspaces
7677
spaceUrl: /workspaces/${space_id}/version/${space_version}
7778
serviceUrl: /services/${service_name}/version/${service_version}
79+
databaseUrl: /workspaces/${space_id}/databases/${database_version}
7880
# for multilive-openapi
7981
jdcloud:
8082
accessKey: ${CONFIG_MULTILIVE_ACCESS_KEY:{{ .Values.agent.sync.liveSpace.jdcloud.accessKey }}}
@@ -88,6 +90,7 @@ agent:
8890
liveSpacesKey: ${CONFIG_NACOS_KEY_LIVE_SPACES:govern-liveSpaces}
8991
liveSpaceKeyTemplate: ${CONFIG_NACOS_KEY_LIVE_SPACE_TEMPLATE:govern-liveSpace-${id}}
9092
liveServiceTemplate: ${CONFIG_NACOS_KEY_LIVE_SERVICE_TEMPLATE:govern-liveService-${name}}
93+
liveDatabaseTemplate: ${CONFIG_NACOS_KEY_LIVE_DATABASE_TEMPLATE:govern-liveDatabase-${id}}
9194
laneSpace:
9295
type: ${CONFIG_LANE_SPACE_API_TYPE:{{ .Values.agent.sync.lane.type }}} # [file,jmsf,nacos]
9396
url: ${CONFIG_LANE_SPACE_API_URL:{{ .Values.agent.sync.lane.url }}}
@@ -153,7 +156,13 @@ agent:
153156
flowcontrol:
154157
enabled: ${CONFIG_FLOW_CONTROL_ENABLED:{{ .Values.agent.switch.flowcontrol }}}
155158
localhost: ${CONFIG_LOCALHOST_ENABLED:false}
156-
virtual: ${CONFIG_VIRTUAL_ENABLED:false}
159+
virtualthread: ${CONFIG_VIRTUAL_THREAD_ENABLED:false}
160+
failover:
161+
enabled: ${CONFIG_FAILOVER_ENABLED:false}
162+
db: ${CONFIG_FAILOVER_DB_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
163+
mq: ${CONFIG_FAILOVER_MQ_ENABLED:${CONFIG_FAILOVER_ENABLED:false}}
164+
mongodb: ${CONFIG_FAILOVER_MONGODB_ENABLED:true}
165+
rocketmq: ${CONFIG_FAILOVER_ROCKETMQ_ENABLED:true}
157166
protect:
158167
enabled: ${CONFIG_PROTECT_ENABLED:false}
159168
db: ${CONFIG_PROTECT_DB_ENABLED:${CONFIG_PROTECT_ENABLED:false}}
@@ -204,12 +213,13 @@ agent:
204213
laneMode: ${CONFIG_LANE_MQ_MODE:SHARED}
205214
groupExpression: ${CONFIG_MQ_GROUP_EXPRESSION:${group}${'_lane_'lane}}
206215
topics:
216+
db:
217+
accessMode: ${CONFIG_DB_ACCESS_MODE:READ_WRITE}
207218
live:
208219
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
209220
lane:
210221
fallbackLocationIfNoSpace: ${CONFIG_FALLBACK_LOCATION_IF_NO_SPACE:false}
211222
router:
212-
virtual: ${CONFIG_VIRTUAL_SIZE:500}
213223
spring:
214224
discovery:
215225
disables: ${CONFIG_SPRING_DISCOVERY_DISABLES}
110 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)