From b1fdb8c7d9fb64393220f4f96fa91656dbc23734 Mon Sep 17 00:00:00 2001
From: xtruthx <xtruthx@unwahrscheinlichkeitsdrive.de>
Date: Mon, 24 Apr 2023 14:19:58 +0200
Subject: [PATCH 1/2] make usage of bundled openjdk possible by choice

---
 templates/graylog.server.default.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/graylog.server.default.j2 b/templates/graylog.server.default.j2
index bda3fdf..4cdb915 100644
--- a/templates/graylog.server.default.j2
+++ b/templates/graylog.server.default.j2
@@ -1,4 +1,6 @@
+{% if graylog_server_java is defined and graylog_server_java|length %}
 JAVA="{{ graylog_server_java }}"
+{% endif %}
 GRAYLOG_SERVER_JAVA_OPTS="{{ graylog_server_java_opts }}"
 GRAYLOG_SERVER_ARGS="{{ graylog_server_args }}"
 GRAYLOG_COMMAND_WRAPPER="{{ graylog_server_wrapper }}"

From 32c90757cce12aef69cd8440cf0d0750fadc4e8c Mon Sep 17 00:00:00 2001
From: xtruthx <xtruthx@unwahrscheinlichkeitsdrive.de>
Date: Mon, 24 Apr 2023 14:32:33 +0200
Subject: [PATCH 2/2] add installation methods for new graylog packaging up to
 version 5.x with open and enterprise package

---
 defaults/main.yml      | 12 ++++++++++--
 tasks/setup-Debian.yml | 15 +++++++++++++++
 tasks/setup-RedHat.yml | 17 ++++++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/defaults/main.yml b/defaults/main.yml
index 3e033f9..c8814e0 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -187,7 +187,7 @@ graylog_web_thread_pool_size:        16
 # JVM
 graylog_gc_warning_threshold: "1s"
 graylog_server_heap_size:     "1500m"
-graylog_server_java:          "/usr/bin/java"
+graylog_server_java:          "/usr/bin/java" # For usage of the bundled openjdk version within graylog leave varviable blank
 graylog_server_java_opts_extra: ""
 graylog_server_java_opts:     "-Djava.net.preferIPv4Stack=true -Xms{{ graylog_server_heap_size }} -Xmx{{ graylog_server_heap_size }} -XX:NewRatio=1 -server -XX:+ResizeTLAB -XX:-OmitStackTraceInFastThrow {{graylog_server_java_opts_extra}}"
 graylog_server_args:          ""
@@ -202,11 +202,19 @@ graylog_install_java:          True
 # Disable steps which break tests
 graylog_not_testing:           True
 
-# Plugins
+# Plugins for Graylog Versions <5.0
 graylog_install_enterprise_plugins:               False
 graylog_install_integrations_plugins:             False
 graylog_install_enterprise_integrations_plugins:  False
 
+# package version for Graylog Version >=5.0
+graylog_install_enterprise_package: False
+graylog_install_open_package:       True
+
+# Graylog Version to install
+graylog_version: 5.0
+graylog_full_version: ""
+
 graylog_additional_config: {}
 
 required_vars:
diff --git a/tasks/setup-Debian.yml b/tasks/setup-Debian.yml
index 3ecebf5..5981204 100644
--- a/tasks/setup-Debian.yml
+++ b/tasks/setup-Debian.yml
@@ -28,6 +28,21 @@
   apt:
     name: "graylog-server{% if graylog_full_version is defined %}={{ graylog_full_version }}{% endif %}"
     state: "{{ graylog_package_state }}"
+  when: (graylog_install_enterprise_package | bool == false and graylog_version is version('5.0', '<'))
+  notify: "restart graylog-server"
+
+- name: "Graylog Open server package should be installed"
+  apt:
+    name: "graylog-server{% if graylog_full_version is defined %}={{ graylog_full_version }}{% endif %}"
+    state: "{{ graylog_package_state }}"
+  when: (graylog_install_enterprise_package | bool == false and graylog_version is version('5.0', '>='))
+  notify: "restart graylog-server"
+
+- name: "Graylog Enterprise server package should be installed"
+  apt:
+    name: "graylog-enterprise{% if graylog_full_version is defined %}={{ graylog_full_version }}{% endif %}"
+    state: "{{ graylog_package_state }}"
+  when: (graylog_install_enterprise_package | bool == true and graylog_version is version('5.0', '>='))
   notify: "restart graylog-server"
 
 - name: "setup-Debian.yml | Set elasticsearch priority to {{ graylog_es_debian_pin_version }} apt_preferences"
diff --git a/tasks/setup-RedHat.yml b/tasks/setup-RedHat.yml
index 8d44a23..b2dd4c6 100644
--- a/tasks/setup-RedHat.yml
+++ b/tasks/setup-RedHat.yml
@@ -12,7 +12,22 @@
   yum:
     name: "graylog-server{% if graylog_full_version is defined %}-{{ graylog_full_version }}{% endif %}"
     state: "{{ graylog_package_state }}"
-  notify: restart graylog-server
+  when: (graylog_install_enterprise_package | bool == false and graylog_version is version('5.0', '<'))
+  notify: "restart graylog-server"
+
+- name: "Graylog Open server package should be installed"
+  yum:
+    name: "graylog-server{% if graylog_full_version is defined %}-{{ graylog_full_version }}{% endif %}"
+    state: "{{ graylog_package_state }}"
+  when: (graylog_install_enterprise_package | bool == false and graylog_version is version('5.0', '>='))
+  notify: "restart graylog-server"
+
+- name: "Graylog Enterprise server package should be installed"
+  yum:
+    name: "graylog-enterprise{% if graylog_full_version is defined %}-{{ graylog_full_version }}{% endif %}"
+    state: "{{ graylog_package_state }}"
+  when: (graylog_install_enterprise_package | bool == true and graylog_version is version('5.0', '>='))
+  notify: "restart graylog-server"
 
 - name: "Installing graylog-enterprise-plugins"
   yum: