[SDC] Reduce sdc-be log noise

- set log level for `org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler` to `WARN`
- disable the sdc-be DmaapProducer since dmaap is not part of the ONAP deployment anymore
- update sdc-workflow-designer image (1.12.0 -> 1.13.2)

Issue-ID: SDC-4731
Change-Id: Id2d3d2073726ac8c6f3144474f7a76abe24cd5ee
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/configuration.yaml b/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/configuration.yaml
index 7f0a674..ae2e2f5 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/configuration.yaml
+++ b/kubernetes/sdc/components/sdc-be/resources/config/catalog-be/configuration.yaml
@@ -1126,7 +1126,7 @@ dmaapConsumerConfiguration:
   aftDme2ClientSslCertAlias: certman
 
 dmaapProducerConfiguration:
-  active: true
+  active: {{ .Values.dmaapProducerConfiguration.active }}
   hosts: {{ .Values.dmaapProducerConfiguration.hosts }}
   consumerGroup: sdc-{{ .Values.chefEnvironment }}-1730226683
   consumerId: sdc-{{ .Values.chefEnvironment }}1-1730226683

diff --git a/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml b/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml
index 1e6146c..59c34b9 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml
+++ b/kubernetes/sdc/components/sdc-be/resources/config/logging/logback.xml
@@ -36,6 +36,7 @@
 
     <logger name="org.janusgraph.graphdb.transaction" level="ERROR" />
     <logger name="org.openecomp.sdc.be.components.impl.CassandraHealthCheck" level="WARN" />
+    <logger name="org.onap.portalsdk.core.onboarding.listener.PortalTimeoutHandler" level="WARN" />
     <!-- STDOUT -->
     <appender class="ch.qos.logback.core.ConsoleAppender" name="STDOUT">
         <encoder>

diff --git a/kubernetes/sdc/components/sdc-be/values.yaml b/kubernetes/sdc/components/sdc-be/values.yaml
index 0da7c9c..2572b23 100644 (file)
--- a/kubernetes/sdc/components/sdc-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-be/values.yaml
@@ -282,6 +282,7 @@ ONBOARDING_BE:
   httpPort: 8081
   httpsPort: 8445
 dmaapProducerConfiguration:
+  active: false
   hosts: olsd004.com:3905
   topic: SDC-FACADE-NOTIF-v1
   serviceName: dmaap.com:3905/events

diff --git a/kubernetes/sdc/components/sdc-cs/values.yaml b/kubernetes/sdc/components/sdc-cs/values.yaml
index 61a38db..e0a7acf 100644 (file)
--- a/kubernetes/sdc/components/sdc-cs/values.yaml
+++ b/kubernetes/sdc/components/sdc-cs/values.yaml
@@ -18,7 +18,7 @@
 #################################################################
 global:
   nodePortPrefix: 302
-  readinessImage: onap/oom/readiness:6.1.2
+  readinessImage: onap/oom/readiness:6.2.0
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
   sdc_cassandra:

diff --git a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
index 7b0dfc4..7fe443b 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer backend
 name: sdc-wfd-be
-version: 13.0.3
+version: 13.0.4
 
 dependencies:
   - name: repositoryGenerator

diff --git a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
index 9830cbb..68e5a94 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/templates/deployment.yaml
@@ -101,6 +101,14 @@ spec:
               secretKeyRef: {name: {{ include "common.release" . }}-sdc-cs-secrets, key: wf_external_user_password}
           - name: SERVER_SSL_ENABLED
             value: "false"
+          - name: TRACING_ENABLED
+            value: "{{ .Values.global.tracing.enabled }}"
+          - name: TRACING_COLLECTOR_BASEURL
+            value: "{{ .Values.global.tracing.collector.baseUrl }}"
+          - name: TRACING_SAMPLING_PROBABILITY
+            value: "{{ .Values.config.tracing.samplingProbability }}"
+          - name: TRACING_SKIP_PATTERN
+            value: "{{ .Values.config.tracing.skipPattern }}"
           resources: {{ include "common.resources" . | nindent 12 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       {{- include "common.imagePullSecrets" . | nindent 6 }}

diff --git a/kubernetes/sdc/components/sdc-wfd-be/values.yaml b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
index c18e096..badc49c 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-be/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-be/values.yaml
@@ -31,13 +31,17 @@ global:
     replicaCount: 3
     clusterName: cassandra
     dataCenter: Pod
+  tracing:
+    enabled: false
+    collector:
+      baseUrl: http://jaeger-collector.istio-config:9411
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-workflow-backend:1.12.0
-configInitImage: onap/sdc-workflow-init:1.12.0
+image: onap/sdc-workflow-backend:1.13.2
+configInitImage: onap/sdc-workflow-init:1.13.2
 pullPolicy: Always
 
 initJob:
@@ -54,6 +58,9 @@ config:
   serverSSLTrustStoreType: jks
   cassandraSSLEnabled: false
   cassandraTrustStorePath: /home/sdc/etc/truststore
+  tracing:
+    samplingProbability: 1.0
+    skipPattern: ""
 
 # environment file
 env:

diff --git a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
index 421443c..339a016 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP Service Design and Creation Workflow Designer frontend
 name: sdc-wfd-fe
-version: 13.0.2
+version: 13.0.3
 
 dependencies:
   - name: repositoryGenerator
@@ -29,4 +29,4 @@ dependencies:
     repository: '@local'
   - name: readinessCheck
     version: ~13.x-0
-    repository: '@local'
\ No newline at end of file
+    repository: '@local'

diff --git a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
index 6d66f32..da98bf1 100644 (file)
--- a/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/components/sdc-wfd-fe/values.yaml
@@ -24,7 +24,7 @@ global:
 # Application configuration defaults.
 #################################################################
 # application image
-image: onap/sdc-workflow-frontend:1.12.0
+image: onap/sdc-workflow-frontend:1.13.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required