meta: bump galaxy version to 0.1.3

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: finallycoffee
 name: observability
-version: 0.1.2
+version: 0.1.3
 readme: README.md
 authors:
 - transcaffeine <transcaffeine@finally.coffee>
@@ -18,3 +18,4 @@ tags:
   - prometheus
   - victoriametrics
   - grafana
+  - alertmanager

roles/alertmanager/defaults/main/config.yml

@@ -0,0 +1,8 @@
+---
+alertmanager_config_global: {}
+alertmanager_config_route: {}
+alertmanager_config_receivers: []
+alertmanager_config:
+  global: "{{ alertmanager_config_global }}"
+  route: "{{ alertmanager_config_route }}"
+  receivers: "{{ alertmanager_config_receivers }}"

roles/alertmanager/defaults/main/container.yml

@@ -1,11 +1,4 @@
 ---
-alertmanager_user: alertmanager
-alertmanager_version: 0.27.0
-alertmanager_base_path: /opt/alertmanager
-alertmanager_config_path: "{{ alertmanager_base_path }}/config"
-alertmanager_config_file: "{{ alertmanager_config_path }}/alertmanager.yml"
-alertmanager_data_path: "{{ alertmanager_base_path }}/data"
-
 alertmanager_container_name: alertmanager
 alertmanager_container_image_name: alertmanager
 alertmanager_container_image_namespace: prometheus/
@@ -22,7 +15,7 @@ alertmanager_container_image_reference: >-
     alertmanager_container_image_repository + ':'
     + (alertmanager_container_image_tag | default('v' + alertmanager_version))
   }}
-
+alertmanager_container_image_source: pull
 alertmanager_container_image_force_pull: "{{ alertmanager_container_image_tag is defined }}"
 
 alertmanager_container_default_volumes:
@@ -32,8 +25,5 @@ alertmanager_container_volumes: >-
   {{ alertmanager_container_default_volumes
      + alertmanager_container_extra_volumes | default([]) }}
 alertmanager_container_restart_policy: "unless-stopped"
-
-alertmanager_config:
-  global: {}
-  route: {}
-  receivers: []
+alertmanager_container_state: >-2
+  {{ (alertmanager_state == 'present') | ternary('started', 'absent') }}

roles/alertmanager/defaults/main/main.yml

@@ -0,0 +1,10 @@
+---
+alertmanager_user: alertmanager
+alertmanager_version: 0.27.0
+alertmanager_state: present
+alertmanager_deployment_method: docker
+alertmanager_base_path: /opt/alertmanager
+alertmanager_config_path: "{{ alertmanager_base_path }}/config"
+alertmanager_config_file: "{{ alertmanager_config_path }}/alertmanager.yml"
+alertmanager_data_path: "{{ alertmanager_base_path }}/data"
+

roles/alertmanager/handlers/main.yml

@@ -1,8 +1,8 @@
 ---
-
 - name: Ensure alertmanager is restarted
   community.docker.docker_container:
     name: "{{ alertmanager_container_name }}"
-    state: started
+    state: "{{ alertmanager_container_state }}"
     restart: true
   listen: restart-alertmanager
+  when: alertmanager_deployment_method == 'docker'

roles/alertmanager/meta/main.yml

@@ -0,0 +1,10 @@
+---
+allow_duplicates: true
+dependencies: []
+galaxy_info:
+  role_name: alertmanager
+  description: Deploy and configure prometheus alertmanager
+  galaxy_tags:
+    - prometheus
+    - alertmanager
+    - observability

roles/alertmanager/tasks/deploy-docker.yml

@@ -0,0 +1,21 @@
+---
+- name: Ensure container image is {{ alertmanager_state }} on host
+  community.docker.docker_image:
+    name: "{{ alertmanager_container_image_reference }}"
+    state: "{{ alertmanager_state }}"
+    source: "{{ alertmanager_container_image_source }}"
+    force_source: "{{ alertmanager_container_image_force_pull | bool }}"
+
+- name: Ensure container '{{ alertmanager_container_name }}' is {{ alertmanager_container_state }}
+  community.docker.docker_container:
+    name: "{{ alertmanager_container_name }}"
+    image: "{{ alertmanager_container_image_reference }}"
+    env: "{{ alertmanager_container_env | default(omit) }}"
+    user: "{{ alertmanager_user_info.uid | default(alertmanager_user) }}"
+    ports: "{{ alertmanager_container_ports | default(omit) }}"
+    volumes: "{{ alertmanager_container_volumes | default(omit) }}"
+    networks: "{{ alertmanager_container_networks | default(omit) }}"
+    purge_networks: "{{ alertmanager_container_purge_networks | default(omit) }}"
+    etc_hosts: "{{ alertmanager_container_etc_hosts | default(omit) }}"
+    restart_policy: "{{ alertmanager_container_restart_policy }}"
+    state: "{{ alertmanager_container_state }}"

roles/alertmanager/tasks/main.yml

@@ -1,16 +1,29 @@
 ---
+- name: Ensure state is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Invalid state '{{ alertmanager_state }}'! Valid
+      states are {{ alertmanager_states | join(', ') }}.
+  when: alertmanager_state not in alertmanager_states
 
-- name: Ensure alertmanager user '{{ alertmanager_user }}' exists
+- name: Ensure deployment method is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Invalid deployment method {{ alertmanager_deployment_method }}!
+      Supported deployment methods are {{ alertmanager_deployment_methods | join(', ') }}.
+  when: alertmanager_deployment_method not in alertmanager_deployment_methods
+
+- name: Ensure alertmanager user '{{ alertmanager_user }}' is {{ alertmanager_state }}
   ansible.builtin.user:
     name: "{{ alertmanager_user }}"
-    state: present
+    state: "{{ alertmanager_state }}"
     system: true
   register: alertmanager_user_info
 
-- name: Ensure mounts are created
+- name: Ensure mounts are {{ alertmanager_state }}
   ansible.builtin.file:
     dest: "{{ item.path }}"
-    state: directory
+    state: "{{ (alertmanager_state == 'present') | ternary('directory', 'absent') }}"
     owner: "{{ item.owner | default(alertmanager_user_info.uid | default(alertmanager_user)) }}"
     group: "{{ item.owner | default(alertmanager_user_info.group | default(alertmanager_user)) }}"
     mode: "{{ item.mode | default('0755') }}"
@@ -24,28 +37,12 @@
     dest: "{{ alertmanager_config_file }}"
     content: "{{ alertmanager_config | to_nice_yaml }}"
     owner: "{{ alertmanager_user_info.uid | default(alertmanager_user) }}"
-    owner: "{{ alertmanager_user_info.uid | default(alertmanager_user) }}"
+    group: "{{ alertmanager_user_info.group | default(alertmanager_user) }}"
     mode: "0640"
+  when: alertmanager_state == 'present'
   notify:
     - restart-alertmanager
 
-- name: Ensure container image is present on host
-  community.docker.docker_image:
-    name: "{{ alertmanager_container_image_reference }}"
-    state: present
-    source: pull
-    force_source: "{{ alertmanager_container_image_force_pull | bool }}"
-
-- name: Ensure container '{{ alertmanager_container_name }}' is running
-  community.docker.docker_container:
-    name: "{{ alertmanager_container_name }}"
-    image: "{{ alertmanager_container_image_reference }}"
-    env: "{{ alertmanager_container_env | default(omit) }}"
-    user: "{{ alertmanager_user_info.uid | default(alertmanager_user) }}"
-    ports: "{{ alertmanager_container_ports | default(omit) }}"
-    volumes: "{{ alertmanager_container_volumes | default(omit) }}"
-    networks: "{{ alertmanager_container_networks | default(omit) }}"
-    purge_networks: "{{ alertmanager_container_purge_networks | default(omit) }}"
-    etc_hosts: "{{ alertmanager_container_etc_hosts | default(omit) }}"
-    restart_policy: "{{ alertmanager_container_restart_policy }}"
-    state: started
+- name: Deploy alertmanager using {{ alertmanager_deployment_method }}
+  ansible.builtin.include_tasks:
+    file: "deploy-{{ alertmanager_deployment_method }}.yml"

