Merge branch '3.0.0' into remove_old_os

ansible-collections · Oct 22, 2023 · 0cfa768 · 0cfa768
2 parents ce360be + 79af636
commit 0cfa768
Show file tree

Hide file tree

Showing 36 changed files with 60 additions and 240 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -22,23 +22,19 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - centos7
           - ubuntu2204
           - ubuntu2004
           - debian12
           - debian11
           - debian10
         version:
-            - v64
-            - v62
             - v60
         scenario_name:
           - default
           - autopsk
           - agent2
           - agent2autopsk
-        exclude:
-          - container: debian12
-            version: v62
 
     steps:
       - name: Check out code

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -29,16 +29,11 @@ jobs:
           - debian11
           - debian10
         version:
-          - v64
-          - v62
           - v60
         include:
           - interpreter: python3
           - interpreter: python
             container: centos7
-        exclude:
-          - container: debian12
-            version: v62
         collection_role:
           - zabbix_javagateway
     steps:

diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
@@ -21,8 +21,6 @@ jobs:
       matrix:
         zabbix_container:
           - version: "6.0"
-          - version: "6.2"
-          - version: "6.4"
         ansible:
           # https://docs.ansible.com/ansible/latest/reference_appendices/release_and_maintenance.html#ansible-core-changelogs
           - stable-2.12

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -35,8 +35,6 @@ jobs:
           - pgsql
           - sqlite3
         version:
-          - v64
-          - v62
           - v60
         include:
           - interpreter: python3

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -33,18 +33,9 @@ jobs:
           - mysql
           - pgsql
         version:
-          - v64
-          - v62
           - v60
         include:
           - interpreter: python3
-        exclude:
-          - container: debian12
-            version: v62
-          - container: debian10
-            version: v62
-          - container: debian10
-            version: v64
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -35,18 +35,9 @@ jobs:
         web_server:
           - nginx
         version:
-          - v64
-          - v62
           - v60
         include:
           - interpreter: python3
-        exclude:
-          - container: debian10
-            version: v62
-          - container: debian10
-            version: v64
-          - container: debian12
-            version: v62
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -90,16 +90,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.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  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  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| Zabbix              | 6.0 |
+|---------------------|-----|
+| Red Hat Fam 9       | V  |
+| Red Hat Fam 8       | V  |
+| Red Hat Fam 7       | V  |
+| Ubuntu 22.04 jammy  | V  |
+| Ubuntu 20.04 focal  | V  |
+| Debian 12 bookworm  | V  |
+| Debian 11 bullseye  | V  |
+| Debian 10 buster    | V  |
 
 
 # Getting started

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -34,16 +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.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| Zabbix              |6.0 |
+|---------------------|-----|
+| Red Hat Fam 9       | V  |
+| Red Hat Fam 8       | V  |
+| Red Hat Fam 7       | V  |
+| Ubuntu 22.04 jammy  | V  |
+| Ubuntu 20.04 focal  | V  |
+| Debian 12 bookworm  | V  |
+| Debian 11 bullseye  | V  |
+| Debian 10 buster    | V  |
 
 # Role Variables
 

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -77,16 +77,16 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Red Hat Fam 7       |  V  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
-| Debian 10 buster    |  V  |  V  |  V  |
+| Zabbix              |6.0 |
+|---------------------|-----|
+| Red Hat Fam 9       |  V  |
+| Red Hat Fam 8       |  V  |
+| Red Hat Fam 7       |  V  |
+| Ubuntu 22.04 jammy  |  V  |
+| Ubuntu 20.04 focal  |  V  |
+| Debian 12 bookworm  |  V  |
+| Debian 11 bullseye  |  V  |
+| Debian 10 buster    |  V  |
 
 # Role Variables
 

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -75,15 +75,15 @@ ansible-galaxy collection install community.postgresql
 
 See the following list of supported Operating systems with the Zabbix releases:
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
-| Debian 10 buster    |     |     |  V  |
+| Zabbix              | 6.0 |
+|---------------------|-----|
+| Red Hat Fam 9       |  V  |
+| Red Hat Fam 8       |  V  |
+| Ubuntu 22.04 jammy  |  V  |
+| Ubuntu 20.04 focal  |  V  |
+| Debian 12 bookworm  |  V  |
+| Debian 11 bullseye  |  V  |
+| Debian 10 buster    |  V  |
 
 # Installation
 

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -54,15 +54,15 @@ ansible-galaxy collection install community.general
 
 See the following list of supported Operating Systems with the Zabbix releases.
 
-| Zabbix              | 6.4 | 6.2 | 6.0 |
-|---------------------|-----|-----|-----|
-| Red Hat Fam 9       |  V  |  V  |  V  |
-| Red Hat Fam 8       |  V  |  V  |  V  |
-| Ubuntu 22.04 jammy  |  V  |  V  |  V  |
-| Ubuntu 20.04 focal  |  V  |  V  |  V  |
-| Debian 12 bookworm  |  V  |     |  V  |
-| Debian 11 bullseye  |  V  |  V  |  V  |
-| Debian 10 buster    |     |     |  V  |
+| Zabbix              | 6.0 |
+|---------------------|-----|
+| Red Hat Fam 9       |  V  |
+| Red Hat Fam 8       |  V  |
+| Ubuntu 22.04 jammy  |  V  |
+| Ubuntu 20.04 focal  |  V  |
+| Debian 12 bookworm  |  V  |
+| Debian 11 bullseye  |  V  |
+| Debian 10 buster    |  V  |
 
 # Installation
 

diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -35,10 +35,6 @@ provisioner:
         zabbix_agent_listenip: 0.0.0.0
         zabbix_agent_tlsconnect: psk
         zabbix_agent_tlsaccept: psk
-      v64:
-        zabbix_agent_version: 6.4
-      v62:
-        zabbix_agent_version: 6.2
       v60:
         zabbix_agent_version: 6.0
 scenario:

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -26,10 +26,6 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python3
       python:
         ansible_python_interpreter: /usr/bin/python
-      v64:
-        zabbix_javagateway_version: 6.4
-      v62:
-        zabbix_javagateway_version: 6.2
       v60:
         zabbix_javagateway_version: 6.0
 

diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -26,10 +26,6 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python3
       python:
         ansible_python_interpreter: /usr/bin/python
-      v64:
-        zabbix_proxy_version: 6.4
-      v62:
-        zabbix_proxy_version: 6.2
       v60:
         zabbix_proxy_version: 6.0
       mysql:

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -27,14 +27,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python3
       python:
         ansible_python_interpreter: /usr/bin/python
-      v64:
-        zabbix_server_version: 6.4
-      v62:
-        zabbix_server_version: 6.2
       v60:
         zabbix_server_version: 6.0
-      v50:
-        zabbix_server_version: 5.0
       mysql:
         zabbix_server_dbname: zabbix
         zabbix_server_dbuser: zabbix-dbuser

diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
@@ -38,12 +38,6 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python3
       python:
         ansible_python_interpreter: /usr/bin/python
-      v64:
-        zabbix_server_version: 6.4
-        zabbix_web_version: 6.4
-      v62:
-        zabbix_server_version: 6.2
-        zabbix_web_version: 6.2
       v60:
         zabbix_server_version: 6.0
         zabbix_web_version: 6.0

diff --git a/roles/zabbix_agent/tasks/main.yml b/roles/zabbix_agent/tasks/main.yml
@@ -7,7 +7,7 @@
 
 - name: Determine Latest Supported Zabbix Version
   ansible.builtin.set_fact:
-    zabbix_agent_version: "{{ zabbix_valid_agent_versions[ansible_distribution_major_version][0] | default(6.4) }}"
+    zabbix_agent_version: "{{ zabbix_valid_agent_versions[ansible_distribution_major_version][0] | default(6.0) }}"
   when: zabbix_agent_version is not defined or zabbix_agent_version is none
   tags:
     - always

diff --git a/roles/zabbix_agent/templates/zabbix_agent2.conf.j2 b/roles/zabbix_agent/templates/zabbix_agent2.conf.j2
@@ -133,8 +133,6 @@ Plugins.{{ my_name }}.{{ param }}={{ value }}
 {% endfor %}
 {% endfor %}
 {% endif %}
