aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
diff options
context:
space:
mode:
authorac2550 <ac2550@intl.att.com>2018-09-20 14:57:22 +0200
committerAnaƫl Closson <ac2550@intl.att.com>2018-10-09 15:59:49 +0000
commita0496b0f40c37b9a5c4747a58f34dbd47a27f1ed (patch)
tree2854c4b18e2bef63437ac58c84786e8543a3a2db /kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
parentb1cc7ae3d635d0d54bb57928dbf85398fa414196 (diff)
Migrate ELK to 6.1.3 OSS
+ add logstash configuration for a 2nd aggregated index + use new restore scripts for restoring dashboards Change-Id: I9176fa3b551591fdaf968e5b2496d510581aca22 Issue-ID: CLAMP-222 Signed-off-by: ac2550 <ac2550@intl.att.com>
Diffstat (limited to 'kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml')
-rw-r--r--kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml22
1 files changed, 1 insertions, 21 deletions
diff --git a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index cd8e1026e7..0f5a93347a 100644
--- a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@ -46,26 +46,9 @@ spec:
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
name: {{ include "common.name" . }}-readiness
- - args:
- - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana
- - --input=/config/default.json
- - --type=data
- env:
- - name: NAMESPACE
- valueFrom:
- fieldRef:
- apiVersion: v1
- fieldPath: metadata.namespace
- image: "{{ .Values.configRepository }}/{{ .Values.configImage }}"
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-config
- volumeMounts:
- - mountPath: /config/default.json
- name: {{ include "common.fullname" . }}
- subPath: default.json
containers:
- name: {{ include "common.name" . }}
- image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}"
+ image: "{{ .Values.global.imageRepository | default .Values.imageRepository }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
ports:
- containerPort: {{ .Values.service.internalPort }}
@@ -112,8 +95,5 @@ spec:
items:
- key: kibana.yml
path: kibana.yml
- - key: default.json
- path: default.json
-
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"