diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2021-09-26 04:29:02 +0200 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2021-09-26 04:29:02 +0200 |
| commit | 223297c29d78e4fe95e2ed2338455708e4e0a9c3 (patch) | |
| tree | 02534f529becf59835dd1ed5dee0f2321966a09b /roles/monitoring/prometheus/exporter/mikrotik | |
| parent | switch to pascal for pressure (diff) | |
| parent | fix alert wording (diff) | |
Merge branch 'topic/prometheus-refactoring'
Diffstat (limited to 'roles/monitoring/prometheus/exporter/mikrotik')
3 files changed, 11 insertions, 11 deletions
diff --git a/roles/monitoring/prometheus/exporter/mikrotik/handlers/main.yml b/roles/monitoring/prometheus/exporter/mikrotik/handlers/main.yml index cb85d0d9..c5844220 100644 --- a/roles/monitoring/prometheus/exporter/mikrotik/handlers/main.yml +++ b/roles/monitoring/prometheus/exporter/mikrotik/handlers/main.yml @@ -4,8 +4,7 @@ name: prometheus-mikrotik-exporter state: restarted -- name: reload prometheus-exporter-exporter +- name: reload nginx service: - name: prometheus-exporter-exporter - ## TODO: implement reload once exporter_exporter supports this... - state: restarted + name: nginx + state: reloaded diff --git a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml index c3ffe31b..72c78e4a 100644 --- a/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml +++ b/roles/monitoring/prometheus/exporter/mikrotik/tasks/main.yml @@ -1,4 +1,5 @@ --- + ## TODO: pin version - name: install apt packages apt: name: prom-exporter-mikrotik @@ -34,8 +35,8 @@ - name: register exporter copy: content: | - method: http - http: - port: 9436 - dest: /etc/prometheus/exporter/enabled/mikrotik.yml - notify: reload prometheus-exporter-exporter + location = /mikrotik { + proxy_pass http://127.0.0.1:9436/metrics; + } + dest: /etc/prometheus/exporter/mikrotik.locations + notify: reload nginx diff --git a/roles/monitoring/prometheus/exporter/mikrotik/templates/config.yml.j2 b/roles/monitoring/prometheus/exporter/mikrotik/templates/config.yml.j2 index a2dc1c71..576ee12f 100644 --- a/roles/monitoring/prometheus/exporter/mikrotik/templates/config.yml.j2 +++ b/roles/monitoring/prometheus/exporter/mikrotik/templates/config.yml.j2 @@ -1,7 +1,7 @@ # {{ ansible_managed }} devices: - {{ prometheus_exporter_mikrotik_devices | to_nice_yaml(indent=2) | indent(2)}} + {{ prometheus_exporter_mikrotik_devices | to_nice_yaml(indent=2) | indent(2) }} features: - {{ prometheus_exporter_mikrotik_features | to_nice_yaml(indent=2) | indent(2)}} + {{ prometheus_exporter_mikrotik_features | to_nice_yaml(indent=2) | indent(2) }} |