update(cadvisor): bump version to 0.50.0

README.md

@@ -11,6 +11,9 @@ metrics or alerting.
   alertmanager for receiving alerts from prometheus and routing them
   to the correct configured receivers.
 
+- [`cadvisor`](roles/cadvisor/README.md): Run and configure cAdvisor, googles'
+  container performance and resource usage collection and aggregation daemon.
+
 - [`grafana`](roles/grafana/README.md): a popular visualization and
   dashboard creation tool able to use various datasources.
 

roles/cadvisor/defaults/main.yml

@@ -1,52 +0,0 @@
----
-cadvisor_version: 0.49.1
-
-cadvisor_container_name: cadvisor
-cadvisor_container_image_name: gcr.io/cadvisor/cadvisor
-cadvisor_container_image_tag: ~
-cadvisor_container_image_ref: >-
-  {{ cadvisor_container_image_name }}:{{ cadvisor_container_image_tag | default('v' + cadvisor_version, True) }}
-cadvisor_container_volumes: >-
-  {{ cadvisor_container_base_volumes + cadvisor_container_extra_volumes | default([], True) }}
-cadvisor_container_extra_volumes: ~
-cadvisor_container_env: ~
-cadvisor_container_labels: "{{ cadvisor_container_base_labels | combine(cadvisor_container_extra_labels) }}"
-cadvisor_container_extra_labels: {}
-cadvisor_container_ports: ~
-cadvisor_container_networks: ~
-cadvisor_container_etc_hosts: ~
-cadvisor_container_devices: [ "/dev/kmsg:/dev/kmsg:rwm" ]
-cadvisor_container_privileged: yes
-cadvisor_container_pid_mode: "host"
-cadvisor_container_userns_mode: "host"
-cadvisor_container_capabilities: ~
-cadvisor_container_restart_policy: unless-stopped
-cadvisor_container_command: >-2
-  {{ ["--docker_only=false"]
-    + (["--disable_metrics=" + cadvisor_disabled_metrics | join( ',' )]
-      if cadvisor_disabled_metrics | default(false, True) else [])
-    + (["--enable_metrics=" +  cadvisor_force_enable_metrics | join( ',' )]
-      if cadvisor_force_enable_metrics | default(false, True) else [])
-  }}
-cadvisor_container_base_labels:
-  version: "{{ cadvisor_version }}"
-cadvisor_container_base_volumes:
-  - "/:/rootfs:ro"
-  - "/var/run:/var/run:ro"
-  - "/sys:/sys:ro"
-  - "/var/lib/docker/:/var/lib/docker:ro"
-  - "/dev/disk/:/dev/disk:ro"
-
-cadvisor_disabled_metrics:
-  - advtcp
-  - cpu_topology
-  - cpuset
-  - hugetlb
-  - memory_numa
-  - process
-  - referenced_memory
-  - resctrl
-  - sched
-  - tcp
-  - udp
-cadvisor_force_enable_metrics: []

roles/cadvisor/defaults/main/container.yml

