X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_log.tpl;h=993c48239a247ce29003d41fb920f1b151362186;hb=refs%2Fheads%2Fmaster;hp=dc714aecc4017f0eba73cd0cea7325fe2bccd567;hpb=0e6972b5a5f94d76848a22f5155f49925522b324;p=oom.git

diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index dc714aecc4..993c48239a 100644
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -27,14 +27,23 @@
     mountPath: {{ .Values.log.path }}
   - name: filebeat-data
     mountPath: /usr/share/filebeat/data
+  resources:
+    requests:
+      cpu: "10m"
+      memory: "5Mi"
+    limits:
+      cpu: "100m"
+      memory: "20Mi"
 {{- end -}}
 {{- end -}}
 
 {{- define "common.log.volumes" -}}
-{{- if .Values.global.centralizedLoggingEnabled }}
+{{- $dot := default . .dot }}
+{{- if $dot.Values.global.centralizedLoggingEnabled }}
+{{- $configMapName := printf "%s-filebeat" (default (include "common.fullname" $dot) .configMapNamePrefix) }}
 - name: filebeat-conf
   configMap:
-    name: {{ include "common.fullname" . }}-filebeat
+    name: {{ $configMapName }}
 - name: filebeat-data
   emptyDir: {}
 {{- end -}}