diff options
| author | Michael Gugino <gugino.michael@yahoo.com> | 2017-11-27 12:01:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 12:01:44 -0500 |
| commit | 9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514 (patch) | |
| tree | 992cc39ac3453aa322446a076f46b67227487b0b | |
| parent | 747224e87c16b0b4329f71c9e6ae74e4f0bb6178 (diff) | |
| parent | 6ff2765476292a4f166f0093b602ee48b444d502 (diff) | |
| download | openshift-9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514.tar.gz openshift-9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514.tar.bz2 openshift-9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514.tar.xz openshift-9dbcf7bfda85d33f2d0d9653ab5a3cab714b3514.zip | |
Merge pull request #6143 from dabelenda/add_hostname_routes
Allow to set the hostname for routes to prometheus and alertmanager
| -rw-r--r-- | roles/openshift_prometheus/README.md | 4 | ||||
| -rw-r--r-- | roles/openshift_prometheus/defaults/main.yaml | 4 | ||||
| -rw-r--r-- | roles/openshift_prometheus/tasks/install_prometheus.yaml | 3 |
3 files changed, 11 insertions, 0 deletions
diff --git a/roles/openshift_prometheus/README.md b/roles/openshift_prometheus/README.md index 5bf6e7d77..f1eca1da6 100644 --- a/roles/openshift_prometheus/README.md +++ b/roles/openshift_prometheus/README.md @@ -25,6 +25,10 @@ For default values, see [`defaults/main.yaml`](defaults/main.yaml). - `openshift_prometheus_args`: Modify or add arguments for prometheus application +- `openshift_prometheus_hostname`: specify the hostname for the route to prometheus `prometheus-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}` + +- `openshift_prometheus_alerts_hostname`: specify the hostname for the route to prometheus-alerts `prometheus_alerts-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}}` + e.g ``` openshift_prometheus_args=['--storage.tsdb.retention=6h', '--storage.tsdb.min-block-duration=5s', '--storage.tsdb.max-block-duration=6m'] diff --git a/roles/openshift_prometheus/defaults/main.yaml b/roles/openshift_prometheus/defaults/main.yaml index 1b4a12cac..df331a4bb 100644 --- a/roles/openshift_prometheus/defaults/main.yaml +++ b/roles/openshift_prometheus/defaults/main.yaml @@ -4,6 +4,10 @@ openshift_prometheus_state: present openshift_prometheus_namespace: openshift-metrics +# defaults hosts for routes +openshift_prometheus_hostname: prometheus-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}} +openshift_prometheus_alerts_hostname: alerts-{{openshift_prometheus_namespace}}.{{openshift_master_default_subdomain}} + openshift_prometheus_node_selector: {"region":"infra"} # additional prometheus rules file diff --git a/roles/openshift_prometheus/tasks/install_prometheus.yaml b/roles/openshift_prometheus/tasks/install_prometheus.yaml index 50736a9ee..ad15dc65f 100644 --- a/roles/openshift_prometheus/tasks/install_prometheus.yaml +++ b/roles/openshift_prometheus/tasks/install_prometheus.yaml @@ -113,12 +113,15 @@ oc_route: state: present name: "{{ item.name }}" + host: "{{ item.host }}" namespace: "{{ openshift_prometheus_namespace }}" service_name: "{{ item.name }}" tls_termination: reencrypt with_items: - name: prometheus + host: "{{ openshift_prometheus_hostname }}" - name: alerts + host: "{{ openshift_prometheus_alerts_hostname }}" # Storage - name: create prometheus pvc |