github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36103 from Crassirostris/kibana-image-fix

Browse Source 
Automatic merge from submit-queue

Fixed kibana image and controller to work through proxy

As described in #34969, new kibana image doesn't work properly with proxies without additional configuration.

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-11-03 14:40:19 -07:00 committed by GitHub
commit 05a083997f
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/fluentd-elasticsearch/kibana-controller.yaml
View File

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

5
cluster/addons/fluentd-elasticsearch/kibana-image/Makefile
View File

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

4
cluster/addons/fluentd-elasticsearch/kibana-image/run.sh
View File

@ -17,4 +17,8 @@
export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"} export ELASTICSEARCH_URL=${ELASTICSEARCH_URL:-"http://localhost:9200"}
echo ELASTICSEARCH_URL=${ELASTICSEARCH_URL} 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} /kibana/bin/kibana -e ${ELASTICSEARCH_URL}