From 16a9fce0e104a38371a9e5a567ec611ae3fc7f33 Mon Sep 17 00:00:00 2001 From: ys9693 Date: Sun, 19 Jan 2020 13:50:02 +0200 Subject: Catalog alignment Issue-ID: SDC-2724 Signed-off-by: ys9693 Change-Id: I52b4aacb58cbd432ca0e1ff7ff1f7dd52099c6fe --- .../src/main/resources/config/configuration.yaml | 19 +- catalog-fe/src/main/resources/config/logback.xml | 247 +++++++++++---------- .../resources/config/plugins-configuration.yaml | 23 ++ catalog-fe/src/main/resources/portal.properties | 8 +- catalog-fe/src/main/resources/scripts/install.sh | 4 - 5 files changed, 170 insertions(+), 131 deletions(-) create mode 100644 catalog-fe/src/main/resources/config/plugins-configuration.yaml (limited to 'catalog-fe/src/main/resources') diff --git a/catalog-fe/src/main/resources/config/configuration.yaml b/catalog-fe/src/main/resources/config/configuration.yaml index d1156da771..2eff183e1a 100644 --- a/catalog-fe/src/main/resources/config/configuration.yaml +++ b/catalog-fe/src/main/resources/config/configuration.yaml @@ -22,6 +22,14 @@ threadpoolSize: 50 # request processing timeout (seconds) requestTimeout: 10 +# catalog ms (the host-port values need to be changed once it is deployed) +catalogFacadeMs: + protocol: http + host: 192.168.33.10 + port: 8282 + healthCheckUri: "/healthCheck" + path: "/uicache" + # Determines the health check read timeout when invoking health check towards the LB (or BE whatever is configured): healthCheckSocketTimeoutInMs: 5000 healthCheckIntervalInSeconds: 5 @@ -71,6 +79,13 @@ optionalHeaderFields: - &HTTP_CSP_EMAIL HTTP_CSP_EMAIL - &csp-email csp-email +# access restriction +authCookie: + cookieName: "AuthenticationCookie" + path: / + domain: "" + securityKey: "AGLDdG4D04BKm2IxIWEr8o==" + version: 1.0 released: 2012-11-30 @@ -90,11 +105,9 @@ systemMonitoring: isProxy: true probeIntervalInSeconds: 15 -kibanaHost: localhost -kibanaPort: 5601 -kibanaProtocol: http healthStatusExclude: - DE - ES - DMAAP + - DMAAP_PRODUCER diff --git a/catalog-fe/src/main/resources/config/logback.xml b/catalog-fe/src/main/resources/config/logback.xml index d1e1c613d1..d7c9c7e527 100644 --- a/catalog-fe/src/main/resources/config/logback.xml +++ b/catalog-fe/src/main/resources/config/logback.xml @@ -1,125 +1,130 @@ - - - - - - - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - - - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log - - - - - INFO - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log - - - - - - - e.level.toInt() <= DEBUG.toInt() - - - DENY - NEUTRAL - - - - ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i - - 1 - 10 - - - - 20MB - - - ${default-log-pattern} - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i + + 1 + 10 + + + + 20MB + + + + ${all-log-pattern} + + + + + + + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log + + + + + + e.level.toInt() <= INFO.toInt() + + + DENY + ACCEPT + + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log.%i + + 1 + 10 + + + + 20MB + + + + ${debug-log-pattern} + + + + + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log + + + + WARN + + + + ${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log.%i + + 1 + 10 + + + + 20MB + + + + ${error-log-pattern} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/catalog-fe/src/main/resources/config/plugins-configuration.yaml b/catalog-fe/src/main/resources/config/plugins-configuration.yaml new file mode 100644 index 0000000000..eb36945715 --- /dev/null +++ b/catalog-fe/src/main/resources/config/plugins-configuration.yaml @@ -0,0 +1,23 @@ +pluginsList: + - pluginId: DCAE + pluginDiscoveryUrl: http://localhost:8702/dcae + pluginSourceUrl: http://localhost:8702/dcae + pluginStateUrl: "dcae" + pluginDisplayOptions: + context: + displayName: "Monitor" + displayContext: ["VF", "SERVICE"] + displayRoles: ["DESIGNER"] + - pluginId: WORKFLOW + pluginDiscoveryUrl: http://localhost:9527/ + pluginSourceUrl: http://localhost:9527/ + pluginStateUrl: "workflowDesigner" + pluginDisplayOptions: + top: + displayName: "WORKFLOW" + context: + displayName: "Workflow Designer" + displayContext: ["VF", "SERVICE"] + displayRoles: ["DESIGNER", "TESTER"] + +connectionTimeout: 1000 \ No newline at end of file diff --git a/catalog-fe/src/main/resources/portal.properties b/catalog-fe/src/main/resources/portal.properties index a146d6ef0c..d1b6d3a44e 100644 --- a/catalog-fe/src/main/resources/portal.properties +++ b/catalog-fe/src/main/resources/portal.properties @@ -5,8 +5,8 @@ ecomp_rest_url = https://ecomp.homer.att.com/ecompportal/auxapi portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl # CSP-SSO URL -# ecomp_redirect_url = https://www.e-access.att.com/ecomp_portal_ist/ecompportal/process_csp -ecomp_redirect_url = http://127.0.0.1:8989/ECOMPPORTAL/login.htm +ecomp_redirect_url = https://www.e-access.att.com/ecomp_portal_qa/ecompportal/process_csp +#ecomp_redirect_url = http://127.0.0.1:8989/ECOMPPORTAL/login.htm # Cookie set by CSP-SSO csp_cookie_name = attESSec @@ -26,4 +26,6 @@ ueb_app_mailbox_name = app_topic_name_here # Consumer group name; most Apps should use {UUID} ueb_app_consumer_group_name = {UUID} -decryption_key = AGLDdG4D04BKm2IxIWEr8o== \ No newline at end of file +decryption_key = AGLDdG4D04BKm2IxIWEr8o== + +portal_cookie_name = EPService \ No newline at end of file diff --git a/catalog-fe/src/main/resources/scripts/install.sh b/catalog-fe/src/main/resources/scripts/install.sh index bed9411795..48f9a36001 100644 --- a/catalog-fe/src/main/resources/scripts/install.sh +++ b/catalog-fe/src/main/resources/scripts/install.sh @@ -48,10 +48,6 @@ exitOnError $? "copy_jvm_properties" ./scripts/updateSslParams.sh ${JETTY_BASE} exitOnError $? "updateSslParams_script" - -#ONLY FOR BE -#cp /opt/app/sdc/config/catalog-${COMP}/elasticsearch.yml config -#exitOnError $? "copy_elasticsearch_yaml_to_config" mkdir -p ${JETTY_BASE}/config/catalog-${COMP} cp -r /opt/app/sdc/config/catalog-${COMP}/*.xml ${JETTY_BASE}/config/catalog-${COMP} -- cgit 1.2.3-korg