@@ -0,0 +1,56 @@
+---
+cadvisor_container_image_registry: gcr.io
+cadvisor_container_image_namespace: cadvisor
+cadvisor_container_image_name: cadvisor
+cadvisor_container_image: >-2
+  {{
+    [
+      cadvisor_container_image_registry,
+      cadvisor_container_image_namespace,
+      cadvisor_container_image_name,
+    ] | flatten | join('/')
+  }}
+cadvisor_container_image_tag: ~
+cadvisor_container_image_ref: >-2
+  {{ cadvisor_container_image }}:{{ cadvisor_container_image_tag | default('v' + cadvisor_version, true) }}
+cadvisor_container_image_source: pull
+cadvisor_container_image_force_source: >-2
+  {{ cadvisor_container_image_tag | default(false, true) | bool }}
+
+cadvisor_container_state: >-2
+  {{ (cadvisor_state == 'present') | ternary('started', 'absent') }}
+
+cadvisor_container_name: cadvisor
+cadvisor_container_volumes: >-2
+  {{ cadvisor_container_base_volumes + cadvisor_container_extra_volumes | default([], true) }}
+cadvisor_container_extra_volumes: ~
+cadvisor_container_env: ~
+cadvisor_container_labels: >-2
+  {{ cadvisor_container_base_labels | combine(cadvisor_container_extra_labels) }}
+cadvisor_container_extra_labels: {}
+cadvisor_container_ports: ~
+cadvisor_container_networks: ~
+cadvisor_container_etc_hosts: ~
+cadvisor_container_devices:
+  - "/dev/kmsg:/dev/kmsg:rwm"
+cadvisor_container_privileged: true
+cadvisor_container_pid_mode: "host"
+cadvisor_container_userns_mode: "host"
+cadvisor_container_capabilities: ~
+cadvisor_container_restart_policy: "unless-stopped"
+cadvisor_container_command: >-2
+  {{ ["--docker_only=false"]
+    + (["--disable_metrics=" + cadvisor_disabled_metrics | join( ',' )]
+      if cadvisor_disabled_metrics | default(false, true) else [])
+    + (["--enable_metrics=" +  cadvisor_force_enable_metrics | join( ',' )]
+      if cadvisor_force_enable_metrics | default(false, true) else [])
+  }}
+cadvisor_container_base_labels:
+  version: "{{ cadvisor_version }}"
+cadvisor_container_base_volumes:
+  - "/:/rootfs:ro"
+  - "/var/run:/var/run:ro"
+  - "/sys:/sys:ro"
+  - "/var/lib/docker/:/var/lib/docker:ro"
+  - "/dev/disk/:/dev/disk:ro"
+

roles/cadvisor/defaults/main/main.yml

@@ -0,0 +1,18 @@
+---
+cadvisor_version: "0.50.0"
+cadvisor_state: present
+cadvisor_deployment_method: docker
+
+cadvisor_disabled_metrics:
+  - advtcp
+  - cpu_topology
+  - cpuset
+  - hugetlb
+  - memory_numa
+  - process
+  - referenced_memory
+  - resctrl
+  - sched
+  - tcp
+  - udp
+cadvisor_force_enable_metrics: []

roles/cadvisor/meta/main.yml

@@ -0,0 +1,11 @@
+---
+allow_duplicates: true
+dependencies: []
+galaxy_info:
+  role_name: cadvisor
+  description: Deploy cadvisor (Container Advisor), a container performance and resource usage aggregation daemon
+  galaxy_tags:
+    - cadvisor
+    - observability
+    - container
+    - docker

roles/cadvisor/tasks/deploy-docker.yml

@@ -0,0 +1,25 @@
+---
+- name: Ensure cadvisor container image '{{ cadvisor_container_image_ref }}' is {{ cadvisor_state }}
+  community.docker.docker_image:
+    name: "{{ cadvisor_container_image_ref }}"
+    state: "{{ cadvisor_state }}"
+    source: "{{ cadvisor_container_image_source }}"
+    force_source: "{{ cadvisor_container_image_force_source }}"
+
+- name: Ensure cadvisor container '{{ cadvisor_container_name }}' is {{ cadvisor_container_state }}
+  community.docker.docker_container:
+    name: "{{ cadvisor_container_name }}"
+    image: "{{ cadvisor_container_image_ref }}"
+    env: "{{ cadvisor_container_env | default(omit, true) }}"
+    ports: "{{ cadvisor_container_ports | default(omit, true) }}"
+    labels: "{{ cadvisor_container_labels }}"
+    devices: "{{ cadvisor_container_devices }}"
+    volumes: "{{ cadvisor_container_volumes }}"
+    networks: "{{ cadvisor_container_networks | default(omit, true) }}"
+    etc_hosts: "{{ cadvisor_container_etc_hosts | default(omit, true) }}"
+    privileged: "{{ cadvisor_container_privileged }}"
+    command: "{{ cadvisor_container_command }}"
+    pid_mode: "{{ cadvisor_container_pid_mode | default(omit, true) }}"
+    userns_mode: "{{ cadvisor_container_userns_mode | default(omit, true) }}"
+    restart_policy: "{{ cadvisor_container_restart_policy }}"
+    state: "{{ cadvisor_container_state }}"

