Fixed kibana image and controller to work through proxy

This commit is contained in:
Mik Vyatskov 2016-11-02 22:06:22 +01:00
parent d28f7031a1
commit 3b6353bdc8
3 changed files with 9 additions and 2 deletions

View File

@ -31,6 +31,8 @@ spec:
env:
- name: "ELASTICSEARCH_URL"
value: "http://elasticsearch-logging:9200"
- name: "KIBANA_BASE_URL"
value: "/api/v1/proxy/namespaces/kube-system/services/kibana-logging"
ports:
- containerPort: 5601
name: ui

View File

@ -15,9 +15,10 @@
.PHONY: build push
TAG = v4.6.1
PREFIX = gcr.io/google_containers
build:
docker build -t gcr.io/google_containers/kibana:$(TAG) .
docker build -t $(PREFIX)/kibana:$(TAG) .
push:
gcloud docker -- push gcr.io/google_containers/kibana:$(TAG)
gcloud docker -- push $(PREFIX)/kibana:$(TAG)

View File

@ -17,4 +17,8 @@
export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"}
echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL}
export KIBANA_BASE_URL=${KIBANA_BASE_URL:-""}
echo "server.basePath: ${KIBANA_BASE_URL}"
echo "server.basePath: ${KIBANA_BASE_URL}" >> /kibana/config/kibana.yml
/kibana/bin/kibana -e ${ELASTICSEARCH_URL}