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 | |
| 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')
| -rw-r--r-- | roles/openshift_logging/filter_plugins/openshift_logging.py | 19 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/delete_logging.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_logging/tasks/generate_certs.yaml | 4 |
3 files changed, 21 insertions, 3 deletions
diff --git a/roles/openshift_logging/filter_plugins/openshift_logging.py b/roles/openshift_logging/filter_plugins/openshift_logging.py index eac086e81..330e7e59a 100644 --- a/roles/openshift_logging/filter_plugins/openshift_logging.py +++ b/roles/openshift_logging/filter_plugins/openshift_logging.py @@ -45,6 +45,21 @@ def map_from_pairs(source, delim="="): return dict(item.split(delim) for item in source.split(",")) +def serviceaccount_name(qualified_sa): + ''' Returns the simple name from a fully qualified name ''' + return qualified_sa.split(":")[-1] + + +def serviceaccount_namespace(qualified_sa, default=None): + ''' Returns the namespace from a fully qualified name ''' + seg = qualified_sa.split(":") + if len(seg) > 1: + return seg[-2] + if default: + return default + return seg[-1] + + # pylint: disable=too-few-public-methods class FilterModule(object): ''' OpenShift Logging Filters ''' @@ -56,5 +71,7 @@ class FilterModule(object): 'random_word': random_word, 'entry_from_named_pair': entry_from_named_pair, 'map_from_pairs': map_from_pairs, - 'es_storage': es_storage + 'es_storage': es_storage, + 'serviceaccount_name': serviceaccount_name, + 'serviceaccount_namespace': serviceaccount_namespace } diff --git a/roles/openshift_logging/tasks/delete_logging.yaml b/roles/openshift_logging/tasks/delete_logging.yaml index 3040d15ca..ffed956a4 100644 --- a/roles/openshift_logging/tasks/delete_logging.yaml +++ b/roles/openshift_logging/tasks/delete_logging.yaml @@ -92,6 +92,7 @@ with_items: - rolebinding-reader - daemonset-admin + - prometheus-metrics-viewer # delete our configmaps - name: delete configmaps diff --git a/roles/openshift_logging/tasks/generate_certs.yaml b/roles/openshift_logging/tasks/generate_certs.yaml index 9c8f0986a..f526fd734 100644 --- a/roles/openshift_logging/tasks/generate_certs.yaml +++ b/roles/openshift_logging/tasks/generate_certs.yaml @@ -139,10 +139,10 @@ # TODO: make idempotent - name: Generate proxy session - set_fact: session_secret={{'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'|random_word(200)}} + set_fact: session_secret={{ 200 | oo_random_word}} check_mode: no # TODO: make idempotent - name: Generate oauth client secret - set_fact: oauth_secret={{'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'|random_word(64)}} + set_fact: oauth_secret={{ 64 | oo_random_word}} check_mode: no |