Merge branch 'topic/prometheus'

2 files changed, 32 insertions, 15 deletions

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/base/templates/service.j2 b/roles/monitoring/prometheus/exporter/base/templates/service.j2
new file mode 100644
index 00000000..c24baf43
--- /dev/null
+++ b/roles/monitoring/prometheus/exporter/base/templates/service.j2
@@ -0,0 +1,32 @@
+[Unit]
+Description=Prometheus exporter proxy
+
+[Service]
+Restart=always
+User=prometheus-exporter
+ExecStart=/usr/bin/prometheus-exporter-exporter -config.dirs=/etc/prometheus/exporter/enabled -config.file="" -web.listen-address="" -web.tls.listen-address="{{ prometheus_exporter_listen }}" -web.tls.cert="/etc/ssl/prometheus/exporter/crt.pem" -web.tls.key="/etc/ssl/prometheus/exporter/key.pem" --web.tls.ca="/etc/ssl/prometheus/ca-crt.pem" -web.tls.verify
+{# TODO: implement reloading once the exporter_exporter supports this #}
+
+# systemd hardening-options
+AmbientCapabilities=
+CapabilityBoundingSet=
+DeviceAllow=/dev/null rw
+DevicePolicy=strict
+LockPersonality=true
+MemoryDenyWriteExecute=true
+NoNewPrivileges=true
+PrivateDevices=true
+PrivateTmp=true
+PrivateUsers=true
+ProtectControlGroups=true
+ProtectHome=true
+ProtectKernelModules=true
+ProtectKernelTunables=true
+ProtectSystem=strict
+RemoveIPC=true
+RestrictNamespaces=true
+RestrictRealtime=true
+SystemCallArchitectures=native
+
+[Install]
+WantedBy=multi-user.target