summaryrefslogtreecommitdiffstats
path: root/kubernetes/appc/templates/configmap.yaml
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-04-22 10:37:45 +0200
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2020-04-22 10:48:49 +0200
commit531d03fe9bbcff204520eb4e7bb606bc20a50cbb (patch)
tree4934616bdfa5978cecc729533b99c71c861da229 /kubernetes/appc/templates/configmap.yaml
parentf2556fe72a09071e50ac485dca9137aab9a4c6c5 (diff)
[APPC] use common templates for logs
Using the common templates for centralized logging. Issue-ID: OOM-2370 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: Ib0995b754597da36d06939199738cf93398e796a
Diffstat (limited to 'kubernetes/appc/templates/configmap.yaml')
-rw-r--r--kubernetes/appc/templates/configmap.yaml15
1 files changed, 2 insertions, 13 deletions
diff --git a/kubernetes/appc/templates/configmap.yaml b/kubernetes/appc/templates/configmap.yaml
index 72dc6172dc..fe206a9322 100644
--- a/kubernetes/appc/templates/configmap.yaml
+++ b/kubernetes/appc/templates/configmap.yaml
@@ -119,19 +119,6 @@ data:
apiVersion: v1
kind: ConfigMap
metadata:
- name: {{ include "common.fullname" . }}-filebeat
- namespace: {{ include "common.namespace" . }}
- labels:
- app: {{ include "common.name" . }}
- chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
- release: {{ include "common.release" . }}
- heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/log/filebeat/log4j/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
name: {{ include "common.fullname" . }}-logging-cfg
namespace: {{ include "common.namespace" . }}
labels:
@@ -141,3 +128,5 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/log/*").AsConfig . | indent 2 }}
+
+{{ include "common.log.configMap" . }}