roles/cadvisor/tasks/main.yml

@@ -1,26 +1,18 @@
 ---
+- name: Ensure state is valid
+  ansible.builtin.fail:
+    msg: >-2
+      Unknown state '{{ cadvisor_state }}'! Supported
+      states are: {{ cadvisor_states | join(', ') }}.
+  when: cadvisor_state not in cadvisor_states
 
-- name: Ensure container image is present
+- name: Ensure deployment method is valid
-  docker_image:
+  ansible.builtin.fail:
-    name: "{{ cadvisor_container_image_ref }}"
+    msg: >-2
-    state: present
+      Unknown deployment method '{{ cadvisor_deployment_method }}'! Supported
-    source: pull
+      deployment methods are: {{ cadvisor_deployment_methods | join(', ') }}.
-    force_source: "{{ cadvisor_container_image_tag|default(False, True) | bool }}"
+  when: cadvisor_deployment_method not in cadvisor_deployment_methods
 
-- name: Ensure cadvisor container is running
+- name: Deploy using {{ cadvisor_deployment_method }}
-  docker_container:
+  ansible.builtin.include_tasks:
-    name: "{{ cadvisor_container_name }}"
+    file: "deploy-{{ cadvisor_deployment_method }}.yml"
-    image: "{{ cadvisor_container_image_ref }}"
-    env: "{{ cadvisor_container_env | default(omit, True) }}"
-    ports: "{{ cadvisor_container_ports | default(omit, True) }}"
-    labels: "{{ cadvisor_container_labels }}"
-    devices: "{{ cadvisor_container_devices }}"
-    volumes: "{{ cadvisor_container_volumes }}"
-    networks: "{{ cadvisor_container_networks | default(omit, True) }}"
-    etc_hosts: "{{ cadvisor_container_etc_hosts | default(omit, True) }}"
-    privileged: "{{ cadvisor_container_privileged }}"
-    command: "{{ cadvisor_container_command }}"
-    pid_mode: "{{ cadvisor_container_pid_mode | default(omit, True) }}"
-    userns_mode: "{{ cadvisor_container_userns_mode | default(omit, True) }}"
-    restart_policy: "{{ cadvisor_container_restart_policy }}"
-    state: started

roles/cadvisor/vars/main.yml

@@ -0,0 +1,6 @@
+---
+cadvisor_states:
+  - present
+  - absent
+cadvisor_deployment_methods:
+  - docker

roles/vmagent/defaults/main/config.yml

@@ -1,7 +1,7 @@
 ---
 vmagent_config_global_scrape_interval: "30s"
 vmagent_config_global_scrape_timeout: "10s"
-vmagent_config_global_external_labels: []
+vmagent_config_global_external_labels: {}
 vmagent_config_scrape_configs: []
 
 vmagent_config: ~

roles/vmagent/defaults/main/container.yml

@@ -29,6 +29,7 @@ vmagent_container_command: >-2
   -{{ flag }}
   {% endfor -%}
 vmagent_container_networks: ~
+vmagent_container_network_mode: ~
 vmagent_container_etc_hosts: ~
 vmagent_container_dns_servers: ~
 vmagent_container_restart_policy: >-2
@@ -52,3 +53,7 @@ vmagent_container_env: ~
 vmagent_container_merged_env: >-2
   {{ (vmagent_container_base_env | default({}, true))
     | combine(vmagent_container_env | default({})) }}
+vmagent_container_comparisons:
+  env: allow_more_present
+  image: strict
+  labels: allow_more_present

roles/vmagent/tasks/deploy-docker.yml

@@ -23,5 +23,7 @@
     networks: "{{ vmagent_container_networks | default(omit, true) }}"
     etc_hosts: "{{ vmagent_container_etc_hosts | default(omit, true) }}"
     dns_servers: "{{ vmagent_container_dns_servers | default(omit, true) }}"
+    network_mode: "{{ vmagent_container_network_mode | default(omit, true) }}"
     restart_policy: "{{ vmagent_container_restart_policy | default(omit, true) }}"
+    comparisons: "{{ vmagent_container_comparisons | default(omit, true) }}"
     state: "{{ vmagent_container_state }}"