cherry-pick commits and resolved conflicts

85a58413 · Smitha Manjunath · 98a97a2b · 85a58413
Commit 85a58413 authored 3 years ago by Smitha Manjunath
--- a/provider/register-azure/src/main/resources/application.properties
+++ b/provider/register-azure/src/main/resources/application.properties
@@ -73,7 +73,9 @@ ENVIRONMENT=LOCAL
 SUBSCRIBER_SECRET=395f1b05e95171d7c0dde0b19fd6cf

 management.server.port=8081
-management.endpoints.web.exposure.include=health,info,prometheus
+
+management.endpoints.web.exposure.include=${web_exposure_endpoints:health,info}
+management.metrics.enable.all=${enable_metrics:false}


 # Entitlements cache settings