diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-10-05 00:38:10 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 00:38:10 -0700 |
| commit | 64b5f2f08f813910cb608961a7e58e0d27142a9f (patch) | |
| tree | ac71081acbdcc5fce1a424cb4c653760604d128b /roles/openshift_logging_elasticsearch/defaults | |
| parent | 5080e6c5c5fd26128280cebf63632d3190b29e64 (diff) | |
| parent | 76e00ca0b6900c6c405f0fd9ca3e12b032498e22 (diff) | |
| download | openshift-64b5f2f08f813910cb608961a7e58e0d27142a9f.tar.gz openshift-64b5f2f08f813910cb608961a7e58e0d27142a9f.tar.bz2 openshift-64b5f2f08f813910cb608961a7e58e0d27142a9f.tar.xz openshift-64b5f2f08f813910cb608961a7e58e0d27142a9f.zip | |
Merge pull request #5564 from jcantrill/es_prom
Automatic merge from submit-queue.
Add logging es prometheus endpoint
This PR adds changes to add a prometheus endpoint to the logging elasticsearch pod
Diffstat (limited to 'roles/openshift_logging_elasticsearch/defaults')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/defaults/main.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_logging_elasticsearch/defaults/main.yml b/roles/openshift_logging_elasticsearch/defaults/main.yml index 384707378..72d5cab96 100644 --- a/roles/openshift_logging_elasticsearch/defaults/main.yml +++ b/roles/openshift_logging_elasticsearch/defaults/main.yml @@ -40,6 +40,12 @@ openshift_logging_es_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_pvc_ # config the es plugin to write kibana index based on the index mode openshift_logging_elasticsearch_kibana_index_mode: 'unique' +openshift_logging_elasticsearch_proxy_image_prefix: "openshift/oauth-proxy" +openshift_logging_elasticsearch_proxy_image_version: "v1.0.0" +openshift_logging_elasticsearch_proxy_cpu_limit: "100m" +openshift_logging_elasticsearch_proxy_memory_limit: "64Mi" +openshift_logging_elasticsearch_prometheus_sa: "system:serviceaccount:{{openshift_prometheus_namespace | default('prometheus')}}:prometheus" + # this is used to determine if this is an operations deployment or a non-ops deployment # simply used for naming purposes openshift_logging_elasticsearch_ops_deployment: false |