From d135f78a03e72c3072e9498a500d3d9f91a6c941 Mon Sep 17 00:00:00 2001 From: leila Date: Thu, 10 Nov 2022 14:27:16 -0500 Subject: [AAI] AAI logstructure and aai resources healthcheck enhancement AAI Traversal logging structure enhancement and image update AAI Graphadmin logging structure and image update AAI Resources logging structure and image update AAI Resources healthcheck based on cassandra DB healthcheck AAI Resources latency metrics configurations AAI Images updated with 1.10.1 Correct link for honolulu release note file Issue-ID: AAI-3606 Signed-off-by: leila Change-Id: I0aa21a463a85bff0407df6c6793baba53d1da3b1 --- docs/release_notes/release-notes-honolulu.rst | 2 +- .../resources/config/localhost-access-logback.xml | 36 +- .../aai-graphadmin/resources/config/logback.xml | 1802 +++++++++++--------- .../aai/components/aai-graphadmin/values.yaml | 14 +- .../resources/config/aaiconfig.properties | 13 + .../resources/config/application.properties | 1 - .../resources/config/localhost-access-logback.xml | 38 +- .../aai-resources/resources/config/logback.xml | 568 +++--- .../aai-resources/templates/deployment.yaml | 22 +- .../aai/components/aai-resources/values.yaml | 14 +- .../resources/config/localhost-access-logback.xml | 39 +- .../aai-traversal/resources/config/logback.xml | 555 +++--- .../aai/components/aai-traversal/values.yaml | 14 +- 13 files changed, 1838 insertions(+), 1280 deletions(-) diff --git a/docs/release_notes/release-notes-honolulu.rst b/docs/release_notes/release-notes-honolulu.rst index bf91a44a3e..86ba9be3c0 100644 --- a/docs/release_notes/release-notes-honolulu.rst +++ b/docs/release_notes/release-notes-honolulu.rst @@ -135,7 +135,7 @@ Known Vulnerabilities Workarounds ----------- -- ``_ +- ``_ Workaround is to generate a password with "short" strength or pregenerate passwords without single quote in it. Default deployment is using "short" password generation for mariadb. diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml index 449ea3032c..8e1bf21c95 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/localhost-access-logback.xml @@ -19,20 +19,36 @@ ============LICENSE_END========================================================= */}} --> - + - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} - - + + + + + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + + + + + - %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access" - + - - - WARN - - ${logDirectory}/dataGrooming/error.log - - ${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dataGrooming/debug.log - - ${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dataGrooming/audit.log - - ${logDirectory}/dataGrooming/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - - WARN - - ${logDirectory}/dataSnapshot/error.log - - ${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dataSnapshot/debug.log - - ${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dataSnapshot/audit.log - - ${logDirectory}/dataSnapshot/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - - WARN - - ${logDirectory}/historyTruncate/error.log - - ${logDirectory}/historyTruncate/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/historyTruncate/debug.log - - ${logDirectory}/historyTruncate/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/historyTruncate/audit.log - - ${logDirectory}/historyTruncate/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - - WARN - - ${logDirectory}/createDBSchema/error.log - - ${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd} - - - ${"errorPattern"} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/createDBSchema/debug.log - - ${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/createDBSchema/metrics.log - - ${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd} - - - ${metricPattern} - - - - - - - WARN - - ${logDirectory}/misc/error.log - - ${logDirectory}/misc/error.log.%d{yyyy-MM-dd} - - - ${"errorPattern"} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/misc/debug.log - - ${logDirectory}/misc/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/misc/audit.log - - ${logDirectory}/misc/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dupetool/debug.log - - ${logDirectory}/dupetool/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - WARN - ACCEPT - DENY - - ${logDirectory}/dupeTool/error.log - - ${logDirectory}/dupeTool/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - - - WARN - - ${logDirectory}/dynamicPayloadGenerator/error.log - - ${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dynamicPayloadGenerator/debug.log - - ${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dataExport/audit.log - - ${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/forceDelete/debug.log - - ${logDirectory}/forceDelete/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - WARN - ACCEPT - DENY - - ${logDirectory}/forceDelete/error.log - - ${logDirectory}/forceDelete/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/migration/debug.log - - ${logDirectory}/migration/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - WARN - ACCEPT - DENY - - ${logDirectory}/migration/error.log - - ${logDirectory}/migration/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - - - WARN - - ${logDirectory}/dataExport/error.log - - ${logDirectory}/dataExport/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dataExport/debug.log - - ${logDirectory}/dataExport/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dataExport/audit.log - - ${logDirectory}/dataExport/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/schemaMod/debug.log - - ${logDirectory}/schemaMod/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - WARN - ACCEPT - DENY - - ${logDirectory}/schemaMod/error.log - - ${logDirectory}/schemaMod/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/uniquePropertyCheck/debug.log - - ${logDirectory}/uniquePropertyCheck/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/uniquePropertyCheck/metrics.log - - ${logDirectory}/uniquePropertyCheck/metrics.log.%d{yyyy-MM-dd} - - - ${metricPattern} - - - - - WARN - ACCEPT - DENY - - ${logDirectory}/uniquePropertyCheck/error.log - - ${logDirectory}/uniquePropertyCheck/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - - - WARN - - ${logDirectory}/dynamicPayloadGenerator/error.log - - ${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd} - - - ${errorPattern} - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dynamicPayloadGenerator/debug.log - - ${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dataExport/audit.log - - ${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd} - - - ${auditPattern} - - - + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + + WARN + + ${logDirectory}/dataGrooming/error.log + + ${logDirectory}/dataGrooming/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataGrooming/debug.log + + ${logDirectory}/dataGrooming/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataGrooming/audit.log + + ${logDirectory}/dataGrooming/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + + WARN + + ${logDirectory}/dataSnapshot/error.log + + ${logDirectory}/dataSnapshot/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataSnapshot/debug.log + + ${logDirectory}/dataSnapshot/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataSnapshot/audit.log + + ${logDirectory}/dataSnapshot/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + + WARN + + ${logDirectory}/historyTruncate/error.log + + ${logDirectory}/historyTruncate/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/historyTruncate/debug.log + + ${logDirectory}/historyTruncate/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/historyTruncate/audit.log + + ${logDirectory}/historyTruncate/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + + WARN + + ${logDirectory}/createDBSchema/error.log + + ${logDirectory}/createDBSchema/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${"errorPattern"} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/createDBSchema/debug.log + + ${logDirectory}/createDBSchema/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/createDBSchema/metrics.log + + ${logDirectory}/createDBSchema/metrics.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${metricPattern} + + + + + + + WARN + + ${logDirectory}/misc/error.log + + ${logDirectory}/misc/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${"errorPattern"} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/misc/debug.log + + ${logDirectory}/misc/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/misc/audit.log + + ${logDirectory}/misc/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dupetool/debug.log + + ${logDirectory}/dupetool/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + WARN + ACCEPT + DENY + + ${logDirectory}/dupeTool/error.log + + ${logDirectory}/dupeTool/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + + + WARN + + ${logDirectory}/dynamicPayloadGenerator/error.log + + ${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dynamicPayloadGenerator/debug.log + + ${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataExport/audit.log + + ${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/forceDelete/debug.log + + ${logDirectory}/forceDelete/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + WARN + ACCEPT + DENY + + ${logDirectory}/forceDelete/error.log + + ${logDirectory}/forceDelete/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/migration/debug.log + + ${logDirectory}/migration/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + WARN + ACCEPT + DENY + + ${logDirectory}/migration/error.log + + ${logDirectory}/migration/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + + + WARN + + ${logDirectory}/dataExport/error.log + + ${logDirectory}/dataExport/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dataExport/debug.log + + ${logDirectory}/dataExport/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataExport/audit.log + + ${logDirectory}/dataExport/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/schemaMod/debug.log + + ${logDirectory}/schemaMod/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + WARN + ACCEPT + DENY + + ${logDirectory}/schemaMod/error.log + + ${logDirectory}/schemaMod/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/uniquePropertyCheck/debug.log + + ${logDirectory}/uniquePropertyCheck/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/uniquePropertyCheck/metrics.log + + ${logDirectory}/uniquePropertyCheck/metrics.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${metricPattern} + + + + + WARN + ACCEPT + DENY + + ${logDirectory}/uniquePropertyCheck/error.log + + ${logDirectory}/uniquePropertyCheck/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + + + WARN + + ${logDirectory}/dynamicPayloadGenerator/error.log + + ${logDirectory}/dynamicPayloadGenerator/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dynamicPayloadGenerator/debug.log + + ${logDirectory}/dynamicPayloadGenerator/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dataExport/audit.log + + ${logDirectory}/dynamicPayloadGenerator/audit.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + + - - + + + + + + @@ -780,161 +911,262 @@ - - - ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log - - ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip - 1 - 9 - - - 5MB - - - auditPattern - - - - - ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log - - ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip - 1 - 9 - - - 5MB - - - "%d [%thread] %-5level %logger{1024} - %msg%n" - - - - - DEBUG - - ${logDirectory}/auth/auth.log - - ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} - - - %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n - - - - 1000 - true - - + + + + + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.log + + ${logDirectory}/perf-audit/Audit-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip + 1 + 9 + + + 5MB + + + auditPattern + + + + + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.log + + ${logDirectory}/perf-audit/Perform-${lrmRVer}-${lrmRO}-${Pid}.%i.log.zip + 1 + 9 + + + 5MB + + + "%d [%thread] %-5level %logger{1024} - %msg%n" + + + + + DEBUG + + ${logDirectory}/auth/auth.log + + ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n + + + + ${queueSize} + true + + + + + - + + + + + + - + + + + + + - + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + - + + + + + - - - + + + + + + + - - - + + + + + + + - - - + + + + + + + + - - - + + + + + + + - - - + + + + + + + + - - + + + + + + + - - - + + + + + + + + - - - + + + + + + + + - - - + + + + + + + - - + + + + + + + - - + + + + + + + - - + + + + + + + - - - + + + + + + + + + + + + + @@ -944,13 +1176,21 @@ - - - + + + + + + + - + + + + + diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml index d56a1e2417..656c6e06d5 100644 --- a/kubernetes/aai/components/aai-graphadmin/values.yaml +++ b/kubernetes/aai/components/aai-graphadmin/values.yaml @@ -144,7 +144,7 @@ certInitializer: chown -R {{ .Values.user_id }}:{{ .Values.group_id }} {{ .Values.credsPath }} # application image -image: onap/aai-graphadmin:1.9.5 +image: onap/aai-graphadmin:1.10.1 pullPolicy: Always restartPolicy: Always flavor: small @@ -269,6 +269,18 @@ persistence: mountSubPath: aai/aai-graphadmin mountSubPath1: aai/migration +# To make logback capping values configurable +logback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 6GB + queueSize: 1000 + +accessLogback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 6GB + resources: small: limits: diff --git a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties index 2e6fd25c2b..a569b5366b 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties @@ -97,3 +97,16 @@ aai.bulkconsumer.payloadlimit={{ .Values.config.bulk.limit }} #uncomment and use header X-OverrideLimit with the value to override the bulk api limit aai.bulkconsumer.payloadoverride={{ .Values.config.bulk.override }} + +# +# AAI Graph DB checker task +# + +# Indicator to enable or disable scheduled task (true/false) +aai.graph.checker.task.enabled=true + +# Delay, in seconds, before the scheduled task is started, if enabled +aai.graph.checker.task.delay=5 + +# Period, in seconds, between two consecutive executions of the scheduled task, if enabled +aai.graph.checker.task.period=10 \ No newline at end of file diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties index 3f33d71373..95e5a45909 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/application.properties +++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties @@ -120,4 +120,3 @@ management.metrics.distribution.sla[http.server.requests]=20ms, 30ms, 40ms, 50ms management.metrics.tags.group_id=aai #It is not advisable to use labels to store dimensions with high cardinality. Enable this option only for debug purposes. For more information: https://github.com/micrometer-metrics/micrometer/issues/1584 scrape.uri.metrics=false - diff --git a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml index f5829a1dac..5ddd293658 100644 --- a/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-resources/resources/config/localhost-access-logback.xml @@ -26,18 +26,38 @@ */}} - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} - - + + + + + + + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd}.zip + + ${maxHistory} + ${totalSizeCap} + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + + + + + - %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access" - + + + {{/* @@ -302,45 +364,73 @@ - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + - - - - - - + + + + + + + - - + + + + + + - + \ No newline at end of file diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml index b5e89aa585..33aa97179e 100644 --- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml +++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml @@ -203,14 +203,32 @@ spec: # so K8s doesn't restart unresponsive container {{- if .Values.liveness.enabled }} livenessProbe: - tcpSocket: + httpGet: + path: /aai/util/echo?action=checkDB port: {{ .Values.service.internalPort }} + scheme: HTTP{{ (eq "true" (include "common.needTLS" .)) | ternary "S" "" }} + httpHeaders: + - name: X-FromAppId + value: LivenessCheck + - name: X-TransactionId + value: LiveCheck_TID + - name: Accept + value: application/json initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} {{- end }} readinessProbe: - tcpSocket: + httpGet: + path: /aai/util/echo?action=checkDB port: {{ .Values.service.internalPort }} + scheme: HTTP{{ (eq "true" (include "common.needTLS" .)) | ternary "S" "" }} + httpHeaders: + - name: X-FromAppId + value: ReadinessCheck + - name: X-TransactionId + value: ReadinessCheck_TID + - name: Accept + value: application/json initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} resources: {{ include "common.resources" . | nindent 12 }} diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml index df884428a7..eec1269abb 100644 --- a/kubernetes/aai/components/aai-resources/values.yaml +++ b/kubernetes/aai/components/aai-resources/values.yaml @@ -157,7 +157,7 @@ certInitializer: chown -R 1000 {{ .Values.credsPath }} # application image -image: onap/aai-resources:1.9.5 +image: onap/aai-resources:1.10.1 pullPolicy: Always restartPolicy: Always flavor: small @@ -335,3 +335,15 @@ serviceAccount: log: path: /var/log/onap logConfigMapNamePrefix: '{{ include "common.fullname" . }}' + +# To make logback capping values configurable +logback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 1GB + queueSize: 1000 + +accessLogback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 1GB diff --git a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml index b801a7ae5f..1d32a521a1 100644 --- a/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml +++ b/kubernetes/aai/components/aai-traversal/resources/config/localhost-access-logback.xml @@ -19,20 +19,39 @@ limitations under the License. ============LICENSE_END========================================================= --> -*/}} +*/}} + - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log - - ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} - - + + + + + + + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log + + ${AJSC_HOME}/logs/ajsc-jetty/localhost_access.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + + + + + + + - %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D + %a %u %z [%t] "%m %U%q" %s %b %y %i{X-TransactionId} %i{X-FromAppId} %i{X-Forwarded-For} %i{X-AAI-SSL-Client-CN} %i{X-AAI-SSL-Client-OU} %i{X-AAI-SSL-Client-O} %i{X-AAI-SSL-Client-L} %i{X-AAI-SSL-Client-ST} %i{X-AAI-SSL-Client-C} %i{X-AAI-SSL-Client-NotBefore} %i{X-AAI-SSL-Client-NotAfter} %i{X-AAI-SSL-Client-DN} %D - "logType": "access" - -{{/* -*/}} +*/}} + - + + + + + + @@ -54,216 +60,259 @@ - - - - %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx} - - - - - - ${logDirectory}/rest/sane.log - - ${logDirectory}/rest/sane.log.%d{yyyy-MM-dd} - - - %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n - - - - - - 1000 - true - - - - ${logDirectory}/rest/metrics.log - - ${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd} - - - ${metricPattern} - - - - - 1000 - true - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/rest/debug.log - - ${logDirectory}/rest/debug.log.%d{yyyy-MM-dd} - - - ${debugPattern} - - - - - 1000 - - true - - - ${logDirectory}/rest/error.log - - ${logDirectory}/rest/error.log.%d{yyyy-MM-dd} - - - WARN - - - ${errorPattern} - - - - - 1000 - - - - ${logDirectory}/rest/audit.log - - ${logDirectory}/rest/audit.log.%d{yyyy-MM-dd} - - - - ${auditPattern} - - - - - 1000 - true - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/rest/translog.log - - ${logDirectory}/rest/translog.log.%d{yyyy-MM-dd} - - - - ${transLogPattern} + + + + timestamp + + + context + ServerIPAddress + EntryTimestamp + InvokeTimestamp + ErrorCode + ErrorDesc + + + exception + + ^sun\.reflect\..*\.invoke + ^net\.sf\.cglib\.proxy\.MethodProxy\.invoke + true + + + thread + + logger + 36 + + + + {"logType":"app"} + + - - 1000 - true - - + + + + ${logDirectory}/rest/sane.log + + ${logDirectory}/rest/sane.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n + + + + + ${queueSize} + true + + + + ${logDirectory}/rest/metrics.log + + ${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${metricPattern} + + + + ${queueSize} + true + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/rest/debug.log + + ${logDirectory}/rest/debug.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + ${queueSize} + + true + + + ${logDirectory}/rest/error.log + + ${logDirectory}/rest/error.log.%d{yyyy-MM-dd} + ${maxHistory} + ${totalSizeCap} + + + WARN + + + ${errorPattern} + + + + ${queueSize} + + + + ${logDirectory}/rest/audit.log + + ${logDirectory}/rest/audit.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + ${queueSize} + true + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/rest/translog.log + + ${logDirectory}/rest/translog.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${transLogPattern} + + + + ${queueSize} + true + + + + + WARN + + ${logDirectory}/dmaapAAIEventConsumer/error.log + + ${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${errorPattern} + + + + + DEBUG + ACCEPT + DENY + + ${logDirectory}/dmaapAAIEventConsumer/debug.log + + ${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log + + ${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${auditPattern} + + + + + INFO + ACCEPT + DENY + + ${logDirectory}/dmaapAAIEventConsumer/metrics.log + + ${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${metricPattern} + + + + + WARN + + ${logDirectory}/external/external.log + + ${logDirectory}/external/external.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + ${debugPattern} + + + + + DEBUG + + ${logDirectory}/auth/auth.log + + ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} + + ${maxHistory} + ${totalSizeCap} + + + %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n + + + + ${queueSize} + true + + + + - - - WARN - - ${logDirectory}/dmaapAAIEventConsumer/error.log - - ${logDirectory}/dmaapAAIEventConsumer/error.log.%d{yyyy-MM-dd} - - - - ${errorPattern} - - - - - - - DEBUG - ACCEPT - DENY - - ${logDirectory}/dmaapAAIEventConsumer/debug.log - - ${logDirectory}/dmaapAAIEventConsumer/debug.log.%d{yyyy-MM-dd} - - - - ${debugPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log - - ${logDirectory}/dmaapAAIEventConsumer/dmaap-transaction.log.%d{yyyy-MM-dd} - - - - ${auditPattern} - - - - - INFO - ACCEPT - DENY - - ${logDirectory}/dmaapAAIEventConsumer/metrics.log - - ${logDirectory}/dmaapAAIEventConsumer/metrics.log.%d{yyyy-MM-dd} - - - - ${metricPattern} - - - - - WARN - - ${logDirectory}/external/external.log - - ${logDirectory}/external/external.log.%d{yyyy-MM-dd} - - - - ${debugPattern} - - - - - DEBUG - - ${logDirectory}/auth/auth.log - - ${logDirectory}/auth/auth.log.%d{yyyy-MM-dd} - - - - %d{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}[%thread] %-5level %logger{1024} - %msg%n - - - - 1000 - true - - - @@ -284,45 +333,103 @@ - - + + + + + + + - + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + - - + + + + + + + + + - + + + + + - - + + + + + + + - + + + + + + - + + + + + \ No newline at end of file diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml index f6ed17a16b..7e38dcff70 100644 --- a/kubernetes/aai/components/aai-traversal/values.yaml +++ b/kubernetes/aai/components/aai-traversal/values.yaml @@ -140,7 +140,7 @@ certInitializer: chown -R 1000 {{ .Values.credsPath }} # application image -image: onap/aai-traversal:1.9.5 +image: onap/aai-traversal:1.10.1 pullPolicy: Always restartPolicy: Always flavor: small @@ -267,6 +267,18 @@ service: ingress: enabled: false +# To make logback capping values configurable +logback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 6GB + queueSize: 1000 + +accessLogback: + logToFileEnabled: true + maxHistory: 7 + totalSizeCap: 6GB + # Configure resource requests and limits # ref: http://kubernetes.io/docs/user-guide/compute-resources/ resources: -- cgit 1.2.3-korg