Merge "Script_version addiition in robot config"

[oom.git] / kubernetes / log / templates / all-services.yaml

diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml
index 0885aff..389e7e4 100644 (file)
--- a/kubernetes/log/templates/all-services.yaml
+++ b/kubernetes/log/templates/all-services.yaml
@@ -1,3 +1,17 @@
+# 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.disableLogElasticsearch }}
 apiVersion: v1
 kind: Service
@@ -5,7 +19,7 @@ metadata:
   labels:
     app: elasticsearch
   name: elasticsearch
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
 spec:
   ports:
   - name: http
@@ -20,7 +34,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: elasticsearchtcp
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
   labels:
     app: elasticsearch
 spec:
@@ -35,9 +49,24 @@ spec:
 ---
 apiVersion: v1
 kind: Service
+metadata:
+  name: logstashinternal
+  namespace: {{ .Values.nsPrefix }}
+  labels:
+    app: logstash
+spec:
+  ports:
+  - name: http
+    port: 9600
+    targetPort: 9600
+  selector:
+    app: logstash
+---
+apiVersion: v1
+kind: Service
 metadata:
   name: logstash
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
   labels:
     app: logstash
 spec:
@@ -45,8 +74,10 @@ spec:
   - name: transport
     port: 5044
     targetPort: 5044
+    nodePort: {{ .Values.nodePortPrefix }}55
   selector:
     app: logstash
+  type: NodePort
 #{{ end }}
 #{{ if not .Values.disableLogKibana }}
 ---
@@ -56,7 +87,7 @@ metadata:
   labels:
     app: kibana
   name: kibana
-  namespace: {{ .Values.nsPrefix }}-log
+  namespace: {{ .Values.nsPrefix }}
 spec:
   ports:
   - name: tcp-ks