From a641fa5b0d67622ded12e74236f725df429c4dee Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 23 Aug 2021 18:03:31 -0500 Subject: Add prometheus + https in https server configs Issue-ID: POLICY-3553 Signed-off-by: jhh Change-Id: I9d5d36e35b69a7f47efd2cc4b2abfdd0ba8f2192 --- .../src/main/feature/config/feature-healthcheck.properties | 8 ++++---- packages/install/src/files/base.conf | 8 ++++++++ policy-management/src/main/server/config/engine.properties | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties index 70a010cd..7739c6e7 100644 --- a/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties +++ b/feature-healthcheck/src/main/feature/config/feature-healthcheck.properties @@ -24,8 +24,8 @@ http.server.services.HEALTHCHECK.port=6969 http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck http.server.services.HEALTHCHECK.managed=false http.server.services.HEALTHCHECK.swagger=true -http.server.services.HEALTHCHECK.userName=${env:HEALTHCHECK_USER} -http.server.services.HEALTHCHECK.password=${env:HEALTHCHECK_PASSWORD} -http.server.services.HEALTHCHECK.https=true -http.server.services.HEALTHCHECK.aaf=${env:AAF} +http.server.services.HEALTHCHECK.userName=${envd:HEALTHCHECK_USER} +http.server.services.HEALTHCHECK.password=${envd:HEALTHCHECK_PASSWORD} +http.server.services.HEALTHCHECK.https=${envd:HTTP_SERVER_HTTPS:false} +http.server.services.HEALTHCHECK.aaf=${envd:AAF:false} http.server.services.HEALTHCHECK.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf index bf9b72ea..aac21256 100644 --- a/packages/install/src/files/base.conf +++ b/packages/install/src/files/base.conf @@ -81,6 +81,14 @@ AAF_NAMESPACE=org.onap.policy AAF_HOST=aaf-onap-test.osaaf.org CADI_KEYFILE=/opt/app/policy/config/aaf-cadi.keyfile +# Prometheus + +PROMETHEUS=false + +# HTTP Servers https enabled + +HTTP_SERVER_HTTPS=false + # PDP-D DMaaP configuration channel PDPD_CONFIGURATION_TOPIC=PDPD-CONFIGURATION diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties index 85a24f08..89a749c9 100644 --- a/policy-management/src/main/server/config/engine.properties +++ b/policy-management/src/main/server/config/engine.properties @@ -29,8 +29,9 @@ http.server.services.CONFIG.password=${envd:TELEMETRY_PASSWORD} http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful http.server.services.CONFIG.managed=false http.server.services.CONFIG.swagger=true -http.server.services.CONFIG.https=false +http.server.services.CONFIG.https=${envd:HTTP_SERVER_HTTPS:false} http.server.services.CONFIG.aaf=${envd:AAF:false} +http.server.services.CONFIG.prometheus=${envd:PROMETHEUS:true} http.server.services.CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler aaf.namespace=${envd:AAF_NAMESPACE:false} -- cgit 1.2.3-korg