summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--kubernetes/aaf/components/aaf-cert-service/values.yaml2
m---------kubernetes/aai0
-rwxr-xr-xkubernetes/onap/values.yaml3
-rw-r--r--kubernetes/sdnc/resources/config/log/org.ops4j.pax.logging.cfg107
4 files changed, 51 insertions, 61 deletions
diff --git a/kubernetes/aaf/components/aaf-cert-service/values.yaml b/kubernetes/aaf/components/aaf-cert-service/values.yaml
index 17b0b758cd..ad4b7c459b 100644
--- a/kubernetes/aaf/components/aaf-cert-service/values.yaml
+++ b/kubernetes/aaf/components/aaf-cert-service/values.yaml
@@ -47,7 +47,7 @@ service:
# Deployment configuration
repository: nexus3.onap.org:10001
-image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.0.0
+image: onap/org.onap.aaf.certservice.aaf-certservice-api:1.1.0
pullPolicy: Always
replicaCount: 1
diff --git a/kubernetes/aai b/kubernetes/aai
-Subproject 2aba1f4b1c872ddf429f4635b982b3e15ecc4aa
+Subproject e77bd83639f77e68f4c7df9b35c95a4d70e7038
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index e48e3c6853..8a94369d39 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -113,7 +113,7 @@ global:
cmpv2Enabled: true
aaf:
certServiceClient:
- image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.0.0
+ image: onap/org.onap.aaf.certservice.aaf-certservice-client:1.1.0
secret:
name: aaf-cert-service-client-tls-secret
mountPath: /etc/onap/aaf/certservice/certs/
@@ -127,6 +127,7 @@ global:
# Client configuration related
caName: "RA"
requestURL: "https://aaf-cert-service:8443/v1/certificate/"
+ outputType: "P12"
requestTimeout: "20000"
keystorePath: "/etc/onap/aaf/certservice/certs/certServiceClient-keystore.jks"
keystorePassword: "secret"
diff --git a/kubernetes/sdnc/resources/config/log/org.ops4j.pax.logging.cfg b/kubernetes/sdnc/resources/config/log/org.ops4j.pax.logging.cfg
index 46c5db0ea9..a2daef1833 100644
--- a/kubernetes/sdnc/resources/config/log/org.ops4j.pax.logging.cfg
+++ b/kubernetes/sdnc/resources/config/log/org.ops4j.pax.logging.cfg
@@ -16,13 +16,11 @@
# limitations under the License.
#
################################################################################
-
# Properties used as default values in MDC
log4j2.property.ServiceName = INTERNAL
log4j2.property.ErrorCode = 900
log4j2.property.ErrorDesc = UnknownError
-
# Common properties
maxFileSize=100MB
maxBackupIndex=20
@@ -30,11 +28,14 @@ logDir=/var/log/onap
componentName=sdnc
logDirectory=${logDir}/${componentName}
karafLogName=karaf
-errorLogName=error
-metricsLogName=metrics
auditLogName=audit
debugLogName=debug
+errorLogName=error
+metricsLogName=metric
+requestResponseLogName=request-response
+securityLogName=security
+log4j2.rootLogger.level = INFO
log4j2.rootLogger.appenderRef.KarafFile.ref = KarafFile
log4j2.rootLogger.appenderRef.PaxOsgi.ref = PaxOsgi
log4j2.rootLogger.appenderRef.Console.ref = Console
@@ -48,14 +49,7 @@ log4j2.bundle.info = %X{bundle.id} - %.50X{bundle.name} - %X{bundle.version}
# \\R matches any new line character, any new line character will replaced with space (stripped)
log4j2.pattern = %d{ISO8601} | %-5p | %-16t | %-32c{1} | ${log4j2.bundle.info} | %X{currentGraph} - %X{nodeId} | %replace{%m}{\\R}{ }%n
-# Security audit logger
-log4j2.logger.audit.name = org.apache.karaf.jaas.modules.audit
-log4j2.logger.audit.level = INFO
-log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRef.AuditRollingFile.ref = AuditRollingFile
-
# Appenders configuration
-
# Console appender not used by default (see log4j2.rootLogger.appenderRefs)
log4j2.appender.console.type = Console
log4j2.appender.console.name = Console
@@ -70,8 +64,8 @@ log4j2.appender.osgi.filter = *
# KarafFile appender
log4j2.appender.karaf.type = RollingRandomAccessFile
log4j2.appender.karaf.name = KarafFile
-log4j2.appender.karaf.fileName = ${logDirectory}/log/karaf.log
-log4j2.appender.karaf.filePattern = ${logDirectory}/log/karaf.log.%i
+log4j2.appender.karaf.fileName = ${logDirectory}/${karafLogName}.log
+log4j2.appender.karaf.filePattern = ${logDirectory}/${karafLogName}.log.%i
# uncomment to not force a disk flush
#log4j2.appender.karaf.immediateFlush = false
log4j2.appender.karaf.append = true
@@ -83,28 +77,12 @@ log4j2.appender.karaf.policies.size.size = ${maxFileSize}
log4j2.appender.karaf.strategy.type = DefaultRolloverStrategy
log4j2.appender.karaf.strategy.max = ${maxBackupIndex}
log4j2.appender.karaf.strategy.fileIndex = min
-# Routing appender (log4j sift)
-log4j2.appender.routing.type = Routing
-log4j2.appender.routing.name = Routing
-log4j2.appender.routing.routes.type = Routes
-log4j2.appender.routing.routes.pattern = \$\$\\\{ctx:bundle.name\}
-log4j2.appender.routing.routes.bundle.type = Route
-log4j2.appender.routing.routes.bundle.appender.type = RollingRandomAccessFile
-log4j2.appender.routing.routes.bundle.appender.name = Bundle-\$\\\{ctx:bundle.name\}
-log4j2.appender.routing.routes.bundle.appender.fileName = ${logDirectory}/log/bundle-\$\\\{ctx:bundle.name\}.log
-log4j2.appender.routing.routes.bundle.appender.filePattern= ${logDirectory}/log/bundle-\$\\\{ctx:bundle.name\}.log.%i
-log4j2.appender.routing.routes.bundle.appender.append = true
-log4j2.appender.routing.routes.bundle.appender.layout.type = PatternLayout
-log4j2.appender.routing.routes.bundle.appender.layout.pattern = ${log4j2.pattern}
-log4j2.appender.routing.routes.bundle.appender.policies.type = Policies
-log4j2.appender.routing.routes.bundle.appender.policies.size.type = SizeBasedTriggeringPolicy
-log4j2.appender.routing.routes.bundle.appender.policies.size.size = ${maxFileSize}
#ecomp logging standards
log4j2.appender.debug.type = RollingRandomAccessFile
log4j2.appender.debug.name = DebugFile
-log4j2.appender.debug.fileName = <%= @logDir %>/debug.log
-log4j2.appender.debug.filePattern = <%= @logDir %>/debug.log.%i
+log4j2.appender.debug.fileName = ${logDirectory}/${debugLogName}.log
+log4j2.appender.debug.filePattern = ${logDirectory}/${debugLogName}.log.%i
# uncomment to not force a disk flush
#log4j2.appender.debug.immediateFlush = false
log4j2.appender.debug.append = true
@@ -117,11 +95,10 @@ log4j2.appender.debug.strategy.type = DefaultRolloverStrategy
log4j2.appender.debug.strategy.max = ${maxBackupIndex}
log4j2.appender.debug.strategy.fileIndex = min
-
log4j2.appender.error.type = RollingRandomAccessFile
log4j2.appender.error.name = ErrorFile
-log4j2.appender.error.fileName = <%= @logDir %>/error.log
-log4j2.appender.error.filePattern = <%= @logDir %>/error.log.%i
+log4j2.appender.error.fileName = ${logDirectory}/${errorLogName}.log
+log4j2.appender.error.filePattern = ${logDirectory}/${errorLogName}.log.%i
# uncomment to not force a disk flush
#log4j2.appender.error.immediateFlush = false
log4j2.appender.error.append = true
@@ -138,17 +115,15 @@ log4j2.appender.error.filter.threshold.type = ThresholdFilter
log4j2.appender.error.filter.threshold.level = WARN
log4j2.appender.error.filter.threshold.match = ACCEPT
-
-
log4j2.appender.metric.type = RollingRandomAccessFile
log4j2.appender.metric.name = MetricFile
-log4j2.appender.metric.fileName = <%= @logDir %>/metric.log
-log4j2.appender.metric.filePattern = <%= @logDir %>/metric.log.%i
+log4j2.appender.metric.fileName = ${logDirectory}/${metricsLogName}.log
+log4j2.appender.metric.filePattern = ${logDirectory}/${metricsLogName}.log.%i
# uncomment to not force a disk flush
#log4j2.appender.metric.immediateFlush = false
log4j2.appender.metric.append = true
log4j2.appender.metric.layout.type = PatternLayout
-log4j2.appender.metric.layout.pattern=%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|%p|%X{Severity}|<%= @hostIP %>|%X{ElapsedTime}|<%= @hostFQDN %>|%X{ClientIPAddress}|%C{1}|||%X{TargetElement}|%X{slf4j.marker}|%X|%X{currentGraph} - %X{nodeId}|${log4j2.bundle.info}|%m%n
+log4j2.appender.metric.layout.pattern=%X{InvokeTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|%p|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIPAddress}|%C{1}|||%X{TargetElement}|%X{slf4j.marker}|%X|%X{currentGraph} - %X{nodeId}|${log4j2.bundle.info}|%m%n
log4j2.appender.metric.policies.type = Policies
log4j2.appender.metric.policies.size.type = SizeBasedTriggeringPolicy
log4j2.appender.metric.policies.size.size = ${maxFileSize}
@@ -156,16 +131,15 @@ log4j2.appender.metric.strategy.type = DefaultRolloverStrategy
log4j2.appender.metric.strategy.max = 100
log4j2.appender.metric.strategy.fileIndex = min
-
log4j2.appender.audit.type = RollingRandomAccessFile
log4j2.appender.audit.name = AuditFile
-log4j2.appender.audit.fileName = <%= @logDir %>/audit.log
-log4j2.appender.audit.filePattern = <%= @logDir %>/audit.log.%i
+log4j2.appender.audit.fileName = ${logDirectory}/${auditLogName}.log
+log4j2.appender.audit.filePattern = ${logDirectory}/${auditLogName}.log.%i
# uncomment to not force a disk flush
#log4j2.appender.audit.immediateFlush = false
log4j2.appender.audit.append = true
log4j2.appender.audit.layout.type = PatternLayout
-log4j2.appender.audit.layout.pattern=%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|INFO|%X{Severity}|<%= @hostIP %>|%X{ElapsedTime}|<%= @hostFQDN %>|%X{ClientIPAddress}|%C{1}|%X{AUDIT-Unused}|%X{AUDIT-ProcessKey}|%X{slf4j.marker}|%X|%X{currentGraph} - %X{nodeId}|${log4j2.bundle.info}|%m%n
+log4j2.appender.audit.layout.pattern=%X{EntryTimestamp}|%X{LogTimestamp}|%X{RequestID}|%X{ServiceInstanceID}|%-16.16t|%X{ServerFQDN}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDesc}|%X{InstanceID}|INFO|%X{Severity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{ClientIPAddress}|%C{1}|%X{AUDIT-Unused}|%X{AUDIT-ProcessKey}|%X{slf4j.marker}|%X|%X{currentGraph} - %X{nodeId}|${log4j2.bundle.info}|%m%n
log4j2.appender.audit.policies.type = Policies
log4j2.appender.audit.policies.size.type = SizeBasedTriggeringPolicy
log4j2.appender.audit.policies.size.size = ${maxFileSize}
@@ -173,17 +147,37 @@ log4j2.appender.audit.strategy.type = DefaultRolloverStrategy
log4j2.appender.audit.strategy.max = ${maxBackupIndex}
log4j2.appender.audit.strategy.fileIndex = min
-# Loggers
-
-log4j2.logger.metric.name = org.onap.ccsdk.sli.core.filters.metric
-log4j2.logger.metric.level = INFO
-log4j2.logger.metric.additivity = false
-log4j2.logger.metric.appenderRef.MetricFile.ref = MetricFile
+log4j2.appender.rr.name = RequestResponseFile
+log4j2.appender.rr.type = RollingRandomAccessFile
+log4j2.appender.rr.fileName = ${logDirectory}/${requestResponseLogName}.log
+log4j2.appender.rr.filePattern = ${logDirectory}/${requestResponseLogName}.log.%i
+log4j2.appender.rr.immediateFlush = false
+log4j2.appender.rr.append = true
+log4j2.appender.rr.layout.type = PatternLayout
+log4j2.appender.rr.layout.pattern = %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestID}|%X{PartnerName}|%m%n
+log4j2.appender.rr.policies.type = Policies
+log4j2.appender.rr.policies.size.type = SizeBasedTriggeringPolicy
+log4j2.appender.rr.policies.size.size = 50MB
+log4j2.appender.rr.strategy.type = DefaultRolloverStrategy
+log4j2.appender.rr.strategy.max = 100
+log4j2.appender.rr.strategy.fileIndex = min
+
+log4j2.appender.security.type = RollingRandomAccessFile
+log4j2.appender.security.name = securityRollingFile
+log4j2.appender.security.fileName = ${logDirectory}/${securityLogName}.log
+log4j2.appender.security.filePattern = ${logDirectory}/${securityLogName}.log.%i
+log4j2.appender.security.append = true
+log4j2.appender.security.layout.type = PatternLayout
+log4j2.appender.security.layout.pattern = ${log4j2.pattern}
+log4j2.appender.security.policies.type = Policies
+log4j2.appender.security.policies.size.type = SizeBasedTriggeringPolicy
+log4j2.appender.security.policies.size.size = ${maxFileSize}
-log4j2.logger.metric2.name = org.onap.logging.filter.base.AbstractBaseMetricLogFilter
-log4j2.logger.metric2.level = INFO
-log4j2.logger.metric2.additivity = false
-log4j2.logger.metric2.appenderRef.MetricFile.ref = MetricFile
+# Security audit logger
+log4j2.logger.security.name = org.apache.karaf.jaas.modules.audit
+log4j2.logger.security.level = INFO
+log4j2.logger.security.additivity = false
+log4j2.logger.security.appenderRef.AuditRollingFile.ref = AuditRollingFile
log4j2.logger.audit.name = org.onap.logging.filter.base.AbstractAuditLogFilter
log4j2.logger.audit.level = INFO
@@ -200,12 +194,7 @@ log4j2.logger.metric2.level = INFO
log4j2.logger.metric2.additivity = false
log4j2.logger.metric2.appenderRef.MetricFile.ref = MetricFile
-log4j2.logger.audit.name = org.onap.logging.filter.base.AbstractAuditLogFilter
-log4j2.logger.audit.level = INFO
-log4j2.logger.audit.additivity = false
-log4j2.logger.audit.appenderRef.AuditFile.ref = AuditFile
-
log4j2.logger.rr.name = org.onap.logging.filter.base.PayloadLoggingServletFilter
log4j2.logger.rr.level = INFO
log4j2.logger.rr.additivity = false
-log4j2.logger.rr.appenderRef.RequestResponseFile.ref = RequestResponseFile \ No newline at end of file
+log4j2.logger.rr.appenderRef.RequestResponseFile.ref = RequestResponseFile