BugFix:Unable to log in ND & NDCB

Enable loggers in network-discovery-micro-service and
network-discovery-context-builder

Issue-ID: LOG-879
Issue-ID: SDNC-541

Change-Id: I54fd751d9af1e83c73e7e2d294fd3ea7ea950c27
Signed-off-by: Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com>

3 files changed, 187 insertions, 182 deletions

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/log/logback.xml b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml
index 1f00cbddce..0a4b616453 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/log/logback.xml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/logback.xml
@@ -1,30 +1,31 @@
-<configuration>

-    <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>

-    <property name="p_lvl" value="%level"/>

-    <property name="p_log" value="%logger"/>

-    <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>

-    <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>

-    <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>

-    <!-- tabs -->

-    <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>

-    <property name="p_thr" value="%thread"/>

-    <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>

-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <appender name="FILE" class="ch.qos.logback.core.FileAppender">

-        <file>output.log</file>

-        <encoder>

-            <pattern>${pattern}</pattern>

-        </encoder>

-    </appender>

-    <logger level="INFO" name="org.onap.logging.ref.slf4j" additivity="false">

-        <appender-ref ref="STDOUT" />

-        <appender-ref ref="FILE" />

-    </logger>

-    <root level="INFO">

-        <appender-ref ref="STDOUT" />

-    </root>

-</configuration>

+<configuration >
+    <property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
+    <property name="p_lvl" value="%level"/>
+    <property name="p_log" value="%logger"/>
+    <property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
+    <property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <!-- tabs -->
+    <property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
+    <property name="p_thr" value="%thread"/>
+    <property name="pattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>/opt/app/logs/EELF/output.log</file>
+        <encoder>
+            <pattern>${pattern}</pattern>
+        </encoder>
+    </appender>
+    <logger level="INFO" name="org.onap.logging.ref.slf4j" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </logger>
+    <root level="info">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="FILE" />
+    </root>
+</configuration>
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml
index 1e377b9b1e..3c8606a835 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/configmap.yaml
@@ -1,30 +1,29 @@
-# Copyright © 2018 Amdocs

-#

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file 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.

-#

-

-apiVersion: v1

-kind: ConfigMap

-metadata:

-  name: {{ include "common.fullname" . }}-log

-  namespace: {{ include "common.namespace" . }}

-data:

-{{ tpl (.Files.Glob "resources/config/log/logback.xml").AsConfig . | indent 2 }}

----

-apiVersion: v1

-kind: ConfigMap

-metadata:

-  name: {{ include "common.fullname" . }}-configmap

-  namespace: {{ include "common.namespace" . }}

-data:

-{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}

+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file 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.
+#
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-log
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/logback.xml").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.fullname" . }}-configmap
+  namespace: {{ include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/config/application.properties").AsConfig . | indent 2 }}
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
index 7b955b4286..0f980bb402 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/deployment.yaml
@@ -1,122 +1,127 @@
-# Copyright © 2018 Amdocs

-#

-# Licensed under the Apache License, Version 2.0 (the "License");

-# you may not use this file 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.

-

-apiVersion: extensions/v1beta1

-kind: Deployment

-metadata:

-  name: {{ include "common.fullname" . }}

-  namespace: {{ include "common.namespace" . }}

-  labels:

-    app: {{ include "common.name" . }}

-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}

-    release: {{ .Release.Name }}

-    heritage: {{ .Release.Service }}

-spec:

-  replicas: {{ .Values.replicaCount }}

-  template:

-    metadata:

-      labels:

-        app: {{ include "common.name" . }}

-        release: {{ .Release.Name }}

-    spec:

-      containers:

-        - name: {{ include "common.name" . }}

-          image: "{{ include "common.repository" . }}/{{ .Values.image }}"

-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

-          ports:

-          - containerPort: {{ .Values.service.internalPort }}

-          # disable liveness probe when breakpoints set in debugger

-          # so K8s doesn't restart unresponsive container

-          {{ if .Values.liveness.enabled }}

-          livenessProbe:

-            tcpSocket:

-              port: {{ .Values.service.internalPort }}

-            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}

-            periodSeconds: {{ .Values.liveness.periodSeconds }}

-          {{ end }}

-          readinessProbe:

-            tcpSocket:

-              port: {{ .Values.service.internalPort }}

-            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}

-            periodSeconds: {{ .Values.readiness.periodSeconds }}

-          env:

-          volumeMounts:

-          - mountPath: /etc/localtime

-            name: localtime

-            readOnly: true

-          - name: {{ include "common.fullname" . }}-logs

-            mountPath: /var/log/onap

-          - mountPath: /opt/app/config/logback.xml

-            name: {{ include "common.fullname" . }}-log-conf

-            subPath: logback.xml

-          - mountPath: /opt/app/config/application.properties

-            name: {{ include "common.fullname" . }}-config

-            subPath: application.properties

-            readOnly: true

-          - mountPath: /opt/app/config/auth/client-cert-onap.p12

-            name: {{ include "common.fullname" . }}-auth-secret

-            subPath: client-cert-onap.p12

-            readOnly: true

-          - mountPath: /opt/app/config/auth/tomcat_keystore

-            name: {{ include "common.fullname" . }}-auth-secret

-            subPath: tomcat_keystore

-            readOnly: true

-

-          resources:

-{{ include "common.resources" . | indent 12 }}

-        {{- if .Values.nodeSelector }}

-        nodeSelector:

-{{ toYaml .Values.nodeSelector | indent 10 }}

-        {{- end -}}

-        {{- if .Values.affinity }}

-        affinity:

