diff --git a/roles/fluentbit/fluent-bit.conf.j2 b/fluent-bit.conf.j2 similarity index 100% rename from roles/fluentbit/fluent-bit.conf.j2 rename to fluent-bit.conf.j2 diff --git a/fluentbit.yml b/fluentbit.yml index 8a98a62..fa06f7b 100644 --- a/fluentbit.yml +++ b/fluentbit.yml @@ -1,10 +1,40 @@ - name: Install fluentbit hosts: hypervisors, vms - pre_tasks: + handlers: + - name: restart fluent-bit + systemd: + name: fluent-bit + state: restarted + + tasks: - name: Install packages apt: pkg: gpg - roles: - - {role: fluentbit, tags: fluentbit} + - name: Install APT key + apt_key: + url: https://packages.fluentbit.io/fluentbit.key + state: present + + - name: Install APT repository + apt_repository: + repo: "deb https://packages.fluentbit.io/debian/{{ ansible_distribution_release }} {{ ansible_distribution_release }} main" + state: present + update_cache: true + + - name: Install fluent-bit + apt: + name: fluent-bit + + - name: Copy fluent-bit configuration + template: + src: "fluent-bit.conf.j2" + dest: /etc/fluent-bit/fluent-bit.conf + notify: restart fluent-bit + + - name: Copy fluent-bit parsers configuration + template: + src: "parsers.conf.j2" + dest: /etc/fluent-bit/parsers.conf + notify: restart fluent-bit diff --git a/roles/fluentbit/vars/main.yml b/inventory/group_vars/all.yml similarity index 100% rename from roles/fluentbit/vars/main.yml rename to inventory/group_vars/all.yml diff --git a/roles/fluentbit/parsers.conf.j2 b/parsers.conf.j2 similarity index 100% rename from roles/fluentbit/parsers.conf.j2 rename to parsers.conf.j2 diff --git a/roles/fluentbit/handlers/main.yml b/roles/fluentbit/handlers/main.yml deleted file mode 100644 index eb43e6e..0000000 --- a/roles/fluentbit/handlers/main.yml +++ /dev/null @@ -1,4 +0,0 @@ -- name: restart fluent-bit - systemd: - name: fluent-bit - state: restarted diff --git a/roles/fluentbit/tasks/main.yml b/roles/fluentbit/tasks/main.yml deleted file mode 100644 index 389526d..0000000 --- a/roles/fluentbit/tasks/main.yml +++ /dev/null @@ -1,26 +0,0 @@ -- name: Install APT key - apt_key: - url: https://packages.fluentbit.io/fluentbit.key - state: present - -- name: Install APT repository - apt_repository: - repo: "deb https://packages.fluentbit.io/debian/{{ ansible_distribution_release }} {{ ansible_distribution_release }} main" - state: present - update_cache: true - -- name: Install fluent-bit - apt: - name: fluent-bit - -- name: Copy fluent-bit configuration - template: - src: "{{ role_path }}/fluent-bit.conf.j2" - dest: /etc/fluent-bit/fluent-bit.conf - notify: restart fluent-bit - -- name: Copy fluent-bit parsers configuration - template: - src: "{{ role_path }}/parsers.conf.j2" - dest: /etc/fluent-bit/parsers.conf - notify: restart fluent-bit