added yaml 1.2.2 compatibility (#176)

This commit is contained in:
A. Binzxxxxxx
2023-10-20 17:16:45 +02:00
committed by GitHub
parent 4064c8b040
commit f241fd34d0
8 changed files with 41 additions and 41 deletions

View File

@ -5,9 +5,9 @@
service: service:
name: telegraf name: telegraf
state: restarted state: restarted
enabled: yes enabled: true
when: not telegraf_agent_docker when: not telegraf_agent_docker
become: yes become: true
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
- name: "Restart Telegraf container" - name: "Restart Telegraf container"

View File

@ -35,7 +35,7 @@
until: are_telegraf_dependencies_packages_installed is succeeded until: are_telegraf_dependencies_packages_installed is succeeded
when: when:
- not apt_https_transport.stat.exists - not apt_https_transport.stat.exists
become: yes become: true
- name: "Debian | Configure Telegraf apt repository" - name: "Debian | Configure Telegraf apt repository"
when: when:
@ -49,7 +49,7 @@
state: present state: present
register: are_telegraf_dependencies_keys_installed register: are_telegraf_dependencies_keys_installed
until: are_telegraf_dependencies_keys_installed is succeeded 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) - when: (ansible_distribution == "Debian" and ansible_distribution_major_version|int >= 9) or (ansible_distribution == "Ubuntu" and ansible_distribution_major_version|int >= 18)
block: block:
- name: "Debian | Ensure the shared keyrings directory exists" - name: "Debian | Ensure the shared keyrings directory exists"
@ -66,7 +66,7 @@
mode: 0755 mode: 0755
when: when:
- not usr_share_keyrings.stat.exists - not usr_share_keyrings.stat.exists
become: yes become: true
- name: "Debian | Install Telegraf apt key" - name: "Debian | Install Telegraf apt key"
get_url: get_url:
@ -74,7 +74,7 @@
dest: /usr/share/keyrings/influxdata-archive.asc dest: /usr/share/keyrings/influxdata-archive.asc
register: are_telegraf_dependencies_keys_installed register: are_telegraf_dependencies_keys_installed
until: are_telegraf_dependencies_keys_installed is succeeded until: are_telegraf_dependencies_keys_installed is succeeded
become: yes become: true
- name: "Debian | Set Telegraf apt repository parameters" - name: "Debian | Set Telegraf apt repository parameters"
set_fact: set_fact:
@ -92,7 +92,7 @@
copy: copy:
content: "deb {{ telegraf_repository_params | default('') }} https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} stable" 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 dest: /etc/apt/sources.list.d/telegraf.list
become: yes become: true
when: when:
- ansible_lsb is not defined or ansible_lsb.codename is not defined - ansible_lsb is not defined or ansible_lsb.codename is not defined
@ -100,11 +100,11 @@
apt: apt:
name: "{{ telegraf_agent_package }}" name: "{{ telegraf_agent_package }}"
state: "{{ telegraf_agent_package_state }}" state: "{{ telegraf_agent_package_state }}"
update_cache: yes update_cache: true
register: is_telegraf_package_installed register: is_telegraf_package_installed
until: is_telegraf_package_installed is succeeded until: is_telegraf_package_installed is succeeded
notify: "Restart Telegraf" notify: "Restart Telegraf"
become: yes become: true
when: when:
- telegraf_agent_package_method == "repo" - telegraf_agent_package_method == "repo"
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
@ -113,11 +113,11 @@
apt: apt:
name: "{{ telegraf_agent_package }}" name: "{{ telegraf_agent_package }}"
state: "{{ telegraf_agent_package_state }}" state: "{{ telegraf_agent_package_state }}"
update_cache: yes update_cache: true
register: is_telegraf_package_installed register: is_telegraf_package_installed
until: is_telegraf_package_installed is succeeded until: is_telegraf_package_installed is succeeded
notify: "Restart Telegraf" notify: "Restart Telegraf"
become: yes become: true
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
- name: "Debian | Download Telegraf package (online)" - name: "Debian | Download Telegraf package (online)"
@ -135,11 +135,11 @@
apt: apt:
deb: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}" deb: "{{ telegraf_agent_package_path }}/{{ telegraf_agent_package }}"
state: "present" state: "present"
allow_downgrade: yes allow_downgrade: true
register: is_telegraf_package_installed register: is_telegraf_package_installed
until: is_telegraf_package_installed is succeeded until: is_telegraf_package_installed is succeeded
notify: "Restart Telegraf" notify: "Restart Telegraf"
become: yes become: true
when: when:
- telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline" - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
@ -148,6 +148,6 @@
file: file:
path: "/etc/apt/sources.list.d/telegraf.list" path: "/etc/apt/sources.list.d/telegraf.list"
state: absent state: absent
become: yes become: true
when: when:
- telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline" - telegraf_agent_package_method == "online" or telegraf_agent_package_method == "offline"

View File

