diff --git a/CHANGELOG.md b/CHANGELOG.md index d5410dd..459710b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,10 @@ Which is based on [Keep A Changelog](http://keepachangelog.com/) - change apt key +### Removed + +- support debian 11 + ## v1.0.0 - 2021-08-20 ### Added diff --git a/README.md b/README.md index bf76d51..2c65c3d 100644 --- a/README.md +++ b/README.md @@ -9,12 +9,10 @@ Install and configure Telegraf * Ansible >= 2.9 * Debian - * Bullseye * Bookworm ## Role variables -* `telegraf_distribution_release` - set the distribution repository name (default: `ansible_distribution_release`) * `telegraf_config` - hash with the general configuration (see [telegraf documentation](https://docs.influxdata.com/telegraf/latest/administration/configuration/)) ``` diff --git a/defaults/main.yml b/defaults/main.yml index ecacdf9..11f8a12 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,5 +1,4 @@ --- -telegraf_distribution_release: "{{ ansible_distribution_release }}" telegraf_default_config: agent: interval: 10s diff --git a/meta/main.yml b/meta/main.yml index dbecc04..fa90ba1 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -11,7 +11,6 @@ galaxy_info: platforms: - name: Debian versions: - - bullseye - bookworm galaxy_tags: diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml index 844210b..89bf10a 100644 --- a/molecule/default/molecule.yml +++ b/molecule/default/molecule.yml @@ -11,20 +11,6 @@ platforms: command: /bin/systemd capabilities: - SYS_ADMIN - - name: debian11 - image: nishiki/debian11:molecule - privileged: true - volumes: - - /sys/fs/cgroup:/sys/fs/cgroup:rw - cgroupns_mode: host - command: /bin/systemd - capabilities: - - SYS_ADMIN -provisioner: - inventory: - host_vars: - debian12: - telegraf_distribution_release: bullseye lint: | set -e yamllint . diff --git a/tasks/main.yml b/tasks/main.yml index 3bd0a9a..4447fac 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,15 +6,22 @@ - gpg tags: telegraf -- name: Add key for influx repository - ansible.builtin.apt_key: +- name: Add repository key + ansible.builtin.get_url: url: https://repos.influxdata.com/influxdata-archive_compat.key + dest: /etc/apt/keyrings/influx.asc + owner: root + group: root + mode: 0644 + checksum: sha256:393e8779c89ac8d958f81f942f9ad7fb82a25e133faddaf92e15b16e6ac9ce4c tags: telegraf -- name: Add influx repository +- name: Add repository ansible.builtin.apt_repository: + repo: > + deb [signed-by=/etc/apt/keyrings/influx.asc] + https://repos.influxdata.com/debian stable main filename: influx - repo: "deb https://repos.influxdata.com/debian {{ telegraf_distribution_release }} stable" tags: telegraf - name: Install influxdb package