<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<appender-ref ref="perfLogs" />
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <logger additivity="false" level="DEBUG" name="org.openecomp.aai.interceptors">
+ <logger additivity="false" level="DEBUG" name="org.onap.aai.interceptors">
<appender-ref ref="asynctranslog" />
</logger>
- <logger level="DEBUG" name="org.openecomp.aai.interceptors.PreAaiAjscInterceptor">
+ <logger level="DEBUG" name="org.onap.aai.interceptors.PreAaiAjscInterceptor">
<appender-ref ref="asyncAUDIT" />
</logger>
- <logger level="DEBUG" name="org.openecomp.aai.interceptors.PostAaiAjscInterceptor">
+ <logger level="DEBUG" name="org.onap.aai.interceptors.PostAaiAjscInterceptor">
<appender-ref ref="asyncAUDIT" />
</logger>
- <logger additivity="false" level="DEBUG" name="org.openecomp.aai.dmaap">
+ <logger additivity="false" level="DEBUG" name="org.onap.aai.dmaap">
<appender-ref ref="dmaapAAIEventConsumer" />
<appender-ref ref="dmaapAAIEventConsumerDebug" />
<appender-ref ref="dmaapAAIEventConsumerMetric" />
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
- <encoder class="org.openecomp.aai.logging.EcompEncoder">
+ <encoder class="org.onap.aai.logging.EcompEncoder">
<pattern>${pattern}</pattern>
</encoder>
</appender>
<appender-ref ref="perfLogs" />
</logger>
<!-- logback jms appenders & loggers definition ends here -->
- <logger additivity="false" level="DEBUG" name="org.openecomp.aai.interceptors">
+ <logger additivity="false" level="DEBUG" name="org.onap.aai.interceptors">
<appender-ref ref="asynctranslog" />
</logger>
- <logger level="DEBUG" name="org.openecomp.aai.interceptors.PreAaiAjscInterceptor">
+ <logger level="DEBUG" name="org.onap.aai.interceptors.PreAaiAjscInterceptor">
<appender-ref ref="asyncAUDIT" />
</logger>
- <logger level="DEBUG" name="org.openecomp.aai.interceptors.PostAaiAjscInterceptor">
+ <logger level="DEBUG" name="org.onap.aai.interceptors.PostAaiAjscInterceptor">
<appender-ref ref="asyncAUDIT" />
</logger>
- <logger additivity="false" level="DEBUG" name="org.openecomp.aai.dmaap">
+ <logger additivity="false" level="DEBUG" name="org.onap.aai.dmaap">
<appender-ref ref="dmaapAAIEventConsumer" />
<appender-ref ref="dmaapAAIEventConsumerDebug" />
<appender-ref ref="dmaapAAIEventConsumerMetric" />
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-model-loader-logs
emptyDir: {}
- name: aai-model-loader-filebeat
+++ /dev/null
-# Properties for the Data Bus Controller webapp
-dmaap.rest.url.list = http://dcae-collector-dmaapbc:18080/webapi
-# webapp's mechid is sent to DCAE for authorization
-dmaap.mechid.name = m06672@dbcapp.dmaap.dcae.att.com
-# encrypted with CipherUtil
-dmaap.mechid.password = /F1vRhga1Ijw7yRFFj6R5A==
-# Valid access methods are "dao" and "rest"
-profile.access.method = dao
+++ /dev/null
-# login settings
-login_method_backdoor = backdoor
-login_method_attribute_name = login_method
-login_method_csp = csp
-login_method_web_junction = web_junction
-
-#login message
-login.error.hrid.empty = Login failed, please contact system administrator.
-login.error.hrid.not-found = User not found, please contact system administrator.
-login.error.user.inactive = Account is disabled, please contact system administrator.
-
-authentication_mechanism = DBAUTH
-
-user_attribute_name = user
-
-# User Session settings
-roles_attribute_name = roles
-role_functions_attribute_name = role_functions
-
-# POST settings
-post_initial_context_factory = com.sun.jndi.ldap.LdapCtxFactory
-post_provider_url = todo_ldap
-post_security_principal = ou=people,o=org,c=us
-post_max_result_size = 499
-
-# menu settings
-menu_query_name = menuData
-application_menu_set_name = APP
-application_menu_attribute_name = applicationMenuData
-business_direct_menu_set_name = BD
-business_direct_menu_attribute_name = businessDirectMenuData
-
-# Role settings
-sys_admin_role_id = 1
+++ /dev/null
-# Properties read by ECOMP Framework library, ecompFW.jar
-
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
-portal.api.prefix = /api
-max.idle.time = 5
-user.attribute.name = user_attribute
-
-# Legacy property TODO
-ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
-
-# URL of the ECOMP Portal REST API
-ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-
-#Use REST API instead of UEB to fetch the functional menu data
-use_rest_for_functional_menu=true
-
-# Don't fetch functional menu via UEB in 1610.
-ueb_listeners_enable = false
-
-# Application key is used by session management
-ueb_app_key = MtRwsF16RdpHZ7eM
-
-# The inbox name property should not be required when the REST API is used,
-# but in 1610 FuncMenuController logs ALARM if it cannot find this key.
-ecomp_portal_inbox_name = ECOMP-PORTAL-INBOX-TEST
+++ /dev/null
-#Local
-app_display_name = DMaaP Bus Ctlr
-
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/dbca_os
-db.userName = root
-db.password = password
-db.encrypt_flag = false
-db.hib.dialect = org.hibernate.dialect.MySQLDialect
-db.min_pool_size = 5
-db.max_pool_size = 10
-hb.dialect = org.hibernate.dialect.MySQLDialect
-hb.show_sql = false
-hb.db_reconnect = true
-hb.idle_connection_test_period = 3600
-
-# Directory with the Quantum.lic file
-files_path = /opt/app/tomcat/webapps/dmaap-bc-app/WEB-INF/dbcapp
-
-application_user_id = 30000
-post_default_role_id = 16
-clustered = true
-
-#Enable Fusion Mobile capabilities for the application
-mobile_enable = false
-
-# Cache config file is needed on the classpath
-cache_config_file_path = /WEB-INF/classes/cache.ccf
-cache_switch = 199
-cache_load_on_startup = false
-
-user_name = fullName
-decryption_key = AGLDdG4D04BKm2IxIWEr8o==
-
-#element map files
-element_map_file_path = /tmp
-element_map_icon_path = app/fusionapp/icons/
-
-# Quartz is not used by the DBC application
-# log_cron =
-# mylogins_feed_cron =
-# sessiontimeout_feed_cron =
-# my_login_feed_output_dir =
-
-# ECOMP Portal Shared Context REST API URL is not used by the DBC application
-# ecomp_shared_context_rest_url =
-
-contact_us_link = https://todo_contact_us_link
-
-# An Unique 128-bit value defined to identify a specific version
-# of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application
-# which is using the ECOMP SDK at the time of its deployment.
-# Online Unique UUID generator - https://www.uuidgenerator.net/
-# ID generated for DBC to supply to EELF
-# A bogus value is cached in SCM: 12345678-..
-instance_uuid = 12345678-90ab-cdef-1234-567890abcdef
-
-# R Cloud feature
-guard_notebook_url=https://todo_rcloud_link
-
-# Application base URL is a proper prefix of the on-boarded URL.
-app_base_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPDBCAPP/
# domain settings
-#domain_class_location =
+#domain_class_location =
# validator settings
#default_error_message = Default error message
authentication_mechanism =DBAUTH
-login.error.hrid.empty = Login failed, please contact system administrator.
+login.error.hrid.empty = Login failed, please contact system administrator.
login.error.hrid.not-found = User not found, please contact system administrator.
login.error.user.inactive = Account is disabled, please contact system administrator.
#
health_poll_interval_seconds = 5
#
-# If a component is down a log entry will be written that triggers an alert. This parameter specifies how often this alert should be triggered
+# If a component is down a log entry will be written that triggers an alert. This parameter specifies how often this alert should be triggered
# if the component remains down. For example a value of 30, would translate to 30 * 60 seconds = 1800 seconds, or every 30 minutes
#
health_fail_alert_every_x_intervals = 30
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ================================================================================
- eCOMP Portal
- ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property
- ================================================================================
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
+ ============LICENSE_START==========================================
+ ONAP Portal
+ ===================================================================
+ Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ ===================================================================
+
+ Unless otherwise specified, all software contained herein is licensed
+ under the Apache License, Version 2.0 (the “License”);
+ you may not use this software except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
- ================================================================================
+
+ Unless otherwise specified, all documentation contained herein is licensed
+ under the Creative Commons License, Attribution 4.0 Intl. (the “License”);
+ you may not use this documentation except in compliance with the License.
+ You may obtain a copy of the License at
+
+ https://creativecommons.org/licenses/by/4.0/
+
+ Unless required by applicable law or agreed to in writing, documentation
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ ============LICENSE_END============================================
+
+ ECOMP is a trademark and service mark of AT&T Intellectual Property.
-->
<!DOCTYPE xml>
<configuration scan="true" scanPeriod="3 seconds" debug="true">
- <!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory
+ <!-- Log-back files for the ECOMP Portal "ecompportal" are created in directory
${catalina.base}/logs/ecompportal; e.g., apache-tomcat-8.0.35/logs/ecompportal/application.log -->
<!--<jmxConfigurator /> -->
<property name="metricsLogName" value="metrics" />
<property name="auditLogName" value="audit" />
<property name="debugLogName" value="debug" />
- <!-- These loggers are not used in code (yet). <property name="securityLogName"
- value="security" /> <property name="policyLogName" value="policy" /> <property
- name="performanceLogName" value="performance" /> <property name="serverLogName"
+ <!-- These loggers are not used in code (yet). <property name="securityLogName"
+ value="security" /> <property name="policyLogName" value="policy" /> <property
+ name="performanceLogName" value="performance" /> <property name="serverLogName"
value="server" /> -->
<!-- ServerFQDN=Server, -->
<property name="auditLoggerPattern"
value="%X{AuditLogBeginTimestamp}|%X{AuditLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
+
<property name="metricsLoggerPattern"
value="%X{MetricsLogBeginTimestamp}|%X{MetricsLogEndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{Timer}|%X{ServerFQDN}|%X{ClientIPAddress}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{TargetVisualEntity}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| %msg%n" />
-
+
<property name="errorLoggerPattern"
value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ClassName}|%X{AlertSeverity}|%X{ErrorCode}|%X{ErrorDescription}| %msg%n" />
-
+
<property name="defaultLoggerPattern"
value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ClassName}| %msg%n" />
-
+
<!-- use %class so library logging calls yield their class name -->
<property name="applicationLoggerPattern"
value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%class{36}| %msg%n" />
-
- <!--
+
+ <!--
<property name="defaultPattern"
value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
<property name="debugLoggerPattern"
value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Timer}| %msg%n" />
-->
- <!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"
+ <!-- <property name="debugLoggerPattern" value="%date{ISO8601}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}|%X{Timer}|[%caller{3}]|%msg%n"
/> -->
<!-- Example evaluator filter applied against console appender -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- EELF Appenders -->
<!-- ============================================================================ -->
- <!-- The EELFAppender is used to record events to the general application
+ <!-- The EELFAppender is used to record events to the general application
log -->
<appender-ref ref="EELF" />
</appender>
- <!-- EELF Security Appender. This appender is used to record security events
- to the security log file. Security events are separate from other loggers
- in EELF so that security log records can be captured and managed in a secure
- way separate from the other logs. This appender is set to never discard any
+ <!-- EELF Security Appender. This appender is used to record security events
+ to the security log file. Security events are separate from other loggers
+ in EELF so that security log records can be captured and managed in a secure
+ way separate from the other logs. This appender is set to never discard any
events. -->
- <!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern>
- <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
- </appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref
+ <!-- <appender name="EELFSecurity" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDirectory}/${securityLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>${logDirectory}/${securityLogName}.%i.log.zip </fileNamePattern>
+ <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+ </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+ </appender> <appender name="asyncEELFSecurity" class="ch.qos.logback.classic.AsyncAppender">
+ <queueSize>256</queueSize> <discardingThreshold>0</discardingThreshold> <appender-ref
ref="EELFSecurity" /> </appender> -->
- <!-- EELF Performance Appender. This appender is used to record performance
+ <!-- EELF Performance Appender. This appender is used to record performance
records. -->
- <!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>
- <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>
- <pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"
- class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>
+ <!-- <appender name="EELFPerformance" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDirectory}/${performanceLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>${logDirectory}/${performanceLogName}.%i.log.zip </fileNamePattern>
+ <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+ </triggeringPolicy> <encoder> <outputPatternAsHeader>true</outputPatternAsHeader>
+ <pattern>${defaultPattern}</pattern> </encoder> </appender> <appender name="asyncEELFPerformance"
+ class="ch.qos.logback.classic.AsyncAppender"> <queueSize>256</queueSize>
<appender-ref ref="EELFPerformance" /> </appender> -->
- <!-- EELF Server Appender. This appender is used to record Server related
- logging events. The Server logger and appender are specializations of the
- EELF application root logger and appender. This can be used to segregate
- Server events from other components, or it can be eliminated to record these
+ <!-- EELF Server Appender. This appender is used to record Server related
+ logging events. The Server logger and appender are specializations of the
+ EELF application root logger and appender. This can be used to segregate
+ Server events from other components, or it can be eliminated to record these
events as part of the application root log. -->
- <!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern>
- <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
- </appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
+ <!-- <appender name="EELFServer" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDirectory}/${serverLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>${logDirectory}/${serverLogName}.%i.log.zip </fileNamePattern>
+ <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+ </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+ </appender> <appender name="asyncEELFServer" class="ch.qos.logback.classic.AsyncAppender">
<queueSize>256</queueSize> <appender-ref ref="EELFServer" /> </appender> -->
- <!-- EELF Policy Appender. This appender is used to record Policy engine
- related logging events. The Policy logger and appender are specializations
- of the EELF application root logger and appender. This can be used to segregate
- Policy engine events from other components, or it can be eliminated to record
+ <!-- EELF Policy Appender. This appender is used to record Policy engine
+ related logging events. The Policy logger and appender are specializations
+ of the EELF application root logger and appender. This can be used to segregate
+ Policy engine events from other components, or it can be eliminated to record
these events as part of the application root log. -->
- <!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern>
- <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
- </appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
+ <!-- <appender name="EELFPolicy" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <file>${logDirectory}/${policyLogName}.log</file> <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
+ <fileNamePattern>${logDirectory}/${policyLogName}.%i.log.zip </fileNamePattern>
+ <minIndex>1</minIndex> <maxIndex>9</maxIndex> </rollingPolicy> <triggeringPolicy
+ class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy"> <maxFileSize>5MB</maxFileSize>
+ </triggeringPolicy> <encoder> <pattern>${defaultPattern}</pattern> </encoder>
+ </appender> <appender name="asyncEELFPolicy" class="ch.qos.logback.classic.AsyncAppender">
<queueSize>256</queueSize> <appender-ref ref="EELFPolicy" /> </appender> -->
- <!-- EELF Audit Appender. This appender is used to record audit engine related
- logging events. The audit logger and appender are specializations of the
- EELF application root logger and appender. This can be used to segregate
- Policy engine events from other components, or it can be eliminated to record
+ <!-- EELF Audit Appender. This appender is used to record audit engine related
+ logging events. The audit logger and appender are specializations of the
+ EELF application root logger and appender. This can be used to segregate
+ Policy engine events from other components, or it can be eliminated to record
these events as part of the application root log. -->
<appender name="EELFAudit"
<appender-ref ref="asyncEELF" />
</logger>
- <!-- <logger name="com.att.eelf.security" level="info" additivity="false">
- <appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"
- level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"
- /> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">
- <appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"
+ <!-- <logger name="com.att.eelf.security" level="info" additivity="false">
+ <appender-ref ref="asyncEELFSecurity" /> </logger> <logger name="com.att.eelf.perf"
+ level="info" additivity="false"> <appender-ref ref="asyncEELFPerformance"
+ /> </logger> <logger name="com.att.eelf.server" level="info" additivity="false">
+ <appender-ref ref="asyncEELFServer" /> </logger> <logger name="com.att.eelf.policy"
level="info" additivity="false"> <appender-ref ref="asyncEELFPolicy" /> </logger> -->
<logger name="com.att.eelf.audit" level="info" additivity="false">
-portal.api.impl.class = org.openecomp.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl
+# Not used by portal
+portal.api.impl.class = org.onap.portalsdk.core.onboarding.client.OnBoardingApiServiceImpl.not.used.by.portal
portal.api.prefix = /api
max.idle.time = 5
user.attribute.name = user_attribute
ueb_listeners_enable = true
-ueb_app_key = 7GkVcrO6sIDb3ngW
+ueb_app_key = 7GkVcrO6sIDb3ngW
ueb_app_secret = uCYgKjWKK5IxPGNNZzYSSWo9
ueb_app_mailbox_name = ECOMP-PORTAL-INBOX
#mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/portal
+db.driver = org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb:failover://portaldb.onap-portal:3306/portal
db.userName =root
-db.password =password
+db.password =Aa123456
db.hib.dialect = org.hibernate.dialect.MySQLDialect
db.min_pool_size = 5
db.max_pool_size = 10
sessiontimeout_feed_cron = 0 0/5 * * * ? *
#Front end URL
-frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome
+frontend_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/applicationsHome
#cookie domain
cookie_domain = openecomp.org
# An Unqiue 128-bit value defined to indentify a specific version of
# ECOMP Portal deployed on a specific virtual machine.
-# This value must be generated and updated at the time of
+# This value must be generated and updated at the time of
# the deployment.
# Online Unique UUID generator - https://www.uuidgenerator.net/
instance_uuid = 90bc9497-10e6-49fe-916b-dcdfaa972383
#delete auditlog from number of days ago
auditlog_del_day_from = 365
+
+#External system notification URL
+external_system_notification_url= https://jira.onap.org/browse/
login_method_web_junction = web_junction
#login message
-login.error.hrid.empty = Login failed, please contact system administrator.
+login.error.hrid.empty = Login failed, please contact system administrator.
login.error.hrid.not-found = User not found, please contact system administrator.
login.error.user.inactive = Account is disabled, please contact system administrator.
##########################################################################
# Name of java class that implements the OnBoardingApiService interface.
-portal.api.impl.class = org.openecomp.portalapp.service.OnBoardingApiServiceImpl
+# epsdk 1.3 uses org.onap prefix
+portal.api.impl.class = org.onap.portalapp.service.OnBoardingApiServiceImpl
# CSP Global Log On for single sign on
ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm
ecomp_rest_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/auxapi
-# Applications do not need to run a UEB listener in 1610.
+# Applications do not need to run a UEB listener in 1610.
ueb_listeners_enable = false
# UEB Configuration
# The following properties MAY require changes by partner applications.
##########################################################################
-#Mysql
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portaldb.onap-portal:3306/ecomp_sdk
+db.driver = org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb://portaldb.onap-portal:3306/ecomp_sdk
db.userName = root
-db.password = password
+db.password = Aa123456
db.min_pool_size = 5
db.max_pool_size = 10
hb.dialect = org.hibernate.dialect.MySQLDialect
# An Unique 128-bit value defined to identify a specific version
# of an application deployed on a specific virtual machine.
-# This value must be generated and updated by the application
+# This value must be generated and updated by the application
# which is using the ECOMP SDK at the time of its deployment.
# Online Unique UUID generator - https://www.uuidgenerator.net/
instance_uuid=8da691c9-987d-43ed-a358-00ac2f35685d
## App DB Properties
spring.datasource.url=jdbc:mysql://portaldb.onap-portal:3306/portal
spring.datasource.username=root
-spring.datasource.password=password
+spring.datasource.password=Aa123456
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
spring.database.driver.classname=org.mariadb.jdbc.Driver
spring.jpa.show-sql=false
GLOBAL_INJECTED_GERRIT_BRANCH = "master"
GLOBAL_INJECTED_KEYSTONE = "OPENSTACK_KEYSTONE_IP_HERE"
GLOBAL_INJECTED_MR_IP_ADDR = "dmaap.onap-message-router"
-GLOBAL_INJECTED_MSO_IP_ADDR = "mso.onap-mso"
+GLOBAL_INJECTED_SO_IP_ADDR = "mso.onap-mso"
GLOBAL_INJECTED_NETWORK = "OPENSTACK_NETWORK_ID_WITH_ONAP_ROUTE_HERE"
GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001"
GLOBAL_INJECTED_NEXUS_PASSWORD = "docker"
# UUID of the OpenStack"s CentOS 7 cloud VM image
# If your Openstack does not have a CentOS 7 cloud image, you will have to add one.
-centos7image_id: "52d4ea09-cc69-4a9a-9961-938a3282d209"
+centos7image_id: '52d4ea09-cc69-4a9a-9961-938a3282d209'
# UUID of the OpenStack"s Ubuntu 16.04 VM image
# If your Openstack does not have a buntu 16.04 cloud image, you will have to add one.
-ubuntu1604image_id: "97bbe637-5d42-419a-a2c7-beff33ffa23c"
+ubuntu1604image_id: '97bbe637-5d42-419a-a2c7-beff33ffa23c'
# ID of the OpenStack"s VM flavor to be used by DCAEGEN2 VMs (m1.medium/m1.large)
-flavor_id: "4"
+flavor_id: '4'
# UUID of the OpenStack"s security group to be used for DCAEGEN2 VMs
-security_group: "abc0687d-34ab-4d37-8fe8-4b544d94ba71"
+security_group: 'abc0687d-34ab-4d37-8fe8-4b544d94ba71'
# The name of the OpenStack network where public IP addresses and floating IPs are allocated from
# This must use the name and not the UUID. The name must be unique otherwise the installer fails
-public_net: "public"
+public_net: 'public'
# The name of the OpenStack network where private IP addresses are allocated from
-private_net: "onap_oam"
+private_net: 'onap_oam'
# Group header for OpenStack Keystone parameters
openstack:
# User name
- username: "dev"
+ username: 'dev'
# Password
- password: "dev"
+ password: 'dev'
# Name of the OpenStack tenant/project where DCAEGEN2 VMs are deployed
- tenant_name: "dev"
- # Openstack authentication API URL, for example "https://horizon.playground.onap.org:5000/v2.0"
- auth_url: "http://1.2.3.4:5000/v2.0"
- # Name of the OpenStack region where DCAEGEN2 VMs are deployed, for example "RegionOne"
- region: "RegionOne"
+ tenant_name: 'dev'
+ # Openstack authentication API URL, for example 'https://horizon.playground.onap.org:5000/v2.0'
+ auth_url: 'http://1.2.3.4:5000/v2.0'
+ # Name of the OpenStack region where DCAEGEN2 VMs are deployed, for example 'RegionOne'
+ region: 'RegionOne'
# Name of the public key uploaded to OpenStack in the Prepration step
-keypair: "dcae-g2"
+keypair: 'dcae-g2'
# Path to the private key within the conatiner (!! Do not change!!)
-key_filename: "/opt/dcae/key"
+key_filename: '/opt/dcae/key'
# Prefix (location code) of all DCAEGEN2 VMs
-location_prefix: "onapr1"
-# Domain name of the OpenStack tenant "onapr1.playground.onap.org"
-location_domain: "onap-dcaegen2"
-# Location of the raw artifact repo hosting additional boot scripts called by DCAEGEN2 VMs" cloud-init, for example: "https://nexus.onap.org/service/local/repositories/raw/content"
-codesource_url: "https://nexus.onap.org/content/sites/raw"
-# Path to the boot scripts within the raw artifact repo, for example: "org.onap.dcaegen2.deployments.scripts/releases/"
-codesource_version: "org.onap.dcaegen2.deployments/releases/scripts/"
+location_prefix: 'onapr1'
+# Domain name of the OpenStack tenant 'onapr1.playground.onap.org'
+location_domain: 'onap-dcaegen2'
+# Location of the raw artifact repo hosting additional boot scripts called by DCAEGEN2 VMs" cloud-init, for example: 'https://nexus.onap.org/service/local/repositories/raw/content'
+codesource_url: 'https://nexus.onap.org/content/sites/raw'
+# Path to the boot scripts within the raw artifact repo, for example: 'org.onap.dcaegen2.deployments.scripts/releases/'
+codesource_version: 'org.onap.dcaegen2.deployments/releases/scripts/'
nsPrefix: onap
pullPolicy: IfNotPresent
image:
- consul: consul:latest
- discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:latest
- apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:latest
+ consul: consul:0.9.3
+ discovery: nexus3.onap.org:10001/onap/msb/msb_discovery:1.0.0-STAGING-latest
+ apigateway: nexus3.onap.org:10001/onap/msb/msb_apigateway:1.0.0-STAGING-latest
consulPort: 8500
consulNodePort: 30500
-i [INSTANCE] : ONAP deployment instance # (default: 1)
-a [APP] : Specify a specific ONAP component (default: all)
from the following choices:
- sdc, aai ,mso, message-router, robot, vid, aaf
+ sdc, aai ,mso, message-router, robot, vid, aaf, uui
sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
EOF
}
-n [NAMESPACE] : Kubernetes namespace (required)
-a [APP] : Specify a specific ONAP component (default: all)
from the following choices:
- sdc, aai ,mso, message-router, robot, vid, aaf
+ sdc, aai ,mso, message-router, robot, vid, aaf, uui
sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
-N : Do not wait for deletion of namespace and its objects
EOF
#!/bin/bash
# Deploying MSB first and kube2msb last will ensure all the ONAP services can be registered to MSB
-HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'kube2msb' 'aaf' 'vfc')
+HELM_APPS=('consul' 'msb' 'mso' 'message-router' 'sdnc' 'vid' 'robot' 'portal' 'policy' 'appc' 'aai' 'sdc' 'dcaegen2' 'log' 'cli' 'multicloud' 'clamp' 'vnfsdk' 'uui' 'aaf' 'vfc' 'kube2msb')
ONAP_DOCKER_REGISTRY=${ONAP_DOCKER_REGISTRY:-nexus3.onap.org:10001}
ONAP_DOCKER_USER=${ONAP_DOCKER_USER:-docker}
ONAP_DOCKER_PASS=${ONAP_DOCKER_PASS:-docker}
"name": "portalapps-readiness"
},
{
- "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -ppassword -h portaldb < /portal-mysql/oom_updates.sql; fi"],
+ "command": ["/bin/bash", "-c", "if [ ! -e /portal_root/boot.txt ]; then mysql -u root -pAa123456 -h portaldb < /portal-mysql/oom_updates.sql; fi"],
"volumeMounts": [
{
"mountPath": "/portal-mysql/oom_updates.sql",
name: portal-portal-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPPORTAL/WEB-INF/classes/logback.xml"
name: portal-logback
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/fusion/conf/fusion.properties"
- name: dbcapp-fusion-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/conf/system.properties"
- name: dbcapp-system-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/classes/portal.properties"
- name: dbcapp-portal-properties
- - mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPDBCAPP/WEB-INF/dbcapp/dbcapp.properties"
- name: dbcapp-dbcapp-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/conf/system.properties"
name: sdkapp-system-properties
- mountPath: "{{ .Values.onapPortal.webappsDir }}/ECOMPSDKAPP/WEB-INF/classes/portal.properties"
name: portaldb
spec:
containers:
- - image: {{ .Values.image.portaldb}}
+ - image: {{ .Values.image.portaldb}}
imagePullPolicy: {{ .Values.pullPolicy }}
name: "portaldb"
env:
- name: MYSQL_HOST
value: "portaldb.{{ .Values.nsPrefix }}-portal"
- name: MYSQL_ROOT_PASSWORD
- value: password
+ value: Aa123456
volumeMounts:
- mountPath: /etc/localtime
name: localtime
nodePortPrefix: 302
image:
readiness: oomk8s/readiness-check:1.0.0
- portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.1-STAGING-latest
- portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.1-STAGING-latest
+ portalapps: nexus3.onap.org:10001/openecomp/portal-apps:1.3-STAGING-latest
+ portaldb: nexus3.onap.org:10001/openecomp/portal-db:1.3-STAGING-latest
mariadbClient: oomk8s/mariadb-client-init:1.0.0
- portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.1-STAGING-latest
+ portalwms: nexus3.onap.org:10001/openecomp/portal-wms:1.3-STAGING-latest
ubuntuInit: oomk8s/ubuntu-init:1.0.0
ubuntuDesktop: dorowu/ubuntu-desktop-lxde-vnc
filebeat: docker.elastic.co/beats/filebeat:5.5.0
--- /dev/null
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: uui
+version: 1.1.0
--- /dev/null
+apiVersion: v1
+kind: Service
+metadata:
+ labels:
+ app: uui
+ name: uui
+ namespace: "{{ .Values.nsPrefix }}-uui"
+spec:
+ ports:
+ - name: uui
+ nodePort: {{ .Values.uuiPortPrefix }}98
+ port: 8080
+ selector:
+ app: uui
+ type: NodePort
--- /dev/null
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+ labels:
+ app: uui
+ name: uui
+ namespace: "{{ .Values.nsPrefix }}-uui"
+spec:
+ selector:
+ matchLabels:
+ app: uui
+ template:
+ metadata:
+ labels:
+ app: uui
+ name: uui
+ spec:
+ containers:
+ - image: {{ .Values.image.uuiImage }}:{{ .Values.image.uuiVersion }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ command:
+ - /bin/bash
+ - -c
+ - /home/uui/tomcat/bin/catalina.sh run
+ name: uui
+ ports:
+ - containerPort: 8080
+ readinessProbe:
+ tcpSocket:
+ port: 8080
+ initialDelaySeconds: 5
+ periodSeconds: 10
+ imagePullSecrets:
+ - name: "{{ .Values.nsPrefix }}-docker-registry-key"
--- /dev/null
+nsPrefix: onap
+pullPolicy: Always
+uuiPortPrefix: 302
+image:
+ uuiImage: nexus3.onap.org:10001/onap/usecase-ui
+ uuiVersion: latest
"port": "{{.Values.catalog.port}}",
"visualRange":"1"
}
- ]
+ ]'
spec:
ports:
- name: vfc-catalog
Code Review / oom.git / commitdiff