You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ig...@apache.org on 2018/03/23 17:08:36 UTC
[camel] branch boot2ga updated: CAMEL-12373: Adjusted to SB2
actuator endpoint property names (endpoints.* => management.endpoint*)
This is an automated email from the ASF dual-hosted git repository.
igarashitm pushed a commit to branch boot2ga
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/boot2ga by this push:
new e387dd0 CAMEL-12373: Adjusted to SB2 actuator endpoint property names (endpoints.* => management.endpoint*)
e387dd0 is described below
commit e387dd09dbb2ec7eefc6615c8ab07ea8b2b2be4f
Author: Tomohisa Igarashi <tm...@gmail.com>
AuthorDate: Fri Mar 23 13:06:03 2018 -0400
CAMEL-12373: Adjusted to SB2 actuator endpoint property names (endpoints.* => management.endpoint*)
---
.../src/main/resources/application.properties | 2 +-
.../cluster-node/src/main/resources/application.properties | 8 ++++----
.../application/src/main/resources/application.properties | 8 ++++----
.../service/src/main/resources/application.properties | 4 ++--
.../src/main/resources/application.properties | 8 ++++----
.../consumer/src/main/resources/application.properties | 4 ++--
.../services/src/main/resources/application.properties | 4 ++--
.../src/main/resources/application.properties | 12 ++++++------
.../src/main/resources/application.properties | 2 +-
.../src/main/resources/application.properties | 4 ++--
.../consumer/src/main/resources/application.properties | 4 ++--
.../service/src/main/resources/application.properties | 4 ++--
12 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/examples/camel-example-rabbitmq/src/main/resources/application.properties b/examples/camel-example-rabbitmq/src/main/resources/application.properties
index e414fc0..cd4dc76 100644
--- a/examples/camel-example-rabbitmq/src/main/resources/application.properties
+++ b/examples/camel-example-rabbitmq/src/main/resources/application.properties
@@ -31,7 +31,7 @@ camel.springboot.name = SampleCamel
# all access to actuator endpoints without security
management.security.enabled = false
# turn on actuator health check
-endpoints.health.enabled = true
+management.endpoint.health.enabled = true
# configure connection to the rabbit mq broker using camel-rabbitmq style
# note you can also configure from Java code, see SampleCamelApplication.java
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
index e5f6c92..52314b2 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
@@ -24,9 +24,9 @@ logging.level.org.apache.camel.impl.cluster = DEBUG
logging.level.org.apache.camel.component.atomix = DEBUG
logging.level.org.apache.camel.examples.cluster = DEBUG
-endpoints.enabled = false
-endpoints.jmx.enabled = false
-endpoints.health.enabled = true
+management.endpoints.enabled-by-default = false
+management.endpoints.jmx.enabled = false
+management.endpoint.health.enabled = true
management.port = -1
@@ -44,4 +44,4 @@ camel.clustered.controller.routes.heartbeat.clustered = false
camel.component.atomix.cluster.service.enabled = true
camel.component.atomix.cluster.service.mode = client
camel.component.atomix.cluster.service.nodes = localhost:8700
-camel.component.atomix.cluster.service.id = ${node.id}
\ No newline at end of file
+camel.component.atomix.cluster.service.id = ${node.id}
diff --git a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
index f10fe56..ae3be62 100644
--- a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
@@ -23,10 +23,10 @@ logging.level.org.apache.camel.health = DEBUG
logging.level.org.apache.camel.impl.health = DEBUG
logging.level.sample.camel = DEBUG
-endpoints.enabled = false
-endpoints.mappings.enabled = true
-endpoints.health.enabled = true
-endpoints.camelhealthchecks.enabled = true
+management.endpoints.enabled-by-default = false
+management.endpoint.mappings.enabled = true
+management.endpoint.health.enabled = true
+management.endpoint.camelhealthchecks.enabled = true
management.security.enabled = false
diff --git a/examples/camel-example-spring-boot-health-checks/service/src/main/resources/application.properties b/examples/camel-example-spring-boot-health-checks/service/src/main/resources/application.properties
index c98dcbf..03aa57e 100644
--- a/examples/camel-example-spring-boot-health-checks/service/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-health-checks/service/src/main/resources/application.properties
@@ -21,5 +21,5 @@ logging.level.org.springframework = INFO
server.port = 8081
-endpoints.enabled = false
-endpoints.health.enabled = true
\ No newline at end of file
+management.endpoints.enabled-by-default = false
+management.endpoint.health.enabled = true
diff --git a/examples/camel-example-spring-boot-master/src/main/resources/application.properties b/examples/camel-example-spring-boot-master/src/main/resources/application.properties
index 6d09642..9f09fb4 100644
--- a/examples/camel-example-spring-boot-master/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-master/src/main/resources/application.properties
@@ -25,9 +25,9 @@ logging.level.org.apache.camel.component.atomix = DEBUG
logging.level.org.apache.camel.component.master = DEBUG
logging.level.org.apache.camel.examples.cluster = DEBUG
-endpoints.enabled = false
-endpoints.jmx.enabled = false
-endpoints.health.enabled = true
+management.endpoints.enabled-by-default = false
+management.endpoints.jmx.enabled = false
+management.endpoint.health.enabled = true
management.port = -1
@@ -39,4 +39,4 @@ camel.springboot.jmx-enabled = false
camel.component.file.cluster.service.enabled = true
camel.component.file.cluster.service.id = ${node.id}
-camel.component.file.cluster.service.root = ${java.io.tmpdir}
\ No newline at end of file
+camel.component.file.cluster.service.root = ${java.io.tmpdir}
diff --git a/examples/camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties b/examples/camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties
index aa92431..9189ced 100644
--- a/examples/camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-servicecall/consumer/src/main/resources/application.properties
@@ -16,8 +16,8 @@
## ---------------------------------------------------------------------------
# Spring Boot
-endpoints.enabled=false
-endpoints.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.enabled=true
# Camel
camel.springboot.main-run-controller=true
diff --git a/examples/camel-example-spring-boot-servicecall/services/src/main/resources/application.properties b/examples/camel-example-spring-boot-servicecall/services/src/main/resources/application.properties
index 093c12d..cc61bad 100644
--- a/examples/camel-example-spring-boot-servicecall/services/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-servicecall/services/src/main/resources/application.properties
@@ -16,8 +16,8 @@
## ---------------------------------------------------------------------------
# Spring Boot
-endpoints.enabled=false
-endpoints.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.enabled=true
# Camel
camel.springboot.main-run-controller=true
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
index c3a7f5b..e19589a 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-supervising-route-controller/src/main/resources/application.properties
@@ -24,17 +24,17 @@ logging.level.org.apache.camel.impl.SupervisingRouteController = DEBUG
logging.level.org.apache.camel.util.backoff = DEBUG
logging.level.sample.camel = DEBUG
-endpoints.enabled = true
-endpoints.jmx.enabled = false
-endpoints.health.enabled = true
+management.endpoints.enabled-by-default = true
+management.endpoints.jmx.enabled = false
+management.endpoint.health.enabled = true
# camel routes is by default enabled
# so you do not have to configure below
-# endpoints.camelroutes.path = /camel/routes
-# endpoints.camelroutes.enabled = true
+# management.endpoint.camelroutes.path = /camel/routes
+# management.endpoint.camelroutes.enabled = true
# turn off read-only so we can stop/start the Camel routes
-endpoints.camelroutes.read-only = false
+management.endpoint.camelroutes.read-only = false
management.security.enabled = false
diff --git a/examples/camel-example-spring-boot-xml/src/main/resources/application.properties b/examples/camel-example-spring-boot-xml/src/main/resources/application.properties
index 75a10de..49a5e9f 100644
--- a/examples/camel-example-spring-boot-xml/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot-xml/src/main/resources/application.properties
@@ -37,7 +37,7 @@ timer.period = 2000
# all access to actuator endpoints without security
management.security.enabled = false
# turn on actuator health check
-endpoints.health.enabled = true
+management.endpoint.health.enabled = true
# to configure logging levels
#logging.level.org.springframework = INFO
diff --git a/examples/camel-example-spring-boot/src/main/resources/application.properties b/examples/camel-example-spring-boot/src/main/resources/application.properties
index 032746e..0260864 100644
--- a/examples/camel-example-spring-boot/src/main/resources/application.properties
+++ b/examples/camel-example-spring-boot/src/main/resources/application.properties
@@ -35,8 +35,8 @@ timer.period = 2000
management.endpoint.health.show-details=always
# allow to obtain basic information about Camel routes (read only mode)
-endpoints.camelroutes.enabled = true
-endpoints.camelroutes.read-only = true
+management.endpoint.camelroutes.enabled = true
+management.endpoint.camelroutes.read-only = true
# to turn off Camel info in: /health/info
#management.info.camel.enabled=false
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties b/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties
index c5d7a0b..e5df334 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/src/main/resources/application.properties
@@ -16,8 +16,8 @@
## ---------------------------------------------------------------------------
# Spring Boot
-endpoints.enabled=false
-endpoints.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.enabled=true
# Spring cloud
spring.cloud.consul.config.enabled=false
diff --git a/examples/camel-example-spring-cloud-servicecall/service/src/main/resources/application.properties b/examples/camel-example-spring-cloud-servicecall/service/src/main/resources/application.properties
index 093c12d..cc61bad 100644
--- a/examples/camel-example-spring-cloud-servicecall/service/src/main/resources/application.properties
+++ b/examples/camel-example-spring-cloud-servicecall/service/src/main/resources/application.properties
@@ -16,8 +16,8 @@
## ---------------------------------------------------------------------------
# Spring Boot
-endpoints.enabled=false
-endpoints.health.enabled=true
+management.endpoints.enabled-by-default=false
+management.endpoint.health.enabled=true
# Camel
camel.springboot.main-run-controller=true
--
To stop receiving notification emails like this one, please contact
igarashitm@apache.org.