diff options
| author |   Artem Naluzhnyy <A.Naluzhnyy@Samsung.com> | 2019-05-31 11:18:30 +0000 |
|---|---|---|
| committer |   Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-07-10 07:10:24 +0000 |
| commit | e02c223fee98dabf6aa37b3a75e04dae34247a65 (patch) | |
| tree | d889150fa24f88ef61c8d4ea25db5d97c2bfd058 | |
| parent | c8903883380e58ea25bfbfaac3014c9aa84068e4 (diff) | |
Introduce postinstall configuration onboarding for Kibana pod (part 1 of 2).
* The configuration is stored in "log/charts/log-kibana/resources/config/kibana-onboarding.json".
* Running Kibana configuration can be dumped using Elasticdump tool.
* At the moment the "kibana-onboarding.json" file is empty, so the commit should not break anything.
* In an upcoming commit we will add onboarding procedure described in https://wiki.onap.org/pages/viewpage.action?pageId=24642176
Issue-ID: LOG-152
Signed-off-by: Artem Naluzhnyy <A.Naluzhnyy@Samsung.com>
Change-Id: Ic52f9eedf6963d1030b970cbc9fcfb738d20a703
4 files changed, 23 insertions, 0 deletions
diff --git a/kubernetes/log/charts/log-kibana/resources/config/README.txt b/kubernetes/log/charts/log-kibana/resources/config/README.txt new file mode 100644 index 0000000000..2863c1d5e5 --- /dev/null +++ b/kubernetes/log/charts/log-kibana/resources/config/README.txt @@ -0,0 +1 @@ +"kibana-onboarding.json" file contains initial setup of Kibana obtained using Elasticdump tool.
\ No newline at end of file diff --git a/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/kubernetes/log/charts/log-kibana/resources/config/kibana-onboarding.json diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml index ac52f62fde..657dca41a8 100644 --- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml +++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml @@ -46,6 +46,22 @@ spec: image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} name: {{ include "common.name" . }}-readiness + - args: + - --input=/config/kibana-onboarding.json + - --output=http://{{.Values.config.elasticsearchServiceName}}.{{ include "common.namespace" . }}:{{.Values.config.elasticsearchPort}}/.kibana + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.elasticdumpRepository }}/{{ .Values.elasticdumpImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + name: {{ include "common.name" . }}-elasticdump + volumeMounts: + - mountPath: /config/kibana-onboarding.json + name: {{ include "common.fullname" . }} + subPath: kibana-onboarding.json containers: - name: {{ include "common.name" . }} image: "{{ .Values.global.loggingRepository | default .Values.loggingRepository }}/{{ .Values.image }}" @@ -90,5 +106,7 @@ spec: items: - key: kibana.yml path: kibana.yml + - key: kibana-onboarding.json + path: kibana-onboarding.json imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml index 8a56151c38..5132768206 100644 --- a/kubernetes/log/charts/log-kibana/values.yaml +++ b/kubernetes/log/charts/log-kibana/values.yaml @@ -26,6 +26,10 @@ global: # Application configuration defaults. ################################################################# +# Elasticdump image +elasticdumpRepository: docker.io +elasticdumpImage: taskrabbit/elasticsearch-dump + # BusyBox image busyboxRepository: registry.hub.docker.com busyboxImage: library/busybox:latest |