Skip to content

Commit

Permalink
Merge branch 'master' of github.com:dj-wasabi/ansible-telegraf
Browse files Browse the repository at this point in the history
  • Loading branch information
dj-wasabi committed Feb 17, 2024
2 parents d36c400 + 171ecb0 commit 39bc504
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 14 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

**Merged pull requests:**

- Bump ansible-core from 2.15.2 to 2.15.9 [\#182](https://github.com/dj-wasabi/ansible-telegraf/pull/182) ([dependabot[bot]](https://github.com/apps/dependabot))
- Bump ansible from 8.2.0 to 8.5.0 [\#181](https://github.com/dj-wasabi/ansible-telegraf/pull/181) ([dependabot[bot]](https://github.com/apps/dependabot))
- Change Debian repo location [\#179](https://github.com/dj-wasabi/ansible-telegraf/pull/179) ([danclough](https://github.com/danclough))
- 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))
Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ansible==8.2.0
ansible==8.5.0
ansible-compat==4.1.7
ansible-core==2.15.2
ansible-core==2.15.9
docker==6.1.3
molecule==6.0.1
molecule-docker==2.1.0
Expand Down
14 changes: 2 additions & 12 deletions tasks/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,11 @@
set_fact:
telegraf_repository_params: "[signed-by=/usr/share/keyrings/influxdata-archive.asc]"

- name: "Debian | Add Telegraf repository (using LSB)"
copy:
content: "deb {{ telegraf_repository_params | default('') }} https://repos.influxdata.com/{{ ansible_distribution|lower }} {{ ansible_lsb.codename }} stable"
dest: /etc/apt/sources.list.d/telegraf.list
when:
- ansible_lsb is defined
- ansible_lsb.codename is defined

- name: "Debian | Add Telegraf repository"
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 }} stable main"
dest: /etc/apt/sources.list.d/telegraf.list
become: true
when:
- ansible_lsb is not defined or ansible_lsb.codename is not defined
become: yes

- name: "Debian | Install Telegraf package (repo)"
apt:
Expand Down

0 comments on commit 39bc504

Please sign in to comment.