aboutsummaryrefslogtreecommitdiffstats
path: root/aai-resources/ajsc-shared-config
diff options
context:
space:
mode:
authorVenkata Harish K Kajur <vk250x@att.com>2018-01-18 02:25:31 -0500
committerVenkata Harish K Kajur <vk250x@att.com>2018-02-12 15:44:18 -0500
commit4c4412642e40a92bebd26f2966bc72619e16ae79 (patch)
treea9c0c08aa8dd2de651cdaad684155ec4962dd3eb /aai-resources/ajsc-shared-config
parent9c04bb4a324af0857dacc65880c3540dc18d5b89 (diff)
Sync up the latest logging code changes
Issue-ID: AAI-493 Change-Id: I778acf7726b1f9881dee62b128b1fbc457bf7a7e Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
Diffstat (limited to 'aai-resources/ajsc-shared-config')
-rw-r--r--aai-resources/ajsc-shared-config/etc/aft.properties13
-rw-r--r--aai-resources/ajsc-shared-config/etc/csm-config-app.properties185
-rw-r--r--aai-resources/ajsc-shared-config/etc/logback.xml35
3 files changed, 28 insertions, 205 deletions
diff --git a/aai-resources/ajsc-shared-config/etc/aft.properties b/aai-resources/ajsc-shared-config/etc/aft.properties
deleted file mode 100644
index 43e896d..0000000
--- a/aai-resources/ajsc-shared-config/etc/aft.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# Flow test 319
-com.att.aft.discovery.client.environment=AFTUAT
-com.att.aft.discovery.client.latitude=35.318900
-com.att.aft.discovery.client.longitude=-80.762200
-com.att.aft.alias=ecomp-aai
-#com.att.aft.keyStore=ajsc-shared-config/etc/spm2.jks
-com.att.aft.keyStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.keyStorePassword=its4test
-#com.att.aft.trustStore=ajsc-shared-config/etc/spm2.jks
-com.att.aft.trustStore=/opt/app/aai/bundleconfig/etc/m04353t.jks
-com.att.aft.trustStorePassword=its4test
-
diff --git a/aai-resources/ajsc-shared-config/etc/csm-config-app.properties b/aai-resources/ajsc-shared-config/etc/csm-config-app.properties
deleted file mode 100644
index 0aebe00..0000000
--- a/aai-resources/ajsc-shared-config/etc/csm-config-app.properties
+++ /dev/null
@@ -1,185 +0,0 @@
-Global.ExtendedProperty.AuthoritativeServers=${ChangeMe_csm.acfshost}:${ChangeMe_csm.acfsport}
-
-#Possible working server for troubleshooting csm related items (used when testing/using invokeService or invokeAdapter components)
-#Global.ExtendedProperty.AuthoritativeServers=ONAPserverTBD
-#
-# The settings in this file control the behavior of the CSM Framework.
-# The majority of the settings in this file adhere to the following
-# pattern:
-#
-# [EntityType].[EntityId].[PropertyName]=[PropertyValue]
-#
-# Where:
-#
-# [EntityType] Identifies the type of entity (service or
-# service group) that's being configured.
-# [EntityId] Identifies the individual entity.
-# [PropertyName] Identifies the property that is being set.
-# [PropertyValue] Is the actual property value.
-#
-# In the formatting sample above, the EntityType can be setto one of the
-# following values:
-#
-# * 'Service' if an individual service is being configured.
-# * 'Group 'if a service group is being configured.
-#
-# The reference to 'entity' in the above description is intentionally
-# generic. The CSM Framework supports the configuration of individual
-# services as well as groups of services. The type of entity that is
-# actually being configured is determined by the value of the
-# [EntityType] portion of the property.
-#
-# There are two values for [EntityId] that have a special meaning within
-# the CSM Framework:
-#
-#
-# DefaultService - Identifies the default configuration for any service
-# that is not explicitly configured elsewhere in this file.
-#
-# DefaultServiceGroup - This identifies the entity that provides the
-# default configuration for any service group that is not explicitly
-# configured elsewhere in this file.
-#
-# DO NOT use either of these as the identifier for any of your
-# application-specific services or service groups.
-#
-# The CSM Framework treats all entity identifiers in a case-insensitive
-# manner. The entity ids 'Service1' and 'SERVICE1' are equivalant. All
-# properties with the same [EntityId] will be applied to the same
-# configuration. The CSM Framework framework also treats property names
-# in a case-insensitive manner. 'MaxRequestCount' and 'MAXREQUESTCOUNT'
-# are considered equivalent within the CSM framework.
-#
-# The following properties are supported by the CSM Framework. Any
-# properties that are entity-specific will include the '[EntityId].'
-# prefix.
-#
-# [EntityType].[EntityId].Enabled - Indicates if the entity is enabled
-# or disabled by default. The value of this property must be either
-# 'true' or 'false'.
-#
-# [EntityType].[EntityId].MaxRequestCount - The maximum number of
-# requests that can be running at any point in time. Once this limit is
-# reached, the service is considered to be 'flooded', and subsequent
-# requests are refused until the request count drops to the level
-# specified by the RestartThreshold property. Once the restart
-# threshold is reached, the service will be 'restarted' based on the
-# values of the 'RestartFrequency' and 'RestartIncrement' properties.
-# The value of this property must be a numeric value.
-# The default value for this property is 20.
-#
-# [EntityType].[EntityId].MaxStalledRequestCount - the maximum number of
-# 'stalled' requests that are allowed before subsequent requests are
-# refused
-# The value of this property must be a numeric value.
-# The default value for this property is 10.
-#
-# [EntityType].[EntityId].RestartThreshold - the process count level at
-# which requests will be allowed to proceed whenever a service becomes
-# 'flooded'. This property is only used if the total process count
-# reaches the level set by the 'MaxRequestCount' property. Once that
-# occurs, subsequent requests will be refused until the active request
-# count drops to the level specified by this property. Once the active
-# request count drops to the level specified by this property, the
-# service will be 'restarted' based on the values of the
-# 'RestartFrequency' and 'RestartIncrement' properties. To cause the
-# CSM framework to allow subsequent requests to proceed as soon as the
-# active request count drops below level level set by the
-# 'MaxRequestCount' property, just set this property to either -1 or 1
-# less than the value of the 'MaxRequestCount' property.
-# The value of this property must be a numeric value.
-# The default value for this property is -1.
-#
-# [EntityType].[EntityId].RestartIncrement - This property, along with
-# the 'RestartFrequency' property helps determine how quickly the active
-# request count will rise to the 'maximum request count' whenever a
-# service is 'restarted' after becoming 'flooded'. The
-# 'RestartFrequency' property determines how frequenty the permissable
-# number of active requests will be increased. This property determines
-# how much the permissible number of active requests will increase by
-# whenever it is raised. If this property is set to a positive value,
-# then the 'RestartFrequency' property must also be set to a positive
-# value. If this property is set to 0, then the 'RestartFrequency'
-# property must also be set to 0. In other words, either both
-# properties are 0 or both properties are greater than 0. When both
-# properties are set to 0, then the permissable number of active
-# requests immediately rises back up to the maximum request count once
-# it has droppedback down to the 'restart threshold'. When both
-# properties are greater than 0, then the permissable number of active
-# requests gradually rises to the maximum request count.
-# The value of this property must be a numeric value greater than or equal to 0.
-# The default value for this property is 0.
-#
-# [EntityType].[EntityId].RestartFrequency - This property, along with
-# the 'RestartIncrement' property helps determine how quickly the active
-# request count will rise to the 'maximum request count' whenever a
-# service is 'restarted' after becoming 'flooded'. The
-# 'RestartIncrement' property determines how quickly the permissable
-# number of active requests will be increased. This property determines
-# how frequently that increase will occur. If this property is set to
-# a positive value, then the 'RestartIncrement' property must also be
-# set to a positive value. If this property is set to 0, then the
-# 'RestartIncrement' property must also be set to 0. In other words,
-# either both properties are 0 or both properties are greater than 0.
-# When both properties are set to 0, then the permissable number of
-# active requests immediately rises back up to the maximum request count
-# once it has droppedback down to the 'restart threshold'. When both
-# properties are greater than 0, then the permissable number of active
-# requests gradually rises to the maximum request count.
-# The value of this property must be a numeric value greater than or equal to 0.
-# The default value for this property is 0.
-#
-# [EntityType].[EntityId].ServiceGroupId - This property is only
-# relevant for entities that are configured as services (i.e. the
-# [EntityType] portion of the property is set to 'Service'). When the
-# 'ServiceGroupId' property is set to a non-blank value, the behavior of
-# the service is controled by the configuration of the corresponding
-# service group. There is no default value for this property.
-#
-# [EntityType].[EntityId].Timeout - the timeout, in milliseconds, for
-# each process that is controlled by this configuration. Once the
-# duration of a process exceeds this value, the process will be
-# considered to have entered a 'stalled' state. The default value for
-# this property is 10000.
-#
-# FrameworkEnabled: - This is the one property that is not specific to a
-# single entity. This property determines whether the entire CSM
-# Framework is enabled or disabled. When disabled, the CSM Framework
-# does not track any process counts. All requests to access a service
-# are allowed, regardless of the current level of activity. The value
-# of this property must be either 'true' or 'false'.
-#
-
-#
-# Enables the CSM Framework so that it can manage interactions with external
-# services and/or resources. To disable the CSM Framework, simply set
-# this property to false.
-#
-FrameworkEnabled=true
-
-#
-# These are the default settings for any service that is no explicitly configured
-# below. A few things to note about this configuration:
-# 1) The "Enabled" property is not explicitly set. Instead, we are relying
-# on the default value of 'true'.
-# 2) The Timeout and Type properties are also not explicitly set. Again, we
-# are relying on the default values for these properties.
-#
-Service.DefaultService.Enabled=true
-Service.DefaultService.MaxRequestCount=30
-Service.DefaultService.MaxStalledRequestCount=20
-Service.DefaultService.Timeout=30000
-Service.DefaultService.RestartThreshold=-1
-Service.DefaultService.AutoPurgeAfter=150000
-
-
-#
-# These are the default settings for any service group that is referenced in
-# a service configuration but not configured below.
-#
-# Currently CSI does not use any service group configurations!
-#
-#Group.DefaultGroup.MaxRequestCount=-1
-#Group.DefaultGroup.MaxStalledRequestCount=-1
-#Group.DefaultGroup.RestartThreshold=-1
-#Group.DefaultGroup.Timeout=-1
diff --git a/aai-resources/ajsc-shared-config/etc/logback.xml b/aai-resources/ajsc-shared-config/etc/logback.xml
index 5853cea..48fbb3e 100644
--- a/aai-resources/ajsc-shared-config/etc/logback.xml
+++ b/aai-resources/ajsc-shared-config/etc/logback.xml
@@ -26,9 +26,10 @@
<jmxConfigurator />
<property name="logDirectory" value="${AJSC_HOME}/logs" />
<property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
- <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n|\r\n', '^'}%n"/>
+ <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
<property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%X{statusCode}|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
-
+ <!-- <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/> -->
+ <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%X{serviceName}|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<filter class="ch.qos.logback.classic.filter.LevelFilter">
<level>ERROR</level>
@@ -114,7 +115,7 @@
</fileNamePattern>
</rollingPolicy>
<encoder class="org.onap.aai.logging.EcompEncoder">
- <pattern>${eelfLogPattern}</pattern>
+ <pattern>${eelfErrorLogPattern}</pattern>
</encoder>
</appender>
@@ -212,6 +213,26 @@
<pattern>${eelfMetricLogPattern}</pattern>
</encoder>
</appender>
+ <appender name="external"
+ class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <file>${logDirectory}/external/external.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
+ </fileNamePattern>
+ </rollingPolicy>
+ <encoder class="org.onap.aai.logging.EcompEncoder">
+ <pattern>${eelfLogPattern}</pattern>
+ </encoder>
+ </appender>
+ <logger name="org.onap.aai" level="DEBUG" additivity="false">
+ <appender-ref ref="asyncDEBUG" />
+ <appender-ref ref="asyncERROR" />
+ <appender-ref ref="asyncMETRIC" />
+ <appender-ref ref="asyncSANE" />
+ </logger>
<!-- Spring related loggers -->
<logger name="org.springframework" level="WARN" />
@@ -232,6 +253,8 @@
<!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
logging) -->
+ <logger name="org.codehaus.groovy" level="WARN" />
+ <logger name="com.att.scamper" level="WARN" />
<logger name="ajsc.utils" level="WARN" />
<logger name="ajsc.utils.DME2Helper" level="WARN" />
<logger name="ajsc.filters" level="WARN" />
@@ -241,6 +264,7 @@
<logger name="com.att.ajsc" level="WARN" />
<logger name="com.att.ajsc.csi.logging" level="WARN" />
<logger name="com.att.ajsc.filemonitor" level="WARN" />
+ <logger name="com.att.ajsc.runner" level="WARN" />
<!-- Other Loggers that may help troubleshoot -->
<logger name="net.sf" level="WARN" />
@@ -361,9 +385,6 @@
</logger>
<root level="DEBUG">
- <appender-ref ref="asyncDEBUG" />
- <appender-ref ref="asyncERROR" />
- <appender-ref ref="asyncMETRIC" />
- <appender-ref ref="asyncSANE" />
+ <appender-ref ref="external" />
</root>
</configuration>