@ -20,7 +20,7 @@
baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}" baseurl: "{{ telegraf_yum_baseurl[ansible_distribution|lower] | default(telegraf_yum_baseurl['default']) }}"
gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}" gpgcheck: "{{ telegraf_yum_gpgcheck | default('true') }}"
gpgkey: "{{ telegraf_yum_gpgkey }}" gpgkey: "{{ telegraf_yum_gpgkey }}"
become: yes become: true
when: when:
- telegraf_agent_package_method == "repo" - telegraf_agent_package_method == "repo"
@ -41,6 +41,6 @@
state: "{{ telegraf_agent_package_state }}" state: "{{ telegraf_agent_package_state }}"
register: is_telegraf_package_installed register: is_telegraf_package_installed
until: is_telegraf_package_installed is succeeded until: is_telegraf_package_installed is succeeded
become: yes become: true
notify: "Restart Telegraf" notify: "Restart Telegraf"
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"

View File

@ -10,7 +10,7 @@
name: telegraf name: telegraf
group: telegraf group: telegraf
state: present state: present
become: yes become: true
- name: "Suse | Install repo dependencies for Python 2" - name: "Suse | Install repo dependencies for Python 2"
zypper: zypper:
@ -21,7 +21,7 @@
state: present state: present
register: are_telegraf_dependencies_packages_installed register: are_telegraf_dependencies_packages_installed
until: are_telegraf_dependencies_packages_installed is succeeded until: are_telegraf_dependencies_packages_installed is succeeded
become: yes become: true
when: ansible_python.version.major == 2 when: ansible_python.version.major == 2
- name: "Suse | Install repo dependencies for Python >= 3" - name: "Suse | Install repo dependencies for Python >= 3"
@ -32,7 +32,7 @@
state: present state: present
register: are_telegraf_dependencies_packages_installed register: are_telegraf_dependencies_packages_installed
until: are_telegraf_dependencies_packages_installed is succeeded until: are_telegraf_dependencies_packages_installed is succeeded
become: yes become: true
when: ansible_python.version.major >= 3 when: ansible_python.version.major >= 3
- name: "Suse | Add default Open Build Service repository" - name: "Suse | Add default Open Build Service repository"
@ -42,7 +42,7 @@
state: present state: present
runrefresh: True runrefresh: True
auto_import_keys: True auto_import_keys: True
become: yes become: true
when: telegraf_zypper_baseurl is not defined when: telegraf_zypper_baseurl is not defined
- name: "Suse | Add specified package repository" - name: "Suse | Add specified package repository"
@ -52,7 +52,7 @@
state: present state: present
runrefresh: True runrefresh: True
auto_import_keys: True auto_import_keys: True
become: yes become: true
when: telegraf_zypper_baseurl is defined when: telegraf_zypper_baseurl is defined
- name: "Suse | Install Telegraf" - name: "Suse | Install Telegraf"
@ -61,7 +61,7 @@
state: "{{ telegraf_agent_package_state }}" state: "{{ telegraf_agent_package_state }}"
register: is_telegraf_package_installed register: is_telegraf_package_installed
until: is_telegraf_package_installed is succeeded until: is_telegraf_package_installed is succeeded
become: yes become: true
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"
- name: "Suse | Create directories for telegraf" - name: "Suse | Create directories for telegraf"

View File

@ -28,7 +28,7 @@
owner: telegraf owner: telegraf
group: telegraf group: telegraf
mode: 0640 mode: 0640
become: yes become: true
when: when:
- telegraf_agent_version is version('0.10.0', '<') - telegraf_agent_version is version('0.10.0', '<')
notify: notify:
@ -42,7 +42,7 @@
owner: telegraf owner: telegraf
group: telegraf group: telegraf
mode: 0640 mode: 0640
become: yes become: true
when: when:
- telegraf_agent_version is version('0.10.0', '>=') - telegraf_agent_version is version('0.10.0', '>=')
notify: notify:
@ -63,7 +63,7 @@
when: when:
- telegraf_plugins_extra_exclusive - telegraf_plugins_extra_exclusive
- telegraf_directory.stat.exists - telegraf_directory.stat.exists
become: yes become: true
notify: notify:
- Restart Telegraf - Restart Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -78,7 +78,7 @@
when: when:
- telegraf_plugins_extra_exclusive - telegraf_plugins_extra_exclusive
- telegraf_directory.stat.exists - telegraf_directory.stat.exists
become: yes become: true
notify: notify:
- Restart Telegraf - Restart Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -97,7 +97,7 @@
- telegraf_plugins_extra is defined - telegraf_plugins_extra is defined
- telegraf_plugins_extra is iterable - telegraf_plugins_extra is iterable
- item.value.state|default('present') != 'absent' - item.value.state|default('present') != 'absent'
become: yes become: true
notify: notify:
- Restart Telegraf - Restart Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -113,7 +113,7 @@
- telegraf_plugins_extra is defined - telegraf_plugins_extra is defined
- telegraf_plugins_extra is iterable - telegraf_plugins_extra is iterable
- item.value.state|default('present') == 'absent' - item.value.state|default('present') == 'absent'
become: yes become: true
notify: notify:
- Restart Telegraf - Restart Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -126,7 +126,7 @@
name: telegraf name: telegraf
state: "{{ telegraf_enabled | ternary('started', 'stopped') }}" state: "{{ telegraf_enabled | ternary('started', 'stopped') }}"
enabled: "{{ telegraf_enabled }}" enabled: "{{ telegraf_enabled }}"
become: yes become: true
when: not telegraf_agent_docker when: not telegraf_agent_docker
ignore_errors: "{{ ansible_check_mode }}" ignore_errors: "{{ ansible_check_mode }}"

