Skip to content

Commit 0ba3d5d

Browse files
committed
Add general condition variable to enable rgw exporter
1 parent 13ce927 commit 0ba3d5d

File tree

2 files changed

+12
-31
lines changed

2 files changed

+12
-31
lines changed

etc/kayobe/ansible/deploy-radosgw-usage-exporter.yml

Lines changed: 7 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
delegate_to: localhost
1515
register: credential_check
1616
run_once: true
17+
when: stackhpc_enable_radosgw_usage_exporter
1718

1819
- name: Create ec2 credential if there's none
1920
command: >
@@ -23,7 +24,9 @@
2324
environment: "{{ openstack_auth_env }}"
2425
delegate_to: localhost
2526
run_once: true
26-
when: "{{ credential_check.stdout == [] }}"
27+
when:
28+
- "{{ credential_check.stdout == [] }}"
29+
- stackhpc_enable_radosgw_usage_exporter
2730

2831
- name: Query ec2 credential for admin
2932
command: >
@@ -34,6 +37,7 @@
3437
delegate_to: localhost
3538
register: credential
3639
run_once: true
40+
when: stackhpc_enable_radosgw_usage_exporter
3741

3842
- name: Get object storage endpoint
3943
command: >
@@ -44,6 +48,7 @@
4448
delegate_to: localhost
4549
register: endpoint
4650
run_once: true
51+
when: stackhpc_enable_radosgw_usage_exporter
4752

4853
- name: Ensure radosgw_usage_exporter container is running
4954
community.docker.docker_container:
@@ -60,33 +65,4 @@
6065
host: "{{ endpoint.stdout | from_json | first }}"
6166
radosgw_server: "{{ host.URL | regex_replace('(https?://)([^:/]+):([0-9]+)/.*', '\\1\\2:\\3') }}" # Drop Swift api address
6267
become: true
63-
64-
- name: Get Prometheus target ip addresses of RADOS gateway usage exporters
65-
set_fact:
66-
prometheus_targets: "{{ prometheus_targets | default([]) +[( internal_net_name | net_ip( item ) + ':9242' )] }}"
67-
loop: "{{ groups['monitoring'] }}"
68-
run_once: true
69-
70-
- name: Print config to append on prometheus.yml
71-
debug:
72-
msg: |
73-
Add Prometheus target for RADOS gateway usage exporter below at prometheus.yml then reconfigure prometheus_server.
74-
You can find a template to prometheus.yml at ``ansible/roles/prometheus/templates/prometheus.yml.j2`` under kolla-ansible directory.
75-
Make sure to use {% raw %} and {% endraw %} tags appropriately on prometheus.yml if you're overriding it for the first time.
76-
77-
- job_name: ceph_radosgw_usage_exporter
78-
honor_labels: true
79-
scrape_interval: 15s
80-
static_configs:
81-
- targets:
82-
{% for item in prometheus_targets %}
83-
- {{ item }}
84-
{% endfor %}
85-
metric_relabel_configs:
86-
- source_labels: [owner,user]
87-
target_label: tenant_id
88-
separator: ""
89-
regex: (.+)
90-
replacement: ${1}
91-
run_once: true
92-
68+
when: stackhpc_enable_radosgw_usage_exporter

etc/kayobe/stackhpc-monitoring.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,8 @@ stackhpc_os_capacity_openstack_cacert: ""
2626
# Whether TLS certificate verification is enabled for the OpenStack Capacity
2727
# exporter during Keystone authentication.
2828
stackhpc_os_capacity_openstack_verify: true
29+
30+
# Whether the RADOS gateway usage exporter is enabled.
31+
# Enabling this will result in templating radosge_usage_exporter endpoint as
32+
# Prometheus scrape targets during deployment.
33+
stackhpc_enable_radosgw_usage_exporter: false

0 commit comments

Comments
 (0)