Remove Java management

README.md

@@ -21,7 +21,6 @@ Role Variables
 
 * *logstash_enable*: Start and enable Logstash service (default: `true`)
 * *logstash_release*: Major release of Logstash to install (default: `7`)
-* *logstash_manage_java*: Make sure Java is installed (default: `true`)
 * *logstash_config_backup*: Keep backups of all changed configuration (defualt: `no`)
 * *logstash_manage_yaml*: Manage and overwrite `logstash.yml` (default: `true`)
 

defaults/main.yml

@@ -2,7 +2,6 @@
 # defaults file for logstash
 logstash_enable: true
 logstash_release: 7
-logstash_manage_java: true
 logstash_config_backup: no
 logstash_manage_yaml: true
 

tasks/main.yml

@@ -1,4 +1,92 @@
 ---
-# tasks file for logstash
-- import_tasks: linux.yml
-  when: ansible_system|lower == 'linux'
+- import_tasks: redhat.yml
+  when: ansible_os_family|lower == 'redhat'
+
+- name: Ensure Logstash is installed
+  package:
+    name: logstash
+
+- name: Configure Logstash
+  template:
+    src: logstash.yml.j2
+    dest: /etc/logstash/logstash.yml
+    owner: root
+    group: root
+    mode: 0644
+    backup: "{{ logstash_config_backup }}"
+  notify:
+    - Restart Logstash
+  when: logstash_manage_yaml | bool
+
+- name: Create Logstash pipeline directories
+  file:
+    path: "/etc/logstash/conf.d/{{ logstash_pipelines[item].name }}"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+  with_items: "{{ logstash_pipelines }}"
+  when: logstash_manage_pipelines | bool
+
+- name: Check out pipeline configuration
+  git:
+    repo: "{{ logstash_pipelines[item].source }}"
+    dest: "/etc/logstash/conf.d/{{ logstash_pipelines[item].name }}"
+    version: master
+  with_items: "{{ logstash_pipelines }}"
+  when: logstash_manage_pipelines | bool
+  notify:
+    - Restart Logstash noauto
+
+- name: Create directory for default Elasticsearch output pipeline
+  file:
+    path: "/etc/logstash/conf.d/ansible-forwarder"
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+  when: logstash_elasticsearch_output | bool
+
+- name: Create default Elasticsearch output pipeline inputs
+  template:
+    src: redis-input.conf.j2
+    dest: "/etc/logstash/conf.d/ansible-forwarder/input.conf"
+    owner: root
+    group: root
+    mode: 0644
+  when: logstash_elasticsearch_output | bool
+  notify:
+    - Restart Logstash noauto
+
+- name: Create default Elasticsearch output pipeline output
+  template:
+    src: elasticsearch-output.conf.j2
+    dest: "/etc/logstash/conf.d/ansible-forwarder/output.conf"
+    owner: root
+    group: root
+    mode: 0644
+  when: logstash_elasticsearch_output | bool
+  notify:
+    - Restart Logstash noauto
+
+- name: Configure Logstash pipelines
+  template:
+    src: pipelines.yml.j2
+    dest: /etc/logstash/pipelines.yml
+    owner: root
+    group: root
+    mode: 0644
+    backup: "{{ logstash_config_backup }}"
+  when: logstash_manage_pipelines | bool
+
+- import_tasks: full_stack_security.yml
+  when: elastic_stack_full_stack | bool and logstash_security | bool
+  tags:
+    - security
+
+- name: Start Logstash
+  service:
+    name: logstash
+    state: started
+    enabled: yes
+  when: logstash_enable | bool

tasks/redhat.yml

@@ -12,10 +12,3 @@
     baseurl: https://artifacts.elastic.co/packages/{{ logstash_release }}.x/yum
     gpgcheck: yes
     gpgkey: https://artifacts.elastic.co/GPG-KEY-elasticsearch
-
-- name: Ensure Java is installed (RedHat)
-  package:
-    name: java
-  when: logstash_manage_java | bool
-# Do not place Java and Logtsash installations in one task. Java must be installed *before* yum is called to install Logstash
-