diff options
| author |  Joe Banks <[email protected]> | 2024-06-02 13:36:22 +0100 |
|---|---|---|
| committer | Joe Banks <[email protected]> | 2024-06-02 13:36:22 +0100 |
| commit | 1c270c941630b60cffd81381b3e1850779d61123 (patch) | |
| tree | dd45f50c5878954a6df4c688ccb8990b7c55db41 | |
| parent | Bump ansible/roles/nftables from `015a7ed` to `4acd4ae` (diff) | |
Revert Prometheus listen settings to HTTP
| -rw-r--r-- | ansible/host_vars/lovelace/prometheus.yml | 14 | ||||
| -rw-r--r-- | ansible/roles/prometheus/tasks/main.yml | 14 |
2 files changed, 0 insertions, 28 deletions
diff --git a/ansible/host_vars/lovelace/prometheus.yml b/ansible/host_vars/lovelace/prometheus.yml index ca9fc9c..300c032 100644 --- a/ansible/host_vars/lovelace/prometheus.yml +++ b/ansible/host_vars/lovelace/prometheus.yml @@ -1,24 +1,10 @@ --- prometheus_cmdline_options: >- - --web.config.file=/etc/prometheus/web_config.yml --config.file=/etc/prometheus/prometheus.yml --web.page-title='Python Discord Helper Monitoring And Supervision Service' --storage.tsdb.path='/var/lib/prometheus/metrics2/' -prometheus_web_configuration: - tls_server_config: - cert_file: "/etc/letsencrypt/live/prometheus.{{ inventory_hostname }}.box.pydis.wtf/fullchain.pem" - key_file: "/etc/letsencrypt/live/prometheus.{{ inventory_hostname }}.box.pydis.wtf/privkey.pem" - - # mTLS preferences - client_auth_type: RequireAndVerifyClientCert - client_ca_file: /opt/pydis/ca.pem - - client_allowed_sans: - - prometheus.access.tls.pydis.wtf - - sudo.access.tls.pydis.wtf - prometheus_configuration: | #jinja2: trim_blocks:False diff --git a/ansible/roles/prometheus/tasks/main.yml b/ansible/roles/prometheus/tasks/main.yml index 2c80e81..d55f3c1 100644 --- a/ansible/roles/prometheus/tasks/main.yml +++ b/ansible/roles/prometheus/tasks/main.yml @@ -67,20 +67,6 @@ notify: - Reload the prometheus service -- name: Deploy prometheus web server config - copy: - content: | - # Ansible managed - {{ prometheus_web_configuration | to_nice_yaml }} - dest: /etc/prometheus/web_config.yml - owner: prometheus - group: prometheus - mode: "0400" - tags: - - role::prometheus - notify: - - Restart the prometheus service - - name: Configure prometheus rules copy: content: | |