Skip to content

Commit 4cea278

Browse files
committed
Remove obsolete links to cloudalchemy roles in doc and comments
1 parent adb1e38 commit 4cea278

5 files changed

Lines changed: 8 additions & 6 deletions

File tree

ansible/filter_plugins/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313

1414
def prometheus_node_exporter_targets(hosts, hostvars, env_key, group):
15-
"""Return a mapping in cloudalchemy.nodeexporter prometheus_targets
15+
"""Return a mapping in prometheus.prometheus.prometheus prometheus_targets
1616
format.
1717
1818
hosts: list of inventory_hostnames

docs/alerting.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ These are part of [Prometheus configuration](https://prometheus.io/docs/promethe
112112
which is defined for the appliance at
113113
[environments/common/inventory/group_vars/all/prometheus.yml](../environments/common/inventory/group_vars/all/prometheus.yml).
114114

115-
Two [cloudalchemy.prometheus](https://github.com/cloudalchemy/ansible-prometheus)
115+
Two [prometheus.prometheus.prometheus](https://github.com/stackhpc/prometheus-community-ansible/tree/stackhpc/roles/prometheus)
116116
role variables are relevant:
117117

118118
- `prometheus_alert_rules_files`: Paths to check for files providing rules.

docs/monitoring-and-logging.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,8 +211,10 @@ This section details the configuration of prometheus.
211211

212212
### Prometheus defaults
213213

214-
Internally, we use the [cloudalchemy.prometheus](https://github.com/cloudalchemy/ansible-prometheus) role. You can customise any of the variables that the role supports. For a full list, please see the
215-
[upstream documentation](https://github.com/cloudalchemy/ansible-prometheus). The appliance defaults can be found here:
214+
Internally, we use the [prometheus](https://github.com/stackhpc/prometheus-community-ansible/tree/stackhpc/roles/prometheus) role
215+
from `prometheus-community/ansible`, lightly patched. You can customise any of the variables that the role supports. For a full list, please see the
216+
[upstream documentation](https://prometheus-community.github.io/ansible/branch/main/prometheus_role.html#ansible-collections-prometheus-prometheus-prometheus-role).
217+
The appliance defaults can be found here:
216218

217219
> [environments/common/inventory/group_vars/all/prometheus.yml](../environments/common/inventory/group_vars/all/prometheus.yml)
218220

docs/persistent-state.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The `site` environment supports persistent state in the default OpenTofu (see `e
2424

2525
**NB: The default OpenTofu is provided as a working example and for internal CI use - therefore this volume is deleted when running `tofu destroy` - this may not be appropriate for a production environment.**
2626

27-
In general, the Prometheus data is likely to be the only sizeable state stored. The size of this can be influenced through [Prometheus role variables](https://github.com/cloudalchemy/ansible-prometheus#role-variables), e.g.:
27+
In general, the Prometheus data is likely to be the only sizeable state stored. The size of this can be influenced through [Prometheus role variables](https://prometheus-community.github.io/ansible/branch/main/prometheus_role.html#ansible-collections-prometheus-prometheus-prometheus-role), e.g.:
2828

2929
- `prometheus_storage_retention` - [default](../environments/common/inventory/group_vars/all/prometheus.yml) 31d
3030
- `prometheus_storage_retention_size` - [default](../environments/common/inventory/group_vars/all/prometheus.yml) 100GB

environments/common/inventory/group_vars/all/prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ prometheus_alertmanager_config_default:
1717
- "{{ alertmanager_address }}:{{ alertmanager_port }}"
1818
basic_auth:
1919
username: alertmanager
20-
# cloudalchemy.prometheus/preflight checks this config so it must be
20+
# prometheus.prometheus.prometheus/preflight checks this config so it must be
2121
# templatable even during build when it is not used
2222
password: "{{ vault_alertmanager_admin_password | default('UNDEFINED') }}"
2323

0 commit comments

Comments
 (0)