Merge pull request #200 from Graylog2/release-4-0-0

Release 4.0.0

Author: etgraylog

.ansible-lint

@@ -1,6 +1,7 @@
 exclude_paths:
   - ./venv/
-  - ../../.ansible/roles/
+  - .ansible/roles/graylog2.graylog/
+  - .ansible/roles/lean_delivery.java
 parseable: true
 quiet: true
 skip_list:

.github/workflows/ci.yml

@@ -17,10 +17,10 @@ jobs:
         with:
           path: 'graylog2.graylog-ansible-role'
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.12
         uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.12'
 
       - name: Install test dependencies.
         run: pip3 install yamllint
@@ -35,11 +35,12 @@ jobs:
     strategy:
       matrix:
         distro:
-          #- centos7
-          #- centos8
-          #- ubuntu1804
-          #- ubuntu2004
-          - ubuntu2204
+#          - centos7
+#          - centos8
+#          - ubuntu1804
+#          - ubuntu2004
+#          - ubuntu2204
+          - ubuntu2404
 
     steps:
       - name: Check out the codebase.
@@ -50,17 +51,20 @@ jobs:
       - name: Set up Python 3.
         uses: actions/setup-python@v2
         with:
-          python-version: '3.9'
+          python-version: '3.12'
 
-      - name: Install test dependencies.
+      - name: Install python dependencies.
         run: pip3 install -r requirements.txt
 
+      - name: Install ansible dependencies.
+        run: ansible-galaxy role install lean_delivery.java,7.1.0
+
       - name: Run Molecule tests.
         run: molecule test --scenario-name=ci
         env:
           PY_COLORS: '1'
           ANSIBLE_FORCE_COLOR: '1'
-          #GRAYLOG_VERSION: 4.2.1
+#          GRAYLOG_VERSION: 4.2.1
           GRAYLOG_VERSION: 5.2.12
           GRAYLOG_REVISION: 1
           MOLECULE_DISTRO: ${{ matrix.distro }}
@@ -76,4 +80,4 @@ jobs:
       - name: Install Ansible.
         run: sudo apt-get install -y ansible
       - name: Install Role
-        run: ansible-galaxy install graylog2.graylog
+        run: ansible-galaxy role install graylog2.graylog

.yamllint

@@ -15,7 +15,8 @@ rules:
   commas:
     max-spaces-after: -1
     level: error
-  comments: disable
+  comments:
+    min-spaces-from-content: 1  # Ensure at least 1 space between `#` and content
   comments-indentation: disable
   document-start: disable
   empty-lines:
@@ -29,9 +30,12 @@ rules:
   new-line-at-end-of-file: disable
   new-lines:
     type: unix
+  octal-values:
+    forbid-implicit-octal: true  # Enforce explicit octal format
+    forbid-explicit-octal: true  # Prevent octal values altogether
   trailing-spaces: disable
   truthy: disable
 
 ignore: |
   .github/stale.yml
-  venv/
+  venv/

defaults/main.yml

@@ -2,8 +2,8 @@
 
 # Requirements
 graylog_java_ppa:                  "ppa:webupd8team/java"
-graylog_java_repo:                 "deb http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main"
-graylog_java_src_repo:             "deb-src http://ppa.launchpad.net/webupd8team/java/ubuntu xenial main"
+graylog_java_repo:                 "deb https://ppa.launchpad.net/webupd8team/java/ubuntu xenial main"
+graylog_java_src_repo:             "deb-src https://ppa.launchpad.net/webupd8team/java/ubuntu xenial main"
 graylog_java_repo_keyserver:       "keyserver.ubuntu.com"
 graylog_java_repo_key:             "EEA14886"
 
@@ -12,7 +12,6 @@ graylog_apt_deb_url:               "https://packages.graylog2.org/repo/packages/
 graylog_manage_apt_repo:           True
 graylog_yum_rpm_url:               "https://packages.graylog2.org/repo/packages/graylog-{{ graylog_version }}-repository_latest.rpm"
 graylog_manage_yum_repo:           True
-graylog_es_debian_pin_version:     "6.*"
 
 # General
 graylog_is_master:            True
@@ -133,20 +132,9 @@ graylog_outputbuffer_processor_threads_core_pool_size: 3
 graylog_outputbuffer_processor_threads_max_pool_size:  30
 
 # MongoDB