-{{ toYaml .Values.affinity | indent 10 }}

-        {{- end }}

-

-        # Filebeat sidecar container

-        - name: {{ include "common.name" . }}-filebeat-onap

-          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"

-          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}

-          volumeMounts:

-          - name: {{ include "common.fullname" . }}-filebeat-conf

-            mountPath: /usr/share/filebeat/filebeat.yml

-            subPath: filebeat.yml

-          - name: {{ include "common.fullname" . }}-data-filebeat

-            mountPath: /usr/share/filebeat/data

-          - name: {{ include "common.fullname" . }}-logs

-            mountPath: /var/log/onap

-

-      volumes:

-        - name: localtime

-          hostPath:

-            path: /etc/localtime

-        - name:  {{ include "common.fullname" . }}-logs

-          emptyDir: {}

-        - name: {{ include "common.fullname" . }}-log-conf

-          configMap:

-            name: {{ include "common.fullname" . }}-log

-        - name: {{ include "common.fullname" . }}-config

-          configMap:

-            name: {{ include "common.fullname" . }}-configmap

-        - name: {{ include "common.fullname" . }}-auth-secret

-          secret:

-            secretName: {{ include "common.fullname" . }}-auth

-        - name: {{ include "common.fullname" . }}-filebeat-conf

-          configMap:

-            name: {{ .Release.Name }}-pomba-filebeat-configmap

-        - name: {{ include "common.fullname" . }}-data-filebeat

-          emptyDir: {}

-

-      imagePullSecrets:

-      - name: "{{ include "common.namespace" . }}-docker-registry-key"

+# Copyright © 2018 Amdocs
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file 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.
+
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: {{ include "common.fullname" . }}
+  namespace: {{ include "common.namespace" . }}
+  labels:
+    app: {{ include "common.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  replicas: {{ .Values.replicaCount }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.name" . }}
+        release: {{ .Release.Name }}
+    spec:
+      containers:
+        - name: {{ include "common.name" . }}
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          ports:
+          - containerPort: {{ .Values.service.internalPort }}
+          # disable liveness probe when breakpoints set in debugger
+          # so K8s doesn't restart unresponsive container
+          {{ if .Values.liveness.enabled }}
+          livenessProbe:
+            tcpSocket:
+              port: {{ .Values.service.internalPort }}
+            initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.liveness.periodSeconds }}
+          {{ end }}
+          readinessProbe:
+            tcpSocket:
+              port: {{ .Values.service.internalPort }}
+            initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
+            periodSeconds: {{ .Values.readiness.periodSeconds }}
+          env:
+          volumeMounts:
+          - mountPath: /etc/localtime
+            name: localtime
+            readOnly: true
+          - name: {{ include "common.fullname" . }}-logs
+            mountPath: /opt/app/logs
+            readOnly: false
+          - mountPath: /opt/app/config/logback.xml
+            name: {{ include "common.fullname" . }}-log-conf
+            subPath: logback.xml
+          - mountPath: /opt/app/config/application.properties
+            name: {{ include "common.fullname" . }}-config
+            subPath: application.properties
+            readOnly: true
+          - mountPath: /opt/app/config/auth/client-cert-onap.p12
+            name: {{ include "common.fullname" . }}-auth-secret
+            subPath: client-cert-onap.p12
+            readOnly: true
+          - mountPath: /opt/app/config/auth/tomcat_keystore
+            name: {{ include "common.fullname" . }}-auth-secret
+            subPath: tomcat_keystore
+            readOnly: true
+          - name: {{ include "common.fullname" . }}-logs-eelf
+            mountPath: /opt/app/logs/EELF
+            readOnly: false
+
+          resources:
+{{ include "common.resources" . | indent 12 }}
+        {{- if .Values.nodeSelector }}
+        nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 10 }}
+        {{- end -}}
+        {{- if .Values.affinity }}
+        affinity:
+{{ toYaml .Values.affinity | indent 10 }}
+        {{- end }}
+
+        # Filebeat sidecar container
+        - name: {{ include "common.name" . }}-filebeat-onap
+          image: "{{ .Values.global.loggingRepository }}/{{ .Values.global.loggingImage }}"
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          volumeMounts:
+          - name: {{ include "common.fullname" . }}-filebeat-conf
+            mountPath: /usr/share/filebeat/filebeat.yml
+            subPath: filebeat.yml
+          - name: {{ include "common.fullname" . }}-data-filebeat
+            mountPath: /usr/share/filebeat/data
+          - name: {{ include "common.fullname" . }}-logs
+            mountPath: /opt/app/logs
+
+      volumes:
+        - name: localtime
+          hostPath:
+            path: /etc/localtime
+        - name:  {{ include "common.fullname" . }}-logs
+          emptyDir: {}
+        - name: {{ include "common.fullname" . }}-log-conf
+          configMap:
+            name: {{ include "common.fullname" . }}-log
+        - name: {{ include "common.fullname" . }}-config
+          configMap:
+            name: {{ include "common.fullname" . }}-configmap
+        - name: {{ include "common.fullname" . }}-auth-secret
+          secret:
+            secretName: {{ include "common.fullname" . }}-auth
+        - name: {{ include "common.fullname" . }}-filebeat-conf
+          configMap:
+            name: {{ .Release.Name }}-pomba-filebeat-configmap
+        - name: {{ include "common.fullname" . }}-data-filebeat
+          emptyDir: {}
+        - name:  {{ include "common.fullname" . }}-logs-eelf
+          emptyDir: {}
+      imagePullSecrets:
+      - name: "{{ include "common.namespace" . }}-docker-registry-key"