summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Smokowski <ss835w@att.com>2019-01-12 13:15:45 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-12 13:15:45 +0000
commitefb42bcc116535dad00c23a39fccdc5f9e5c321a (patch)
treeff774fc5adeb29ce08b271f4cd6ce87a934b3c80
parent7963ba28bc1fbd7fb27e3553eefda8ad8ce76f0c (diff)
parent3cccd48a71c73e497df90160450508e505e48d6c (diff)
Merge "Re-enable Actuator for Springboot 2.0"
-rw-r--r--adapters/mso-catalog-db-adapter/src/main/resources/application.yaml8
-rw-r--r--adapters/mso-openstack-adapters/src/main/resources/application.yaml5
-rw-r--r--adapters/mso-requests-db-adapter/src/main/resources/application.yaml8
-rw-r--r--adapters/mso-sdnc-adapter/src/main/resources/application.yaml7
-rw-r--r--adapters/mso-vfc-adapter/src/main/resources/application.yaml7
-rw-r--r--asdc-controller/src/main/resources/application.yaml9
-rw-r--r--bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml8
-rw-r--r--mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml7
8 files changed, 29 insertions, 30 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
index 749a319372..83101c1599 100644
--- a/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-catalog-db-adapter/src/main/resources/application.yaml
@@ -39,17 +39,17 @@ flyway:
outOfOrder: true
validateOnMigrate: false
+#Actuator
management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use.
\ No newline at end of file
diff --git a/adapters/mso-openstack-adapters/src/main/resources/application.yaml b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
index bc3bfba418..8fd6d4279d 100644
--- a/adapters/mso-openstack-adapters/src/main/resources/application.yaml
+++ b/adapters/mso-openstack-adapters/src/main/resources/application.yaml
@@ -34,9 +34,8 @@ management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
diff --git a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
index af99a86e8e..0da782bf00 100644
--- a/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-requests-db-adapter/src/main/resources/application.yaml
@@ -50,16 +50,16 @@ flyway:
user: ${DB_ADMIN_USERNAME}
password: ${DB_ADMIN_PASSWORD}
+#Actuator
management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use. \ No newline at end of file
diff --git a/adapters/mso-sdnc-adapter/src/main/resources/application.yaml b/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
index 6009eff016..9be0a257c9 100644
--- a/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-sdnc-adapter/src/main/resources/application.yaml
@@ -16,15 +16,14 @@ management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use.
org:
onap:
diff --git a/adapters/mso-vfc-adapter/src/main/resources/application.yaml b/adapters/mso-vfc-adapter/src/main/resources/application.yaml
index 8ce0dc96d8..4a500b3a50 100644
--- a/adapters/mso-vfc-adapter/src/main/resources/application.yaml
+++ b/adapters/mso-vfc-adapter/src/main/resources/application.yaml
@@ -27,12 +27,11 @@ management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use. \ No newline at end of file
diff --git a/asdc-controller/src/main/resources/application.yaml b/asdc-controller/src/main/resources/application.yaml
index 4eb3c482d9..e95e85a4f1 100644
--- a/asdc-controller/src/main/resources/application.yaml
+++ b/asdc-controller/src/main/resources/application.yaml
@@ -27,19 +27,18 @@ request:
username: ${DB_USERNAME}
password: ${DB_PASSWORD}
driver-class-name: org.mariadb.jdbc.Driver
-
#Actuator
management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use.
+
diff --git a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
index 2515603e82..203988a1a3 100644
--- a/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
+++ b/bpmn/mso-infrastructure-bpmn/src/main/resources/application.yaml
@@ -23,8 +23,12 @@ camunda:
job-execution:
deployment-aware: true
#Actuator
-management:
- context-path: /manage
+management:
+ endpoints:
+ web:
+ base-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
index 9387d08c84..5b52d33cdd 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/resources/application.yaml
@@ -64,15 +64,14 @@ management:
endpoints:
web:
base-path: /manage
- server:
- servlet:
- context-path: /manage
+ exposure:
+ include: "*"
metrics:
se-global-registry: false
export:
prometheus:
enabled: true # Whether exporting of metrics to Prometheus is enabled.
- step: 1m # Step size (i.e. reporting frequency) to use.
+ step: 1m # Step size (i.e. reporting frequency) to use.
org: