feat: support zabbix installation on suse (ansible-collections#1194)

emrocha · Jul 1, 2024 · 6c694cd · 6c694cd
1 parent 7e85893
commit 6c694cd
Show file tree

Hide file tree

Showing 50 changed files with 426 additions and 108 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -33,6 +33,7 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          - opensuseleap15
         version:
           - v70
           - v64

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -33,6 +33,7 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          - opensuseleap15
         version:
           - v70
           - v64

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -33,6 +33,7 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          - opensuseleap15
         collection_role:
           - zabbix_proxy
         database:
@@ -43,7 +44,6 @@ jobs:
           - v70
           - v64
           - v60
-
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/repo.yml b/.github/workflows/repo.yml
@@ -27,6 +27,7 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          - opensuseleap15
         collection_role:
           - zabbix_repo
         version:

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -33,6 +33,7 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          - opensuseleap15
         collection_role:
           - zabbix_server
         database:

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -33,12 +33,14 @@ jobs:
           - ubuntu2004
           - debian12
           - debian11
+          # - opensuseleap15
         collection_role:
           - zabbix_web
         database:
           - mysql
           - pgsql
         web_server:
+          # maybe add apache?
           - nginx
           - apache
         version:

diff --git a/changelogs/fragments/pr_1194.yml b/changelogs/fragments/pr_1194.yml
@@ -0,0 +1,2 @@
+major_changes:
+  - All Roles - Add support for openSUSE Leap 15 and SLES 15.
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -89,15 +89,16 @@ To successfully complete the install the role requires `python-netaddr` on the c
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.4 | 6.0 |
-|---------------------|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |
+| Zabbix              | 7.0 | 6.4 | 6.0 |
+|---------------------|-----|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |  V  |
+| Suse Fam 15         |  V  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -34,15 +34,16 @@ So, you'll need one of those operating systems.. :-)
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.0 |
-|---------------------|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |
+| Zabbix              | 7.0 | 6.4 | 6.0 |
+|---------------------|-----|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |  V  |
+| Suse Fam 15         |  V  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -77,15 +77,16 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.0 |
-|---------------------|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |
+| Zabbix              | 7.0 | 6.4 | 6.0 |
+|---------------------|-----|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |  V  |
+| Suse Fam 15         |  V  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/docs/ZABBIX_REPO_ROLE.md b/docs/ZABBIX_REPO_ROLE.md
@@ -35,15 +35,16 @@ Please send Pull Requests or suggestions when you want to use this role for othe
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.4 | 6.0 |
-|---------------------|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |
+| Zabbix              | 7.0 | 6.4 | 6.0 |
+|---------------------|-----|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
+| Ubuntu 20.04 focal  |  V  |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |  V  |
+| Debian 11 bullseye  |  V  |  V  |  V  |
+| Suse Fam 15         |  V  |  V  |  V  |
 
 # Installation
 
@@ -68,6 +69,10 @@ Please be aware that this role only installs the repo itself.  It is generally u
 * `zabbix_repo_yum_gpg_check`: Optional.  Yum should check GPG keys.  Default: 0
 * `zabbix_repo_yum_gpg_key_url`: The URL to download the Zabbix GPG key from. Default: `http://repo.zabbix.com/RPM-GPG-KEY-ZABBIX-08EFA7DD`
 * `zabbix_repo_yum_schema`: Default: `https`. Option to change the web schema for the yum repository(http/https)
+* `zabbix_repo_zypper`: A list with zypper repository configuration.
+* `zabbix_repo_zypper_auto_import_keys`: Optional. Zypper should import GPG keys automatically. Default: true
+* `zabbix_repo_zypper_disable_gpg_check`: Optional. Zypper shouldn't check GPG keys.  Default: false
+* `zabbix_repo_zypper_schema`: Default: `https`. Option to change the web schema for the zypper repository(http/https)
 
 # Example Playbook
 

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -75,15 +75,16 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.4 | 6.0 |
-|---------------------|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |
-| Ubuntu 24.04 noble  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |
-| Debian 12 bookworm  |  V  |  V  |
-| Debian 11 bullseye  |  V  |  V  |
+| Zabbix              | 7.0 | 6.4 | 6.0 |
+|---------------------|-----|-----|-----|
+| Red Hat Fam 9       |  V  |  V  |  V  |
+| Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |  V  |  V  |
+| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
+| Ubuntu 20.04 focal  |     |  V  |  V  |
+| Debian 12 bookworm  |  V  |  V  |  V  |
+| Debian 11 bullseye  |     |  V  |  V  |
+| Suse Fam 15         |  V  |  V  |  V  |
 
 You can bypass this matrix by setting `enable_version_check: false`
 

diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -11,7 +11,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - agent
       - ${MY_MOLECULE_VERSION:-v70}

diff --git a/molecule/zabbix_agent_tests/common/playbooks/prepare.yml b/molecule/zabbix_agent_tests/common/playbooks/prepare.yml
@@ -36,10 +36,18 @@
         - ansible_os_family == 'Debian'
 
     - name: "Installing packages on Suse family"
-      ansible.builtin.shell: zypper install -y python-xml python-libxml2 net-tools which
+      community.general.zypper:
+        name:
+          - python3-xml
+          - python3-libxml2
+          - net-tools
+          - iproute2
+          - which
+        state: present
       register: zabbix_agent_prepare_packages_install
       until: zabbix_agent_prepare_packages_install is succeeded
-      when: ansible_os_family == 'Suse'
+      when:
+        - ansible_os_family == 'Suse'
       tags:
         - skip_ansible_lint
 

diff --git a/molecule/zabbix_agent_tests/common/tests/common/test_agent.py b/molecule/zabbix_agent_tests/common/tests/common/test_agent.py
@@ -9,10 +9,8 @@
 
 
 def test_zabbixagent_running_and_enabled(host, zabbix_agent_service):
-    # Find out why this is not working for linuxmint and opensuse
-    if host.system_info.distribution not in ["linuxmint", "opensuse", "ubuntu"]:
-        assert zabbix_agent_service.is_running
-        assert zabbix_agent_service.is_enabled
+    assert zabbix_agent_service.is_running
+    assert zabbix_agent_service.is_enabled
 
 
 def test_zabbix_agent_dot_conf(zabbix_agent_conf):
@@ -32,9 +30,7 @@ def test_zabbix_include_dir(zabbix_agent_include_dir):
 
 
 def test_socket(host):
-    # Find out why this is not working for linuxmint and opensus
-    if host.system_info.distribution not in ["linuxmint", "opensuse"]:
-        assert host.socket("tcp://0.0.0.0:10050").is_listening
+    assert host.socket("tcp://0.0.0.0:10050").is_listening
 
 
 # def test_zabbix_package(host, zabbix_agent_package):

diff --git a/molecule/zabbix_agent_tests/molecule/agent2/tests/conftest.py b/molecule/zabbix_agent_tests/molecule/agent2/tests/conftest.py
@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        passwd = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        passwd = host.file("/etc/zabbix/zabbix_agent2.conf")
-
-    return passwd
+    return host.file("/etc/zabbix/zabbix_agent2.conf")
 
 
 @pytest.fixture

diff --git a/molecule/zabbix_agent_tests/molecule/agent2autopsk/tests/conftest.py b/molecule/zabbix_agent_tests/molecule/agent2autopsk/tests/conftest.py
@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        passwd = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        passwd = host.file("/etc/zabbix/zabbix_agent2.conf")
-
-    return passwd
+    return host.file("/etc/zabbix/zabbix_agent2.conf")
 
 
 @pytest.fixture

diff --git a/molecule/zabbix_agent_tests/molecule/autopsk/tests/conftest.py b/molecule/zabbix_agent_tests/molecule/autopsk/tests/conftest.py
@@ -10,12 +10,7 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        conf_file = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        conf_file = host.file("/etc/zabbix/zabbix_agentd.conf")
-
-    return conf_file
+    return host.file("/etc/zabbix/zabbix_agentd.conf")
 
 
 @pytest.fixture

diff --git a/molecule/zabbix_agent_tests/molecule/default/tests/conftest.py b/molecule/zabbix_agent_tests/molecule/default/tests/conftest.py
@@ -10,16 +10,13 @@
 
 @pytest.fixture
 def zabbix_agent_conf(host):
-    if host.system_info.distribution in ["opensuse"]:
-        conf_file = host.file("/etc/zabbix/zabbix-agentd.conf")
-    else:
-        conf_file = host.file("/etc/zabbix/zabbix_agentd.conf")
-
-    return conf_file
+    return host.file("/etc/zabbix/zabbix_agentd.conf")
 
 
 @pytest.fixture
 def zabbix_agent_service(host):
+    if host.system_info.distribution == "opensuse-leap" and host.ansible.get_variables().get("zabbix_agent2", False):
+        return host.service("zabbix-agent2")
     return host.service("zabbix-agent")
 
 

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -11,7 +11,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_VERSION:-v70}
 provisioner:

diff --git a/molecule/zabbix_javagateway/prepare.yml b/molecule/zabbix_javagateway/prepare.yml
@@ -20,15 +20,15 @@
         state: absent
         regexp: "path-exclude=/usr/share/doc/*"
       when:
-        - ansible_os_family != 'RedHat'
+        - ansible_os_family == 'Debian'
 
     # https://github.com/geerlingguy/ansible-role-java/issues/64
     - name: "Apt update"
       ansible.builtin.shell: "apt-get update && mkdir -p /usr/share/man/man1"
       register: installation_dependencies
       until: installation_dependencies is succeeded
       when:
-        - ansible_os_family != 'RedHat'
+        - ansible_os_family == 'Debian'
 
     - name: "Installing packages on NON-CentOS"
       ansible.builtin.apt:
@@ -46,4 +46,15 @@
       register: installation_dependencies
       until: installation_dependencies is succeeded
       when:
-        - ansible_os_family != 'RedHat'
+        - ansible_os_family == 'Debian'
+
+    - name: "Installing packages on Suse"
+      community.general.zypper:
+        name:
+          - iproute2
+          - which
+        state: present
+      register: installation_dependencies
+      until: installation_dependencies is succeeded
+      when:
+        - ansible_os_family == 'Suse'
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -10,7 +10,8 @@ platforms:
     networks:
       - name: zabbix
     volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+      - /sys/fs/cgroup:/sys/fs/cgroup:rw
+    cgroupns_mode: host
     groups:
       - ${MY_MOLECULE_DATABASE:-mysql}
       - ${MY_MOLECULE_VERSION:-v70}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		major_changes:
		- All Roles - Add support for openSUSE Leap 15 and SLES 15.