View File

@ -28,7 +28,7 @@
owner: "{{ telegraf_mac_user }}" owner: "{{ telegraf_mac_user }}"
group: "{{ telegraf_mac_group }}" group: "{{ telegraf_mac_group }}"
mode: 0640 mode: 0640
become: yes become: true
when: when:
- telegraf_agent_version is version('0.10.0', '<') - telegraf_agent_version is version('0.10.0', '<')
notify: notify:
@ -42,7 +42,7 @@
owner: "{{ telegraf_mac_user }}" owner: "{{ telegraf_mac_user }}"
group: "{{ telegraf_mac_group }}" group: "{{ telegraf_mac_group }}"
mode: 0640 mode: 0640
become: yes become: true
when: when:
- telegraf_agent_version is version('0.10.0', '>=') - telegraf_agent_version is version('0.10.0', '>=')
notify: notify:
@ -63,7 +63,7 @@
when: when:
- telegraf_plugins_extra_exclusive - telegraf_plugins_extra_exclusive
- telegraf_directory.stat.exists - telegraf_directory.stat.exists
become: yes become: true
notify: notify:
- Restart MacOS Telegraf - Restart MacOS Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -78,7 +78,7 @@
when: when:
- telegraf_plugins_extra_exclusive - telegraf_plugins_extra_exclusive
- telegraf_directory.stat.exists - telegraf_directory.stat.exists
become: yes become: true
notify: notify:
- Restart MacOS Telegraf - Restart MacOS Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -97,7 +97,7 @@
- telegraf_plugins_extra is defined - telegraf_plugins_extra is defined
- telegraf_plugins_extra is iterable - telegraf_plugins_extra is iterable
- item.value.state|default('present') != 'absent' - item.value.state|default('present') != 'absent'
become: yes become: true
notify: notify:
- Restart MacOS Telegraf - Restart MacOS Telegraf
- Restart Telegraf container - Restart Telegraf container
@ -113,7 +113,7 @@
- telegraf_plugins_extra is defined - telegraf_plugins_extra is defined
- telegraf_plugins_extra is iterable - telegraf_plugins_extra is iterable
- item.value.state|default('present') == 'absent' - item.value.state|default('present') == 'absent'
become: yes become: true
notify: notify:
- Restart MacOS Telegraf - Restart MacOS Telegraf
- Restart Telegraf container - Restart Telegraf container

View File

@ -31,7 +31,7 @@
win_copy: win_copy:
src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}\telegraf.exe' src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}\telegraf.exe'
dest: '{{ telegraf_win_install_dir }}\telegraf.exe' dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
remote_src: yes remote_src: true
when: telegraf_agent_version is version('1.15', '>=') when: telegraf_agent_version is version('1.15', '>=')
- name: "Windows | Unzip file" - name: "Windows | Unzip file"
@ -39,14 +39,14 @@
src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip' src: '{{ telegraf_win_install_dir }}\telegraf-{{ telegraf_agent_version }}_windows_amd64.zip'
dest: '{{ telegraf_win_install_dir }}' dest: '{{ telegraf_win_install_dir }}'
creates: '{{ telegraf_win_install_dir }}\telegraf.exe' creates: '{{ telegraf_win_install_dir }}\telegraf.exe'
delete_archive: yes delete_archive: true
when: telegraf_agent_version is version('1.15', '<') when: telegraf_agent_version is version('1.15', '<')
- name: "Windows | Move extracted executable" - name: "Windows | Move extracted executable"
win_copy: win_copy:
src: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe' src: '{{ telegraf_win_install_dir }}\telegraf\telegraf.exe'
dest: '{{ telegraf_win_install_dir }}\telegraf.exe' dest: '{{ telegraf_win_install_dir }}\telegraf.exe'
remote_src: yes remote_src: true
when: telegraf_agent_version is version('1.15', '<') when: telegraf_agent_version is version('1.15', '<')
- name: "Windows | Configure Telegraf" - name: "Windows | Configure Telegraf"

View File

@ -15,7 +15,7 @@
home: /etc/telegraf home: /etc/telegraf
uid: "{{ telegraf_uid_docker }}" uid: "{{ telegraf_uid_docker }}"
system: True system: True
become: yes become: true
- name: Create /etc/telegraf (home) directory - name: Create /etc/telegraf (home) directory
file: file:
@ -24,7 +24,7 @@
group: telegraf group: telegraf
mode: 0750 mode: 0750
state: directory state: directory
become: yes become: true
- name: Create /etc/telegraf.d directory - name: Create /etc/telegraf.d directory
file: file:
@ -33,7 +33,7 @@
group: telegraf group: telegraf
mode: 0750 mode: 0750
state: directory state: directory
become: yes become: true
- name: Ensure Telegraf Docker container is running - name: Ensure Telegraf Docker container is running
docker_container: docker_container: