mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-05 02:09:56 +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:
|
containers:
|
||||||
- name: kibana-logging
|
- name: kibana-logging
|
||||||
image: gcr.io/google_containers/kibana:1.1
|
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:
|
ports:
|
||||||
- name: kibana-port
|
- name: kibana-port
|
||||||
containerPort: 80
|
containerPort: 80
|
||||||
|
@ -43,6 +43,11 @@ set -o errexit
|
|||||||
set -o nounset
|
set -o nounset
|
||||||
set -o pipefail
|
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
|
cat << EOF > /usr/share/nginx/html/config.js
|
||||||
/** @scratch /configuration/config.js/1
|
/** @scratch /configuration/config.js/1
|
||||||
*
|
*
|
||||||
@ -75,11 +80,7 @@ function (Settings) {
|
|||||||
* +elasticsearch: {server: "http://localhost:9200", withCredentials: true}+
|
* +elasticsearch: {server: "http://localhost:9200", withCredentials: true}+
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
elasticsearch: "${ES_SCHEME}://${ES_HOST}",
|
||||||
|
|
||||||
elasticsearch: "https://"+window.location.hostname+"/api/v1beta1/proxy/services/elasticsearch-logging",
|
|
||||||
|
|
||||||
|
|
||||||
/** @scratch /configuration/config.js/5
|
/** @scratch /configuration/config.js/5
|
||||||
*
|
*
|
||||||
* ==== default_route
|
* ==== default_route
|
||||||
|
Loading…
Reference in New Issue
Block a user