Merge branch 'master' of git.uumas.fi:uumas/ansible-docker

roles/container/meta/argument_specs.yml

@@ -148,6 +148,11 @@ argument_specs:
         type: list
         required: false
         elements: str
+      docker_command:
+        description: "Docker command as list of arguments or command and arguments"
+        type: list
+        required: false
+        elements: str
       docker_network_mode:
         description: "Docker container network mode"
         type: str

roles/container/tasks/additional.yml

@@ -0,0 +1,11 @@
+---
+
+- name: "Memcached container for {{ docker_service_name }}"
+  docker_container:
+    name: "{{ docker_service_name }}_memcached"
+    image: memcached:alpine
+    pull: true
+    restart_policy: always
+    networks: "{{ container_networks | default(omit) }}"
+    log_driver: local
+  when: "'memcached' in docker_additional_services"

roles/container/tasks/main.yml

@@ -25,17 +25,8 @@
   when: reverse_proxy_type != 'none'
 
 - name: Additional services
+  include_tasks: additional.yml
   when: docker_additional_services is defined
-  block:
-    - name: "Memcached container for {{ docker_service_name }}"
-      docker_container:
-        name: "{{ docker_service_name }}_memcached"
-        image: memcached:alpine
-        pull: true
-        restart_policy: always
-        networks: "{{ container_networks | default(omit) }}"
-        log_driver: local
-      when: "'memcached' in docker_additional_services"
 
 - name: Create directory /opt/{{ docker_service }}
   file:
@@ -102,6 +93,7 @@
     labels: "{{ traefik_labels | default(omit) }}"
     env: "{{ docker_env | combine(docker_additional_env) | combine({'TZ': timezone}) }}"
     entrypoint: "{{ docker_entrypoint | default(omit) }}"
+    command: "{{ docker_command | default(omit) }}"
     restart_policy: always
     network_mode: "{{ docker_network_mode | default(omit) }}"
     networks: "{{ container_networks | default(omit) }}"

roles/prometheus/defaults/main.yml

@@ -2,5 +2,6 @@
 
 prometheus_scrape_interval: 5s
 prometheus_evaluation_interval: 15s
+prometheus_storage_retention: 3650d
 prometheus_install_grafana: false
 prometheus_hcloud_relabel_configs: []

roles/prometheus/meta/argument_specs.yml

@@ -14,6 +14,11 @@ argument_specs:
         type: str
         required: false
         default: 15s
+      prometheus_storage_retention:
+        description: Period of time for which prometheus metrics are stored for. A number followed by unit (s, m, h, d, w, y)
+        type: str
+        required: false
+        default: 3650d
       prometheus_hcloud_token:
         description: Access token for hetzner cloud service discovery. It will be enabled if this variable is defined
         type: str

roles/prometheus/tasks/main.yml

@@ -7,6 +7,13 @@
     docker_service: prometheus
     docker_image: prom/prometheus
     reverse_proxy_type: none
+    docker_command:
+      - "--config.file=/etc/prometheus/prometheus.yml"
+      - "--storage.tsdb.path=/prometheus"
+      - "--storage.tsdb.retention={{ prometheus_storage_retention }}"
+      - "--web.console.libraries=/usr/share/prometheus/console_libraries"
+      - "--web.console.templates=/usr/share/prometheus/consoles"
+
     docker_volumes:
       - name: data
         path: /prometheus