X-Git-Url: https://gerrit.onap.org/r/gitweb?p=oom.git;a=blobdiff_plain;f=kubernetes%2Flog%2Ftemplates%2Fkibana-deployment.yaml;h=b60011a1b3f103617080d8344165733d00609a81;hp=2de825e516b3b2bad994692ef6670f9674e2a5f6;hb=4e4b97524ca8731bbb2b3080ca85b139f0096ce5;hpb=dea1b9749eba16d232675c0f33e7e84f8d69a980

diff --git a/kubernetes/log/templates/kibana-deployment.yaml b/kubernetes/log/templates/kibana-deployment.yaml
index 2de825e516..b60011a1b3 100644
--- a/kubernetes/log/templates/kibana-deployment.yaml
+++ b/kubernetes/log/templates/kibana-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.disableLogKibana }}
 apiVersion: extensions/v1beta1 
 kind: Deployment
 metadata:
   labels:
     app: kibana
-  name: kibana
-  namespace: {{ .Values.nsPrefix }}-log
+  name: log-kibana
+  namespace: {{ .Values.nsPrefix }}
 spec:
+  replicas: {{ .Values.kibanaReplicas }}
   selector:
     matchLabels:
       app: kibana
@@ -14,7 +29,7 @@ spec:
     metadata:
       labels:
         app: kibana
-      name: kibana
+      name: log-kibana
     spec:
       initContainers:
       - command:
@@ -47,7 +62,7 @@ spec:
       volumes:
         - name: kibana-conf
           configMap:
-            name: kibana-configmap
+            name: log-kibana-configmap
             items:
             - key: kibana.yml
               path: kibana.yml
@@ -55,8 +70,8 @@ spec:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kibana-configmap
-  namespace: {{ .Values.nsPrefix }}-log
+  name: log-kibana-configmap
+  namespace: {{ .Values.nsPrefix }}
 data:
-{{ (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig | indent 2 }}
+{{ tpl (.Files.Glob "resources/kibana/conf/kibana.yml").AsConfig . | indent 2 }}
 #{{ end }}