X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Flog%2Ftemplates%2Flogstash-deployment.yaml;h=33bcc2001ac5c1cd0a87f459325dd5bbb87d5e73;hp=f99657a03904a5f654f344dbc448486d90864361;hb=4e4b97524ca8731bbb2b3080ca85b139f0096ce5;hpb=79415fd2d41c9e5394308c70177c23f8f4e1a798

diff --git a/kubernetes/log/templates/logstash-deployment.yaml b/kubernetes/log/templates/logstash-deployment.yaml
index f99657a039..33bcc2001a 100644
--- a/kubernetes/log/templates/logstash-deployment.yaml
+++ b/kubernetes/log/templates/logstash-deployment.yaml
@@ -1,12 +1,27 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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.
+
 #{{ if not .Values.disableLogLogstash }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
   labels:
     app: logstash
-  name: logstash
-  namespace: {{ .Values.nsPrefix }}-log 
+  name: log-logstash
+  namespace: {{ .Values.nsPrefix }}
 spec:
+  replicas: {{ .Values.logstashReplicas }}
   selector:
     matchLabels:
       app: logstash
@@ -14,7 +29,7 @@ spec:
     metadata:
       labels:
         app: logstash
-      name: logstash
+      name: log-logstash
     spec:
       initContainers:
       - command:
@@ -52,13 +67,13 @@ spec:
       volumes:
         - name: logstash-conf
           configMap:
-            name: logstash-configmap
+            name: log-logstash-configmap
             items:
             - key: logstash.yml
               path: logstash.yml
         - name: logstash-pipeline
           configMap:
-            name: logstash-configmap
+            name: log-logstash-configmap
             items:
             - key: onap-pipeline.conf
               path: onap-pipeline.conf
@@ -67,9 +82,9 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: logstash-configmap
-  namespace: {{ .Values.nsPrefix }}-log
+  name: log-logstash-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig | indent 2 }}
-{{ (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/logstash/conf/logstash.yml").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/logstash/pipeline/onap-pipeline.conf").AsConfig . | indent 2 }}
 #{{ end }}