Merge branch 'master' of github.com:dj-wasabi/ansible-telegraf

2025-07-17 08:46:37 +00:00 · 2023-10-20 17:18:11 +02:00
parent fdcff0b195 94774fbc8d
commit ccdb9bd98e
10 changed files with 54 additions and 46 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -12,6 +12,16 @@

 - Replace apt\_key with get\_url [\#170](https://github.com/dj-wasabi/ansible-telegraf/pull/170) ([danclough](https://github.com/danclough))

+**Closed issues:**
+
+- Failure due to apt-key when run against newer Debian/Ubuntu releases [\#169](https://github.com/dj-wasabi/ansible-telegraf/issues/169)
+
+**Merged pull requests:**
+
+- replace depracted aws module [\#178](https://github.com/dj-wasabi/ansible-telegraf/pull/178) ([ThorstenHeck](https://github.com/ThorstenHeck))
+- added yaml 1.2.2 compatibility [\#176](https://github.com/dj-wasabi/ansible-telegraf/pull/176) ([DEvil0000](https://github.com/DEvil0000))
+- Migrate from io to diskio to fix deprecation warning [\#173](https://github.com/dj-wasabi/ansible-telegraf/pull/173) ([mprasil](https://github.com/mprasil))
+
 ## [0.14.0](https://github.com/dj-wasabi/ansible-telegraf/tree/0.14.0) (2023-01-30)

 [Full Changelog](https://github.com/dj-wasabi/ansible-telegraf/compare/0.13.3...0.14.0)
--- a/defaults/main.yml
+++ b/defaults/main.yml
@ -55,7 +55,7 @@ telegraf_plugins_default:
    config:
      - percpu = true
  - plugin: disk
-  - plugin: io
+  - plugin: diskio
  - plugin: mem
  - plugin: net
  - plugin: system
--- a/handlers/main.yml
+++ b/handlers/main.yml
@ -5,9 +5,9 @@
  service:
    name: telegraf
    state: restarted
-    enabled: yes
+    enabled: true
  when: not telegraf_agent_docker
-  become: yes
+  become: true
  ignore_errors: "{{ ansible_check_mode }}"

 - name: "Restart Telegraf container"
--- a/tasks/Debian.yml
+++ b/tasks/Debian.yml
@ -35,7 +35,7 @@
  until: are_telegraf_dependencies_packages_installed is succeeded
  when:
    - not apt_https_transport.stat.exists
-  become: yes
+  become: true

 - name: "Debian | Configure Telegraf apt repository"
  when:
@ -49,7 +49,7 @@
        state: present
      register: are_telegraf_dependencies_keys_installed
      until: are_telegraf_dependencies_keys_installed is succeeded
-      become: yes
+      become: true
    - when: (ansible_distribution == "Debian" and ansible_distribution_major_version|int >= 9) or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 18)
      block:  
        - name: "Debian | Ensure the shared keyrings directory exists"
@ -66,7 +66,7 @@
            mode: 0755
          when:
            - not usr_share_keyrings.stat.exists
-          become: yes
+          become: true
          
        - name: "Debian | Install Telegraf apt key"
          get_url:
@ -74,7 +74,7 @@
            dest: /usr/share/keyrings/influxdata-archive.asc
          register: are_telegraf_dependencies_keys_installed
          until: are_telegraf_dependencies_keys_installed is succeeded
-          become: yes
+          become: true

        - name: "Debian | Set Telegraf apt repository parameters"
          set_fact: 
@ -92,7 +92,7 @@
      copy:
        content: "deb {{ telegraf_repository_params | default('') }} https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable"
        dest: /etc/apt/sources.list.d/telegraf.list
-      become: yes
+      become: true
      when:
        - ansible_lsb is not defined or ansible_lsb.codename is not defined
    
@ -100,11 +100,11 @@
      apt:
        name: "{{ telegraf_agent_package }}"
        state: "{{ telegraf_agent_package_state }}"
-        update_cache: yes
+        update_cache: true
      register: is_telegraf_package_installed
      until: is_telegraf_package_installed is succeeded
      notify: "Restart Telegraf"
-      become: yes
+      become: true
      when:
        - telegraf_agent_package_method == "repo"
      ignore_errors: "{{ ansible_check_mode }}"
@ -113,11 +113,11 @@
      apt:
        name: "{{ telegraf_agent_package }}"
        state: "{{ telegraf_agent_package_state }}"
-        update_cache: yes
+        update_cache: true
      register: is_telegraf_package_installed
      until: is_telegraf_package_installed is succeeded
      notify: "Restart Telegraf"
-      become: yes
+      become: true
      ignore_errors: "{{ ansible_check_mode }}"

 - name: "Debian | Download Telegraf package (online)"
@ -135,11 +135,11 @@
  apt:
    deb: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
    state: "present"
-    allow_downgrade: yes
+    allow_downgrade: true
  register: is_telegraf_package_installed
  until: is_telegraf_package_installed is succeeded
  notify: "Restart Telegraf"
-  become: yes
+  become: true
  when:
    - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"
  ignore_errors: "{{ ansible_check_mode }}"
@ -148,6 +148,6 @@
  file:
    path: "/etc/apt/sources.list.d/telegraf.list"
    state: absent
-  become: yes
+  become: true
  when:
    - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"
--- a/tasks/RedHat.yml
+++ b/tasks/RedHat.yml
@ -20,7 +20,7 @@
    baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}"
    gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}"
    gpgkey: "{{ telegraf_yum_gpgkey }}"
-  become: yes
+  become: true
  when:
    - telegraf_agent_package_method == "repo"

@ -41,6 +41,6 @@
    state: "{{ telegraf_agent_package_state }}"
  register: is_telegraf_package_installed
  until: is_telegraf_package_installed is succeeded
-  become: yes
+  become: true
  notify: "Restart Telegraf"
  ignore_errors: "{{ ansible_check_mode }}"
--- a/tasks/Suse.yml
+++ b/tasks/Suse.yml
@ -10,7 +10,7 @@
    name: telegraf
    group: telegraf
    state: present
-  become: yes
+  become: true

 - name: "Suse | Install repo dependencies for Python 2"
  zypper:
@ -21,7 +21,7 @@
    state: present
  register: are_telegraf_dependencies_packages_installed
  until: are_telegraf_dependencies_packages_installed is succeeded
-  become: yes
+  become: true
  when: ansible_python.version.major == 2

 - name: "Suse | Install repo dependencies for Python >= 3"
@ -32,7 +32,7 @@
    state: present
  register: are_telegraf_dependencies_packages_installed
  until: are_telegraf_dependencies_packages_installed is succeeded
-  become: yes
+  become: true
  when: ansible_python.version.major >= 3

 - name: "Suse | Add default Open Build Service repository"
@ -42,7 +42,7 @@
    state: present
    runrefresh: True
    auto_import_keys: True
-  become: yes
+  become: true
  when: telegraf_zypper_baseurl is not defined

 - name: "Suse | Add specified package repository"
@ -52,7 +52,7 @@
    state: present
    runrefresh: True
    auto_import_keys: True
-  become: yes
+  become: true
  when: telegraf_zypper_baseurl is defined

 - name: "Suse | Install Telegraf"
@ -61,7 +61,7 @@
    state: "{{ telegraf_agent_package_state }}"
  register: is_telegraf_package_installed
  until: is_telegraf_package_installed is succeeded
-  become: yes
+  become: true
  ignore_errors: "{{ ansible_check_mode }}"

 - name: "Suse | Create directories for telegraf"
--- a/tasks/configure_linux.yml
+++ b/tasks/configure_linux.yml
@ -13,10 +13,9 @@
    - ansible_os_family == "FreeBSD"

 - name: Retrieve all ec2 tags on the instance
-  ec2_tag:
+  amazon.aws.ec2_tag_info:
    region: '{{ ansible_ec2_placement_region }}'
    resource: '{{ ansible_ec2_instance_id }}'
-    state: list
  when:
    - telegraf_agent_aws_tags
  register: ec2_tags
@ -28,7 +27,7 @@
    owner: telegraf
    group: telegraf
    mode: 0640
-  become: yes
+  become: true
  when:
    - telegraf_agent_version is version('0.10.0', '<')
  notify:
@ -42,7 +41,7 @@
    owner: telegraf
    group: telegraf
    mode: 0640
-  become: yes
+  become: true
  when:
    - telegraf_agent_version is version('0.10.0', '>=')
  notify:
@ -63,7 +62,7 @@
  when:
    - telegraf_plugins_extra_exclusive
    - telegraf_directory.stat.exists
-  become: yes
+  become: true
  notify:
    - Restart Telegraf
    - Restart Telegraf container
@ -78,7 +77,7 @@
  when:
    - telegraf_plugins_extra_exclusive
    - telegraf_directory.stat.exists
-  become: yes
+  become: true
  notify:
    - Restart Telegraf
    - Restart Telegraf container
@ -97,7 +96,7 @@
    - telegraf_plugins_extra is defined
    - telegraf_plugins_extra is iterable
    - item.value.state|default('present') != 'absent'
-  become: yes
+  become: true
  notify:
    - Restart Telegraf
    - Restart Telegraf container
@ -113,7 +112,7 @@
    - telegraf_plugins_extra is defined
    - telegraf_plugins_extra is iterable
    - item.value.state|default('present') == 'absent'
-  become: yes
+  become: true
  notify:
    - Restart Telegraf
    - Restart Telegraf container
@ -126,7 +125,7 @@
    name: telegraf
    state: "{{ telegraf_enabled | ternary('started', 'stopped') }}"
    enabled: "{{ telegraf_enabled }}"
-  become: yes
+  become: true
  when: not telegraf_agent_docker
  ignore_errors: "{{ ansible_check_mode }}"

--- a/tasks/configure_macos.yml
+++ b/tasks/configure_macos.yml
@ -13,10 +13,9 @@
    - ansible_os_family in ["FreeBSD", "Darwin"]

 - name: Retrieve all ec2 tags on the instance
-  ec2_tag:
+  amazon.aws.ec2_tag_info:
    region: '{{ ansible_ec2_placement_region }}'
    resource: '{{ ansible_ec2_instance_id }}'
-    state: list
  when:
    - telegraf_agent_aws_tags
  register: ec2_tags
@ -28,7 +27,7 @@
    owner: "{{ telegraf_mac_user }}"
    group: "{{ telegraf_mac_group }}"
    mode: 0640
-  become: yes
+  become: true
  when:
    - telegraf_agent_version is version('0.10.0', '<')
  notify:
@ -42,7 +41,7 @@
    owner: "{{ telegraf_mac_user }}"
    group: "{{ telegraf_mac_group }}"
    mode: 0640
-  become: yes
+  become: true
  when:
    - telegraf_agent_version is version('0.10.0', '>=')
  notify:
@ -63,7 +62,7 @@
  when:
    - telegraf_plugins_extra_exclusive
    - telegraf_directory.stat.exists
-  become: yes
+  become: true
  notify:
    - Restart MacOS Telegraf
    - Restart Telegraf container
@ -78,7 +77,7 @@
  when:
    - telegraf_plugins_extra_exclusive
    - telegraf_directory.stat.exists
-  become: yes
+  become: true
  notify:
    - Restart MacOS Telegraf
    - Restart Telegraf container
@ -97,7 +96,7 @@
    - telegraf_plugins_extra is defined
    - telegraf_plugins_extra is iterable
    - item.value.state|default('present') != 'absent'
-  become: yes
+  become: true
  notify:
    - Restart MacOS Telegraf
    - Restart Telegraf container
@ -113,7 +112,7 @@
    - telegraf_plugins_extra is defined
    - telegraf_plugins_extra is iterable
    - item.value.state|default('present') == 'absent'
-  become: yes
+  become: true
  notify:
    - Restart MacOS Telegraf
    - Restart Telegraf container
--- a/tasks/configure_windows.yml
+++ b/tasks/configure_windows.yml
@ -31,7 +31,7 @@
  win_copy:
    src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}\telegraf.exe'
    dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
-    remote_src: yes
+    remote_src: true
  when: telegraf_agent_version is version('1.15', '>=')

 - name: "Windows | Unzip file"
@ -39,14 +39,14 @@
    src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip'
    dest: '{{ telegraf_win_install_dir }}'
    creates: '{{ telegraf_win_install_dir }}\telegraf.exe'
-    delete_archive: yes
+    delete_archive: true
  when: telegraf_agent_version is version('1.15', '<')

 - name: "Windows | Move extracted executable"
  win_copy:
    src: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe'
    dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
-    remote_src: yes
+    remote_src: true
  when: telegraf_agent_version is version('1.15', '<')

 - name: "Windows | Configure Telegraf"
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@ -15,7 +15,7 @@
    home: /etc/telegraf
    uid: "{{ telegraf_uid_docker }}"
    system: True
-  become: yes
+  become: true

 - name: Create /etc/telegraf (home) directory
  file:
@ -24,7 +24,7 @@
    group: telegraf
    mode: 0750
    state: directory
-  become: yes
+  become: true

 - name: Create /etc/telegraf.d directory
  file:
@ -33,7 +33,7 @@
    group: telegraf
    mode: 0750
    state: directory
-  become: yes
+  become: true

 - name: Ensure Telegraf Docker container is running
  docker_container: