From 3ef83057161e6d973f79805340d4c3d210425465 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 30 May 2021 16:08:03 +0200
Subject: cleanup: old preliminary tasks

---
 .../prometheus/exporter/base/tasks/main.yml        | 21 ++++++++--------
 .../exporter/base/templates/nginx-vhost.conf.j2    | 15 ------------
 .../prometheus/exporter/node/tasks/main.yml        | 28 ++++------------------
 3 files changed, 14 insertions(+), 50 deletions(-)
 delete mode 100644 roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.conf.j2

(limited to 'roles/monitoring/prometheus/exporter')

diff --git a/roles/monitoring/prometheus/exporter/base/tasks/main.yml b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
index c3a04bd9..7982f1f9 100644
--- a/roles/monitoring/prometheus/exporter/base/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/base/tasks/main.yml
@@ -1,16 +1,15 @@
 ---
 - name: create main configuration directories
-  loop:
-  - exporters-available
-  - exporters-enabled
   file:
-    path: "/etc/prometheus-exporter/{{ item }}"
+    path: "/etc/prometheus/exporters"
     state: directory
 
-- name: install nginx vhost
-  vars:
-    nginx_vhost:
-      name: prometheus-exporter
-      content: "{{ lookup('template', 'nginx-vhost.conf.j2') }}"
-  include_role:
-    name: nginx/vhost
+- name: install apt packages
+  apt:
+    name: prom-exporter-exporter
+    state: present
+
+## TODO:
+## - systemd service unit
+## - add snippet to exporter-exporter config-dir
+## - create certificate/key
diff --git a/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.conf.j2 b/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.conf.j2
deleted file mode 100644
index e032ca3d..00000000
--- a/roles/monitoring/prometheus/exporter/base/templates/nginx-vhost.conf.j2
+++ /dev/null
@@ -1,15 +0,0 @@
-server {
-  listen {{ prometheus_exporter_port }};
-  listen [::]:{{ prometheus_exporter_port }};
-  server_name _;
-
-  ## TODO: configure ssl
-
-  location / {
-     return 404 "unknown exporter: $uri\n";
-  }
-  include /etc/prometheus-exporter/exporters-enabled/*;
-
-  access_log /var/log/nginx/access-prometheus-exporter.log;
-  error_log /var/log/nginx/error-prometheus-exporter.log;
-}
diff --git a/roles/monitoring/prometheus/exporter/node/tasks/main.yml b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
index 286b6d75..0758eb3f 100644
--- a/roles/monitoring/prometheus/exporter/node/tasks/main.yml
+++ b/roles/monitoring/prometheus/exporter/node/tasks/main.yml
@@ -1,29 +1,9 @@
 ---
 - name: install apt packages
   apt:
-    name: prometheus-node-exporter
+    name: prom-exporter-node
     state: present
 
-  ## TODO: add other configs
-- name: listen on localhost only
-  lineinfile:
-    path: /etc/default/prometheus-node-exporter
-    regexp: '^ARGS='
-    line: 'ARGS="--web.listen-address=127.0.0.1:9100"'
-  notify: restart prometheus-node-exporter
-
-- name: create nginx snippet
-  copy:
-    content: |
-      location = /node {
-        proxy_pass http://127.0.0.1:9100/metrics;
-      }
-    dest: /etc/prometheus-exporter/exporters-available/node
-  # notify: reload nginx
-
-- name: enable nginx snippet
-  file:
-    src: /etc/prometheus-exporter/exporters-available/node
-    dest: /etc/prometheus-exporter/exporters-enabled/node
-    state: link
-  # notify: reload nginx
+## TODO:
+## - systemd service unit
+## - add snippet to exporter-exporter config-dir
-- 
cgit v1.2.3