diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-31 13:19:18 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-31 13:19:18 -0800 |
| commit | b684f992a6a147097d44722aadedd99e4d6a6867 (patch) | |
| tree | 1930d925d20781c8129c5b6f145cbf8e0d888693 /roles/openshift_logging | |
| parent | 73701d53f481b4d5886eb9ac4f89bfd337efefea (diff) | |
| parent | f857a66e7ce1d1205aedcd0fd34f1bbb6afa726c (diff) | |
| download | openshift-b684f992a6a147097d44722aadedd99e4d6a6867.tar.gz openshift-b684f992a6a147097d44722aadedd99e4d6a6867.tar.bz2 openshift-b684f992a6a147097d44722aadedd99e4d6a6867.tar.xz openshift-b684f992a6a147097d44722aadedd99e4d6a6867.zip | |
Merge pull request #6906 from jcantrill/kibana_env_vars
Automatic merge from submit-queue.
allow setting of kibana env vars
This PR allows setting kibana env vars via ansible in support of being able to adjust kibana config via env vars
Diffstat (limited to 'roles/openshift_logging')
| -rw-r--r-- | roles/openshift_logging/README.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md index a192bd67e..c438236a4 100644 --- a/roles/openshift_logging/README.md +++ b/roles/openshift_logging/README.md @@ -58,6 +58,7 @@ When `openshift_logging_install_logging` is set to `False` the `openshift_loggin - `openshift_logging_kibana_replica_count`: The number of replicas Kibana should be scaled up to. Defaults to 1. - `openshift_logging_kibana_nodeselector`: A map of labels (e.g. {"node":"infra","region":"west"} to select the nodes where the pod will land. - `openshift_logging_kibana_edge_term_policy`: Insecure Edge Termination Policy. Defaults to Redirect. +- `openshift_logging_kibana_env_vars`: A map of environment variables to add to the kibana deployment config (e.g. {"ELASTICSEARCH_REQUESTTIMEOUT":"30000"}) - `openshift_logging_fluentd_nodeselector`: The node selector that the Fluentd daemonset uses to determine where to deploy to. Defaults to '"logging-infra-fluentd": "true"'. - `openshift_logging_fluentd_cpu_request`: The minimum amount of CPU to allocate for Fluentd collector pods. Defaults to '100m'. |