-graylog_mongodb_version:                             4.4
-graylog_mongodb_ubuntu_repo:                         "deb [ arch=amd64,arm64 ] http://repo.mongodb.org/apt/ubuntu {{ ansible_distribution_release }}/mongodb-org/{{ graylog_mongodb_version }} multiverse"
-graylog_mongodb_ubuntu_key:                          "https://www.mongodb.org/static/pgp/server-{{ graylog_mongodb_version }}.asc"
-graylog_mongodb_debian_repo:                         "deb http://repo.mongodb.org/apt/debian {{ ansible_distribution_release }}/mongodb-org/{{ graylog_mongodb_version }} main"
-graylog_mongodb_debian_key:                          "https://www.mongodb.org/static/pgp/server-{{ graylog_mongodb_version }}.asc"
-graylog_mongodb_redhat_repo:                         "https://repo.mongodb.org/yum/redhat/$releasever/mongodb-org/{{ graylog_mongodb_version }}/x86_64/"
-graylog_mongodb_redhat_key:                          "https://www.mongodb.org/static/pgp/server-{{ graylog_mongodb_version }}.asc"
 graylog_mongodb_uri:                                 "mongodb://127.0.0.1:27017/graylog"
 graylog_mongodb_max_connections:                     100
 graylog_mongodb_threads_allowed_to_block_multiplier: 5
-graylog_mongodb_package_name:                        mongodb-org
-graylog_mongodb_service_name:                        mongod
-graylog_mongodb_bind_ip:                             "127.0.0.1"
-graylog_mongodb_bind_port:                           "27017"
 
 # Drools
 graylog_rules_file: ""
@@ -189,15 +177,12 @@ graylog_gc_warning_threshold: "1s"
 graylog_server_heap_size:     "1500m"
 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_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:          ""
 graylog_server_wrapper:       ""
 
 # Install Switches
-graylog_install_elasticsearch: True
-graylog_install_mongodb:       True
-graylog_install_nginx:         False    #Deprecated
-graylog_install_java:          True
+graylog_install_java:          False
 
 # Disable steps which break tests
 graylog_not_testing:           True

handlers/main.yml

@@ -1,17 +1,16 @@
 ---
-
 - name: "reload systemd configuration"
-  systemd:
+  ansible.builtin.systemd:
     daemon_reload: yes
 
 - name: "restart graylog-server"
-  service:
+  ansible.builtin.service:
     name: "graylog-server"
     state: "restarted"
     enabled: "yes"
 
 - name: "restart mongod"
-  service:
+  ansible.builtin.service:
     name: "{{ graylog_mongodb_service_name }}"
     state: "restarted"
     enabled: "yes"

meta/main.yml

@@ -5,19 +5,13 @@ dependencies:
     version: 7.1.0
     when: graylog_install_java
 
-  - role: "elastic.elasticsearch"
-    src: https://github.com/elastic/ansible-elasticsearch.git
-    version: main
-    scm: git
-    when: graylog_install_elasticsearch
-
 galaxy_info:
   role_name: graylog
-  namespace: Graylog2
+  namespace: graylog2
   author: "Marius Sturm"
   company: "Graylog, Inc."
   description: "Install and configure Graylog log management."
-  min_ansible_version: "2.13.13"
+  min_ansible_version: "2.18.2"
   license: "Apache 2"
   platforms:
     - name: "EL"

molecule/ci/converge.yml

@@ -9,7 +9,7 @@
       apt:
         update_cache: yes
         pkg:
-          - "openjdk-8-jre"
+          - "openjdk-17-jre"
           - "gpg-agent"
           - "curl"
         state: "latest"
@@ -18,43 +18,30 @@
       apt:
         update_cache: yes
         pkg:
-          - "openjdk-11-jre"
+          - "openjdk-17-jre"
           - "gpg-agent"
           - "curl"
         state: "latest"
       when: ansible_distribution == 'Debian'
     - name: Install packages (Centos/Redhat)
       yum:
         name:
-          - java-1.8.0-openjdk
+          - java-1.17.0-openjdk
         state: latest
       when: ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux'
 
 - hosts: "all"
   vars:
-    #Elasticsearch vars
-    es_major_version: "7.x"
-    es_version: "7.10.2"
-    es_enable_xpack: False
-    es_instance_name: "graylog"
-    es_heap_size: "1g"
-    es_config:
-      node.name: "graylog"
-      cluster.name: "graylog"
-      http.port: 9200
-      transport.tcp.port: 9300
-      network.host: "127.0.0.1"
-      discovery.seed_hosts: "localhost:9300"
-      cluster.initial_master_nodes: "graylog"
-    oss_version: True
-    es_action_auto_create_index: False
 
-    #Graylog vars
-    graylog_version: 4.2
+    # Graylog vars
+    graylog_version: 6.1
     graylog_install_java: False
     graylog_install_enterprise_plugins: True
     graylog_install_integrations_plugins: True
     graylog_install_enterprise_integrations_plugins: True
