summaryrefslogtreecommitdiffstats
path: root/kubernetes/log/templates
diff options
context:
space:
mode:
authorBorislavG <Borislav.Glozman@amdocs.com>2017-11-01 12:48:42 +0200
committerBorislav Glozman <Borislav.Glozman@amdocs.com>2017-11-01 11:01:02 +0000
commit2631be86fae5d79ea6754ce7411da72463ed1167 (patch)
tree2c2ea7aa7268c8008179eed674e22040d485e079 /kubernetes/log/templates
parent61468adee9e2c443c336536c29b216209a569478 (diff)
Fix configuration of elasticsearch
elasticsearch config file was mapped to wrong location. Effectively, elasticsearch.yml file was not taken into account and default values are used. Issue-ID: OOM-390 Signed-off-by: BorislavG <Borislav.Glozman@amdocs.com> Change-Id: I494341f4c32dff9a13f4b0a460a24e6e9776c584
Diffstat (limited to 'kubernetes/log/templates')
-rw-r--r--kubernetes/log/templates/all-services.yaml17
-rw-r--r--kubernetes/log/templates/elasticsearch-deployment.yaml8
2 files changed, 21 insertions, 4 deletions
diff --git a/kubernetes/log/templates/all-services.yaml b/kubernetes/log/templates/all-services.yaml
index 3984f12521..0885affdcf 100644
--- a/kubernetes/log/templates/all-services.yaml
+++ b/kubernetes/log/templates/all-services.yaml
@@ -15,6 +15,21 @@ spec:
selector:
app: elasticsearch
type: NodePort
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: elasticsearchtcp
+ namespace: {{ .Values.nsPrefix }}-log
+ labels:
+ app: elasticsearch
+spec:
+ ports:
+ - name: tcp
+ port: 9300
+ targetPort: 9300
+ selector:
+ app: elasticsearch
#{{ end }}
#{{ if not .Values.disableLogLogstash }}
---
@@ -51,4 +66,4 @@ spec:
selector:
app: kibana
type: NodePort
-#{{ end }} \ No newline at end of file
+#{{ end }}
diff --git a/kubernetes/log/templates/elasticsearch-deployment.yaml b/kubernetes/log/templates/elasticsearch-deployment.yaml
index f0db31a289..c123df1daa 100644
--- a/kubernetes/log/templates/elasticsearch-deployment.yaml
+++ b/kubernetes/log/templates/elasticsearch-deployment.yaml
@@ -51,10 +51,11 @@ spec:
protocol: TCP
readinessProbe:
tcpSocket:
- port: 9200
+ port: 9300
volumeMounts:
- - mountPath: /usr/share/elasticsearch/conf/
+ - mountPath: /usr/share/elasticsearch/config/elasticsearch.yml
name: elasticsearch-conf
+ subPath: elasticsearch.yml
- mountPath: /usr/share/elasticsearch/data/
name: elasticsearch-data
- mountPath: /usr/share/elasticsearch/logs/
@@ -80,4 +81,5 @@ metadata:
namespace: {{ .Values.nsPrefix }}-log
data:
{{ (.Files.Glob "resources/elasticsearch/conf/elasticsearch.yml").AsConfig | indent 2 }}
-#{{ end }} \ No newline at end of file
+#{{ end }}
+