From 9a05dd22aaaf1182b7e27cbcbf57e4eb0f0ff9e9 Mon Sep 17 00:00:00 2001
From: marcinrzepeckiwroc <marcin.rzepecki@nokia.com>
Date: Tue, 11 Aug 2020 11:24:13 +0200
Subject: Change logging method for DeploymentHandler (from local log files to
 stdio)

Issue-ID: DCAEGEN2-2370
Signed-off-by: marcinrzepeckiwroc <marcin.rzepecki@nokia.com>
Change-Id: Ia3b861832155001f025bef32bfd8298d201e4eff
---
 .../resources/log4js/log4js.json                   | 32 ++++++++++++++++++++++
 .../templates/configmap.yaml                       | 11 +++++++-
 .../templates/deployment.yaml                      |  7 +++++
 3 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json
 mode change 100644 => 100755 kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
 mode change 100644 => 100755 kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml

diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json
new file mode 100644
index 0000000000..a93c8c5bbe
--- /dev/null
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json
@@ -0,0 +1,32 @@
+{
+	"appenders": {
+		"out": {"type": "stdout"},
+		"audit": {
+			"type": "file",
+			"filename": "log/audit.log",
+			"maxLogSize": 10240000,
+			"backups": 10,
+			"layout": {
+				"type": "messagePassThrough"
+			}
+		},
+		"metrics": {
+			"type": "file",
+			"filename": "log/metrics.log",
+			"maxLogSize": 10240000,
+			"backups": 10,
+			"layout": {
+				"type": "messagePassThrough"
+			}
+		},
+		"error": {"type": "stdout"},
+		"debug": {"type": "stdout"}
+	},
+	"categories": {
+		"default": {"appenders": ["out"], "level": "debug"},
+		"audit": {"appenders": ["audit"], "level": "info"},
+		"metrics": {"appenders": ["metrics"], "level": "info"},
+		"error": {"appenders": ["error"], "level": "error"},
+		"debug": {"appenders": ["debug"], "level": "debug"}
+	}
+}
\ No newline at end of file
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
old mode 100644
new mode 100755
index 789c634956..6c8ed25c40
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml
@@ -1,5 +1,6 @@
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications Copyright © 2019 AT&T
+# Modifications Copyright © 2020 Nokia
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -31,4 +32,12 @@ metadata:
   name: {{include "common.fullname" . }}-filebeat-configmap
   namespace: {{include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/log/*").AsConfig . | indent 2 }}
\ No newline at end of file
+{{ tpl (.Files.Glob "resources/log/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{include "common.fullname" . }}-log4js-configmap
+  namespace: {{include "common.namespace" . }}
+data:
+{{ tpl (.Files.Glob "resources/log4js/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
old mode 100644
new mode 100755
index ec3c72d042..1a96bffa86
--- a/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
+++ b/kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml
@@ -1,6 +1,7 @@
 #============LICENSE_START========================================================
 # ================================================================================
 # Copyright (c) 2019 AT&T Intellectual Property. All rights reserved.
+# Modifications Copyright © 2020 Nokia
 # ================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -115,6 +116,8 @@ spec:
               name: component-log
             - mountPath: /opt/app/dh/etc/cert/
               name: tls-info
+            - mountPath: /opt/app/dh/etc/
+              name: log4js-conf
           env:
             - name: CONSUL_HOST
               value: consul-server.{{ include "common.namespace" . }}
@@ -164,5 +167,9 @@ spec:
             defaultMode: 422
             name: {{ include "common.fullname" . }}-configmap
           name: dh-config
+        - configMap:
+            defaultMode: 420
+            name: {{include "common.fullname" . }}-log4js-configmap
+          name: log4js-conf
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
-- 
cgit 1.2.3-korg