roles/alertmanager/vars/main.yml

@@ -0,0 +1,6 @@
+---
+alertmanager_states:
+  - present
+  - absent
+alertmanager_deployment_methods:
+  - docker

roles/cadvisor/defaults/main/main.yml

@@ -1,5 +1,5 @@
 ---
-cadvisor_version: "0.50.0"
+cadvisor_version: "0.51.0"
 cadvisor_state: present
 cadvisor_deployment_method: docker
 

roles/grafana/defaults/main/config.yml

@@ -1,50 +1,4 @@
 ---
-grafana_user: grafana
-grafana_version: "10.1.1"
-grafana_base_path: "/opt/grafana"
-grafana_config_path: "{{ grafana_base_path }}/config"
-grafana_config_file: "{{ grafana_config_path }}/grafana.ini"
-grafana_ldap_config_file: "{{ grafana_config_path }}/ldap.toml"
-grafana_provisioning_path: "{{ grafana_config_path }}/provisioning"
-grafana_notifier_provisioning_path: "{{ grafana_provisioning_path }}/notifiers"
-grafana_dashboard_provisioning_path: "{{ grafana_provisioning_path }}/dashboards"
-grafana_datasource_provisioning_path: "{{ grafana_provisioning_path }}/datasources"
-grafana_plugin_provisioning_path: "{{ grafana_provisioning_path }}/plugins"
-grafana_data_path: "{{ grafana_base_path }}/data"
-grafana_logs_path: "{{ grafana_base_path }}/logs"
-grafana_state: present
-
-grafana_run_user: >-
-  {{ ('uid' in (grafana_user_info | default([]))) | ternary(grafana_user_info.uid, grafana_user) }}
-grafana_run_group: >-
-  {{ ('group' in (grafana_user_info | default([]))) | ternary(grafana_user_info.group, grafana_user) }}
-
-grafana_container_image_server: "docker.io"
-grafana_container_image_namespace: "grafana"
-grafana_container_image_container: "grafana"
-grafana_container_image_name: >-
-  {{
-    [
-      ((grafana_container_image_server is defined)
-        | ternary([ grafana_container_image_server ], [])),
-      ((grafana_container_image_namespace is defined)
-        | ternary([ grafana_container_image_namespace], [])),
-      grafana_container_image_container,
-    ] | ansible.builtin.flatten | join('/')
-  }}
-grafana_container_image: >-
-  {{ grafana_container_image_name }}:{{ grafana_container_image_tag | default(grafana_version, true) }}
-
-grafana_container_name: grafana
-grafana_container_base_volumes:
-  - "{{ grafana_config_path }}:{{ grafana_container_config_path }}:ro"
-  - "{{ grafana_data_path }}:{{ grafana_container_data_path }}:rw"
-  - "{{ grafana_logs_path }}:{{ grafana_container_logs_path }}:rw"
-grafana_container_volumes: []
-grafana_container_collected_volumes: >-
-  {{ grafana_container_base_volumes + grafana_container_volumes }}
-grafana_container_restart_policy: "unless-stopped"
-
 grafana_config_log_mode:
   - console
   - file

roles/grafana/defaults/main/container.yml

