mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-31 07:20:13 +00:00
Added ES ENV variables so Kibana can be access in other ways
This commit is contained in:
parent
e912d5204c
commit
35038dc19a
@ -13,6 +13,11 @@ desiredState:
|
||||
containers:
|
||||
- name: kibana-logging
|
||||
image: gcr.io/google_containers/kibana:1.1
|
||||
env:
|
||||
- name: "ES_SCHEME"
|
||||
value: "https"
|
||||
- name: "ES_HOST"
|
||||
value: "\"+window.location.hostname+\"/api/v1beta1/proxy/services/elasticsearch-logging"
|
||||
ports:
|
||||
- name: kibana-port
|
||||
containerPort: 80
|
||||
|
@ -43,6 +43,11 @@ set -o errexit
|
||||
set -o nounset
|
||||
set -o pipefail
|
||||
|
||||
#Report all environment variables containing 'elasticsearch' and ES related
|
||||
set | grep -i elasticsearch
|
||||
set | grep -i ES_SCHEME
|
||||
set | grep -i ES_HOST
|
||||
|
||||
cat << EOF > /usr/share/nginx/html/config.js
|
||||
/** @scratch /configuration/config.js/1
|
||||
*
|
||||
@ -75,11 +80,7 @@ function (Settings) {
|
||||
* +elasticsearch: {server: "http://localhost:9200", withCredentials: true}+
|
||||
*
|
||||
*/
|
||||
|
||||
|
||||
elasticsearch: "https://"+window.location.hostname+"/api/v1beta1/proxy/services/elasticsearch-logging",
|
||||
|
||||
|
||||
elasticsearch: "${ES_SCHEME}://${ES_HOST}",
|
||||
/** @scratch /configuration/config.js/5
|
||||
*
|
||||
* ==== default_route
|
||||
|
Loading…
Reference in New Issue
Block a user