+    graylog_install_open_package: True
+    graylog_install_enterprise_package: False
+    graylog_not_testing: False
     graylog_password_secret: "2jueVqZpwLLjaWxV"
     graylog_root_password_sha2: "8c6976e5b5410415bde908bd4dee15dfb167a9c873fc4bb8a81f6f2ab448a918"
     graylog_http_bind_address: "{{ ansible_default_ipv4.address }}:9000"

molecule/ci/molecule.yml

@@ -1,21 +1,22 @@
 ---
 dependency:
   name: galaxy
+  options:
+    role-file: requirements.yml
+    ignore-errors: true
 driver:
   name: docker
 platforms:
   - name: graylog
-    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible
-    command: '/sbin/init'
+    image: geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2204}-ansible
+    pre_build_image: true
+    command: ""
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    networks:
-      - name: "graylog"
-    network_mode: "graylog"
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
     published_ports:
       - "0.0.0.0:9000:9000/tcp"
     privileged: true
-    pre_build_image: true
+    cgroupns_mode: host
 provisioner:
   name: ansible
 verifier:

molecule/ci/tests/test_default.py

@@ -10,56 +10,6 @@
 from selenium.common.exceptions import TimeoutException
 from selenium.common.exceptions import NoSuchElementException
 
-def test_service_elasticsearch_running(host):
-    print("\nEnsure Elasticsearch is running...")
-    assert host.service("elasticsearch").is_running is True
-
-def test_service_mongodb_running(host):
-    print("Ensure MongoDB is running...")
-    mongodb_service_name = 'mongod'
-    assert host.service(mongodb_service_name).is_running is True
-
 def test_is_graylog_installed(host):
     print("Ensure graylog-server package is installed...")
-    assert host.package('graylog-server').is_installed
-
-def test_service_graylog_running(host):
-    print("Ensure graylog-server service is running...")
-    assert host.service("graylog-server").is_running is True
-
-def test_service_graylog_started(host):
-    print("Waiting for Graylog to start up...")
-    end_time = time.time() + 90
-    server_up = 1
-
-    while server_up != 0 and time.time() < end_time:
-        time.sleep(2)
-        server_up = host.run_test("cat /var/log/graylog-server/server.log | grep 'Graylog server up and running.'").exit_status
-
-    assert server_up == 0
-
-def test_service_graylog_plugins_loaded(host):
-    print("Checking if plugins loaded...")
-    results = host.run_test('curl -u admin:admin http://' + host.interface('eth0').addresses[0] + ':9000/api/system/plugins')
-    plugins = json.loads(results.stdout)
-
-    enterprise_plugin_loaded = False
-    integrations_plugin_loaded = False
-    enterprise_integrations_plugin_loaded = False
-
-    for plugin in plugins['plugins']:
-      if plugin['name'] == 'Graylog Enterprise':
-        enterprise_plugin_loaded = True
-        assert os.environ['GRAYLOG_VERSION'] in plugin['version']
-
-      if plugin['name'] == 'Integrations':
-        integrations_plugin_loaded = True
-        assert os.environ['GRAYLOG_VERSION'] in plugin['version']
-
-      if plugin['name'] == 'Graylog Enterprise':
-        enterprise_integrations_plugin_loaded = True
-        assert os.environ['GRAYLOG_VERSION'] in plugin['version']
-
-    assert enterprise_plugin_loaded is True
-    assert integrations_plugin_loaded is True
-    assert enterprise_integrations_plugin_loaded is True
+    assert host.package('graylog-server').is_installed

molecule/default/converge.yml

@@ -2,8 +2,7 @@
 - name: Converge
   hosts: all
   vars:
-    #Graylog
-    graylog_install_elasticsearch: True
+    # Graylog
     graylog_install_mongodb:       True
     graylog_install_java:          False
     graylog_not_testing:           False
@@ -16,29 +15,7 @@
     graylog_http_publish_uri:      "http://{{ hostvars[inventory_hostname]['ansible_default_ipv4']['address'] }}:9000/"
     graylog_http_external_uri:     "http://localhost:9000/"
 
-    #Elasticsearch
-    es_major_version: "6.x"
-    es_version: "6.8.10"
-    es_instance_name: "graylog"
-    es_scripts: False
-    es_templates: False
-    es_version_lock: False
-    es_heap_size: "1g"
-    es_java_install: True
-    update_java: True
-    oss_version: True
-
-    es_config:
-      node.name: "graylog"
-      cluster.name: "graylog"
-      http.port: 9200
-      transport.tcp.port: 9300
-      network.host: "0.0.0.0"
-      node.data: True
-      node.master: True
-
-
-    #Plugins
+    # Plugins
     graylog_install_enterprise_plugins:               True
     graylog_install_integrations_plugins:             True
     graylog_install_enterprise_integrations_plugins:  True