@@ -0,0 +1,26 @@
+---
+grafana_container_image_server: "docker.io"
+grafana_container_image_namespace: "grafana"
+grafana_container_image_container: "grafana"
+grafana_container_image_name: >-2
+  {{
+    [
+      ((grafana_container_image_server is defined)
+        | ternary([ grafana_container_image_server ], [])),
+      ((grafana_container_image_namespace is defined)
+        | ternary([ grafana_container_image_namespace], [])),
+      grafana_container_image_container,
+    ] | ansible.builtin.flatten | join('/')
+  }}
+grafana_container_image: >-2
+  {{ grafana_container_image_name }}:{{ grafana_container_image_tag | default(grafana_version, true) }}
+
+grafana_container_name: grafana
+grafana_container_base_volumes:
+  - "{{ grafana_config_path }}:{{ grafana_container_config_path }}:ro"
+  - "{{ grafana_data_path }}:{{ grafana_container_data_path }}:rw"
+  - "{{ grafana_logs_path }}:{{ grafana_container_logs_path }}:rw"
+grafana_container_volumes: []
+grafana_container_collected_volumes: >-2
+  {{ grafana_container_base_volumes + grafana_container_volumes }}
+grafana_container_restart_policy: "unless-stopped"

roles/grafana/defaults/main/main.yml

@@ -0,0 +1,20 @@
+---
+grafana_user: grafana
+grafana_version: "11.3.0"
+grafana_base_path: "/opt/grafana"
+grafana_config_path: "{{ grafana_base_path }}/config"
+grafana_config_file: "{{ grafana_config_path }}/grafana.ini"
+grafana_ldap_config_file: "{{ grafana_config_path }}/ldap.toml"
+grafana_provisioning_path: "{{ grafana_config_path }}/provisioning"
+grafana_notifier_provisioning_path: "{{ grafana_provisioning_path }}/notifiers"
+grafana_dashboard_provisioning_path: "{{ grafana_provisioning_path }}/dashboards"
+grafana_datasource_provisioning_path: "{{ grafana_provisioning_path }}/datasources"
+grafana_plugin_provisioning_path: "{{ grafana_provisioning_path }}/plugins"
+grafana_data_path: "{{ grafana_base_path }}/data"
+grafana_logs_path: "{{ grafana_base_path }}/logs"
+grafana_state: present
+
+grafana_run_user: >-
+  {{ ('uid' in (grafana_user_info | default([]))) | ternary(grafana_user_info.uid, grafana_user) }}
+grafana_run_group: >-
+  {{ ('group' in (grafana_user_info | default([]))) | ternary(grafana_user_info.group, grafana_user) }}

roles/grafana/tasks/main.yml

@@ -2,7 +2,7 @@
 - name: Ensure grafana_state is valid
   ansible.builtin.assert:
     that:
-      - "grafana_state in ['present', 'absent']"
+      - "grafana_state in grafana_states"
     fail_msg: >-
       Only 'present' and 'absent' are allowed as values for grafana_state
 

roles/grafana/vars/main.yml

@@ -1,4 +1,7 @@
 ---
+grafana_states:
+  - present
+  - absent
 grafana_container_config_path: "/etc/grafana"
 grafana_container_data_path: "/var/lib/grafana"
 grafana_container_logs_path: "/var/log/grafana"

roles/postgres_exporter/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
 
-postgres_exporter_version: "0.10.1"
+postgres_exporter_version: "0.15.0"
 postgres_exporter_user: root
 postgres_exporter_create_user: false
 

roles/vmagent/defaults/main/main.yml

@@ -1,6 +1,6 @@
 ---
 vmagent_user: vmagent
-vmagent_version: "1.104.0"
+vmagent_version: "1.106.0"
 vmagent_state: present
 vmagent_deployment_method: "docker"
 

roles/vmalert/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 vmalert_state: present
 vmalert_user: vmalert
-vmalert_version: "1.104.0"
+vmalert_version: "1.106.0"
 vmalert_base_path: "/opt/vmalert"
 vmalert_config_path: "{{ vmalert_base_path }}/config"
 vmalert_alert_config: "{{ vmalert_config_path }}/alerts.yml"

roles/vmtsdb/defaults/main.yml

@@ -1,7 +1,7 @@
 ---
 vmtsdb_state: present
 vmtsdb_user: vmtsdb
-vmtsdb_version: "1.104.0"
+vmtsdb_version: "1.106.0"
 vmtsdb_base_path: "/opt/vmtsdb"
 vmtsdb_data_path: "{{ vmtsdb_base_path }}/data"