-{% if zabbix_agent_version is version('6.0', '>=') %}
 {% if zabbix_agent2_listenbacklog is defined and zabbix_agent2_listenbacklog %}
 ListenBacklog={{ zabbix_agent2_listenbacklog }}
 {% endif %}
-{% endif %}
diff --git a/roles/zabbix_agent/templates/zabbix_agentd.conf.j2 b/roles/zabbix_agent/templates/zabbix_agentd.conf.j2
@@ -9,9 +9,7 @@
 {% if ansible_os_family != "Windows" %}
 PidFile={{ zabbix_agent_pidfile }}
 {% endif %}
-{% if zabbix_agent_version is version('3.0', '>=') %}
 LogType={{ zabbix_agent_logtype }}
-{% endif %}
 {% if ansible_os_family == "Windows" %}
 LogFile={{ zabbix_agent_win_logfile }}
 {% else %}
@@ -66,7 +64,7 @@ RefreshActiveChecks={{ zabbix_agent_refreshactivechecks }}
 BufferSend={{ zabbix_agent_buffersend }}
 BufferSize={{ zabbix_agent_buffersize }}
 MaxLinesPerSecond={{ zabbix_agent_maxlinespersecond }}
-{% if zabbix_agent_version is version_compare('6.2', '>=') %}
+{% if zabbix_agent_version is version_compare('6.0', '>') %}
 HeartbeatFrequency={{ zabbix_agent_heartbeatfrequency }}
 {% endif %}
 {% if zabbix_agent_zabbix_alias is defined and zabbix_agent_zabbix_alias %}
@@ -96,11 +94,9 @@ Include={{ include }}
 {% endfor %}
 {% endif %}
 UnsafeUserParameters={{ zabbix_agent_unsafeuserparameters }}
-{% if zabbix_agent_version is version_compare('2.2', '>=') %}
 {% if ansible_os_family != "Windows" %}
 LoadModulePath={{ zabbix_agent_loadmodulepath }}
 {% endif %}
-{% endif %}
 {% if zabbix_agent_loadmodule is defined and zabbix_agent_loadmodule %}
 {% if zabbix_agent_loadmodule is string %}
 LoadModule={{ zabbix_agent_loadmodule }}
@@ -142,8 +138,6 @@ TLSPSKIdentity={{ zabbix_agent_tlspskidentity }}
 TLSPSKFile={{ zabbix_agent_tlspskfile }}
 {% endif %}
 {% endif %}
-{% if zabbix_agent_version is version('6.0', '>=') %}
 {% if zabbix_agent_listenbacklog is defined and zabbix_agent_listenbacklog %}
 ListenBacklog={{ zabbix_agent_listenbacklog }}
 {% endif %}
-{% endif %}
diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -9,28 +9,19 @@ zabbix_agent2_conf: zabbix_agent2.conf
 zabbix_valid_agent_versions:
   # Debian
   "12":
-    - 6.4
-    - 6.2
     - 6.0
 
   "11":
-    - 6.4
-    - 6.2
     - 6.0
 
   "10":
-    - 6.4
-    - 6.2
     - 6.0
+
   # Ubuntu
   "22":
-    - 6.4
-    - 6.2
     - 6.0
 
   "20":
-    - 6.4
-    - 6.2
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_agent/vars/RedHat.yml b/roles/zabbix_agent/vars/RedHat.yml
@@ -8,14 +8,8 @@ zabbix_agent2_conf: zabbix_agent2.conf
 
 zabbix_valid_agent_versions:
   "9":
-    - 6.4
-    - 6.2
     - 6.0
   "8":
-    - 6.4
-    - 6.2
     - 6.0
   "7":
-    - 6.4
-    - 6.2
     - 6.0
diff --git a/roles/zabbix_agent/vars/Windows.yml b/roles/zabbix_agent/vars/Windows.yml
@@ -2,6 +2,4 @@
 # vars file for zabbix_agent (Windows)
 zabbix_valid_agent_versions:
   "10":
-    - 6.4
-    - 6.2
     - 6.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,8 +35,6 @@ jobs: @@
               - pgsql
               - sqlite3
             version:
-              - v64
-              - v62
               - v60
             include:
               - interpreter: python3
@@ Expand Down @@