summaryrefslogtreecommitdiffstats
path: root/kubernetes
diff options
context:
space:
mode:
authormarcinrzepeckiwroc <marcin.rzepecki@nokia.com>2020-08-11 11:24:13 +0200
committermarcinrzepeckiwroc <marcin.rzepecki@nokia.com>2020-08-12 11:03:50 +0200
commit9a05dd22aaaf1182b7e27cbcbf57e4eb0f0ff9e9 (patch)
tree1afa5fc95a8a785e777a7deb7170359e743ff76d /kubernetes
parent3442e5490abef9d3880f30a316a1554a8aa065fd (diff)
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
Diffstat (limited to 'kubernetes')
-rw-r--r--kubernetes/dcaegen2/components/dcae-deployment-handler/resources/log4js/log4js.json32
-rwxr-xr-x[-rw-r--r--]kubernetes/dcaegen2/components/dcae-deployment-handler/templates/configmap.yaml11
-rwxr-xr-x[-rw-r--r--]kubernetes/dcaegen2/components/dcae-deployment-handler/templates/deployment.yaml7
3 files changed, 49 insertions, 1 deletions
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
index 789c634956..6c8ed25c40 100644..100755
--- 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
index ec3c72d042..1a96bffa86 100644..100755
--- 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"