update kibana docker image
This commit is contained in:
parent
ba320e918d
commit
698da78768
2 changed files with 10 additions and 8 deletions
|
@ -136,8 +136,8 @@ elasticsearch_image_tag: "{{ elasticsearch_version }}"
|
||||||
fluentd_version: "1.22"
|
fluentd_version: "1.22"
|
||||||
fluentd_image_repo: "gcr.io/google_containers/fluentd-elasticsearch"
|
fluentd_image_repo: "gcr.io/google_containers/fluentd-elasticsearch"
|
||||||
fluentd_image_tag: "{{ fluentd_version }}"
|
fluentd_image_tag: "{{ fluentd_version }}"
|
||||||
kibana_version: "v4.6.1"
|
kibana_version: "5.6.4"
|
||||||
kibana_image_repo: "gcr.io/google_containers/kibana"
|
kibana_image_repo: "docker.elastic.co/kibana/kibana"
|
||||||
kibana_image_tag: "{{ kibana_version }}"
|
kibana_image_tag: "{{ kibana_version }}"
|
||||||
helm_version: "v2.8.1"
|
helm_version: "v2.8.1"
|
||||||
helm_image_repo: "lachlanevenson/k8s-helm"
|
helm_image_repo: "lachlanevenson/k8s-helm"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
---
|
---
|
||||||
# https://raw.githubusercontent.com/kubernetes/kubernetes/v1.5.2/cluster/addons/fluentd-kibana/kibana-controller.yaml
|
# https://raw.githubusercontent.com/kubernetes/kubernetes/release-1.10/cluster/addons/fluentd-elasticsearch/kibana-deployment.yaml
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
name: kibana-logging
|
name: kibana-logging
|
||||||
|
@ -36,10 +36,12 @@ spec:
|
||||||
env:
|
env:
|
||||||
- name: "ELASTICSEARCH_URL"
|
- name: "ELASTICSEARCH_URL"
|
||||||
value: "http://elasticsearch-logging:{{ elasticsearch_service_port }}"
|
value: "http://elasticsearch-logging:{{ elasticsearch_service_port }}"
|
||||||
{% if kibana_base_url is defined and kibana_base_url != "" %}
|
- name: "SERVER_BASEPATH"
|
||||||
- name: "KIBANA_BASE_URL"
|
value: "/api/v1/namespaces/kube-system/services/kibana-logging/proxy"
|
||||||
value: "{{ kibana_base_url }}"
|
- name: XPACK_MONITORING_ENABLED
|
||||||
{% endif %}
|
value: "false"
|
||||||
|
- name: XPACK_SECURITY_ENABLED
|
||||||
|
value: "false"
|
||||||
ports:
|
ports:
|
||||||
- containerPort: 5601
|
- containerPort: 5601
|
||||||
name: ui
|
name: ui
|
||||||
|
|
Loading…
Reference in a new issue