fix: prometheus retention and authelia fix (#73)

* fix: prometheus retention time

* also fix bug with authelia

* linting issues

* more linting

ansible/playbooks/monitoring.yml

@@ -10,6 +10,8 @@
       ansible.builtin.include_vars:
         file: "{{ playbook_dir }}/../group_vars/all/secrets.yaml"
       no_log: true
+  roles:
+    - prometheus
   tasks:
     - name: Deploy Prometheus config
       ansible.builtin.template:
@@ -77,11 +79,6 @@
       notify: Restart grafana
 
   handlers:
-    - name: Restart prometheus
-      ansible.builtin.service:
-        name: prometheus
-        state: restarted
-
     - name: Restart grafana
       ansible.builtin.service:
         name: grafana

ansible/roles/prometheus/defaults/main.yml

@@ -0,0 +1,2 @@
+---
+prometheus_retention_time: "1y"

ansible/roles/prometheus/handlers/main.yml

@@ -0,0 +1,5 @@
+---
+- name: Restart prometheus
+  ansible.builtin.service:
+    name: prometheus
+    state: restarted

ansible/roles/prometheus/tasks/main.yml

@@ -0,0 +1,7 @@
+---
+- name: Set Prometheus args in rc.conf (FreeBSD)
+  community.general.sysrc:
+    name: prometheus_args
+    value: "--storage.tsdb.retention.time={{ prometheus_retention_time }}"
+  when: ansible_facts["os_family"] == "FreeBSD"
+  notify: Restart prometheus

ansible/services/authelia/docker-compose.yml

@@ -6,22 +6,20 @@
 
 services:
   authelia:
-    container_name: authelia
+    container_name: "authelia"
-    image: docker.io/authelia/authelia:latest
+    image: "docker.io/authelia/authelia:latest"
-    restart: unless-stopped
+    restart: "unless-stopped"
     ports:
-      - '127.0.0.1:9091:9091'
+      - "127.0.0.1:9091:9091"
     environment:
-      AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: /secrets/JWT_SECRET
+      AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE: "/secrets/JWT_SECRET"
-      AUTHELIA_SESSION_SECRET_FILE: /secrets/SESSION_SECRET
+      AUTHELIA_SESSION_SECRET_FILE: "/secrets/SESSION_SECRET"
-      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: /secrets/STORAGE_ENCRYPTION_KEY
+      AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE: "/secrets/STORAGE_ENCRYPTION_KEY"
-      AUTHELIA_STORAGE_MYSQL_PASSWORD_FILE: /secrets/MYSQL_PASSWORD
+      AUTHELIA_STORAGE_MYSQL_PASSWORD_FILE: "/secrets/MYSQL_PASSWORD"
-      AUTHELIA_AUTHENTICATION_BACKEND_LDAP_PASSWORD_FILE: /secrets/LLDAP_ADMIN_PASSWORD
+      TZ: "UTC"
-      AUTHELIA_NOTIFIER_SMTP_PASSWORD_FILE: /secrets/SMTP_PASSWORD
-      TZ: UTC
     volumes:
-      - /root/authelia/config:/config
+      - "/root/authelia/config:/config"
-      - /root/authelia/secrets:/secrets
+      - "/root/authelia/secrets:/secrets"
     depends_on:
       mariadb:
         condition: service_healthy
@@ -31,19 +29,19 @@ services:
       - authelia
 
   mariadb:
-    container_name: authelia-mariadb
+    container_name: "authelia-mariadb"
-    image: docker.io/library/mariadb:11
+    image: "docker.io/library/mariadb:11"
-    restart: unless-stopped
+    restart: "unless-stopped"
     environment:
-      MYSQL_ROOT_PASSWORD_FILE: /run/secrets/MYSQL_ROOT_PASSWORD
+      MYSQL_ROOT_PASSWORD_FILE: "/run/secrets/MYSQL_ROOT_PASSWORD"
-      MYSQL_DATABASE: authelia
+      MYSQL_DATABASE: "authelia"
-      MYSQL_USER: authelia
+      MYSQL_USER: "authelia"
-      MYSQL_PASSWORD_FILE: /run/secrets/MYSQL_PASSWORD
+      MYSQL_PASSWORD_FILE: "/run/secrets/MYSQL_PASSWORD"
-      TZ: UTC
+      TZ: "UTC"
     volumes:
-      - /root/authelia/mariadb:/var/lib/mysql
+      - "/root/authelia/mariadb:/var/lib/mysql"
-      - /root/authelia/secrets/MYSQL_ROOT_PASSWORD:/run/secrets/MYSQL_ROOT_PASSWORD:ro
+      - "/root/authelia/secrets/MYSQL_ROOT_PASSWORD:/run/secrets/MYSQL_ROOT_PASSWORD:ro"
-      - /root/authelia/secrets/MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD:ro
+      - "/root/authelia/secrets/MYSQL_PASSWORD:/run/secrets/MYSQL_PASSWORD:ro"
     networks:
       - authelia
     healthcheck:
@@ -54,24 +52,24 @@ services:
       start_period: 30s
 
   lldap:
-    container_name: authelia-lldap
+    container_name: "authelia-lldap"
-    image: docker.io/lldap/lldap:latest
+    image: "docker.io/lldap/lldap:latest"
-    restart: unless-stopped
+    restart: "unless-stopped"
     ports:
-      - '17170:17170'  # Web UI
+      - "17170:17170"
-      - '3890:3890'    # LDAP
+      - "3890:3890"
     environment:
-      UID: '1000'
+      UID: "1000"
-      GID: '1000'
+      GID: "1000"
-      TZ: UTC
+      TZ: "UTC"
-      LLDAP_LDAP_BASE_DN: dc=pez,dc=sh
+      LLDAP_LDAP_BASE_DN: "dc=pez,dc=sh"
-      LLDAP_LDAP_USER_DN: admin
+      LLDAP_LDAP_USER_DN: "admin"
-      LLDAP_LDAP_USER_PASS_FILE: /secrets/LLDAP_ADMIN_PASSWORD
+      LLDAP_LDAP_USER_PASS_FILE: "/secrets/LLDAP_ADMIN_PASSWORD"
-      LLDAP_JWT_SECRET_FILE: /secrets/LLDAP_JWT_SECRET
+      LLDAP_JWT_SECRET_FILE: "/secrets/LLDAP_JWT_SECRET"
     volumes:
-      - /root/authelia/lldap:/data
+      - "/root/authelia/lldap:/data"
-      - /root/authelia/secrets/LLDAP_ADMIN_PASSWORD:/secrets/LLDAP_ADMIN_PASSWORD:ro
+      - "/root/authelia/secrets/LLDAP_ADMIN_PASSWORD:/secrets/LLDAP_ADMIN_PASSWORD:ro"
-      - /root/authelia/secrets/LLDAP_JWT_SECRET:/secrets/LLDAP_JWT_SECRET:ro
+      - "/root/authelia/secrets/LLDAP_JWT_SECRET:/secrets/LLDAP_JWT_SECRET:ro"
     networks:
       - authelia