Add support for Ubuntu 24.04 Noble Numbat (all roles)

ansible-collections · May 7, 2024 · cef7b3e · cef7b3e
1 parent e00ab8e
commit cef7b3e
Show file tree

Hide file tree

Showing 17 changed files with 49 additions and 1 deletion.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
 
     steps:
       - name: Check out code

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -23,6 +23,7 @@ jobs:
           - rockylinux9
           - rockylinux8
           - centos7
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -40,6 +41,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
         collection_role:
           - zabbix_javagateway
     steps:

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -23,6 +23,7 @@ jobs:
           - rockylinux9
           - rockylinux8
           - centos7
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -46,6 +47,8 @@ jobs:
         exclude:
           - container: debian12
             version: v62
+          - container: ubuntu2404
+            version: v62
     steps:
       - name: Check out code
         uses: actions/checkout@v4

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -44,6 +45,8 @@ jobs:
             version: v62
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: ubuntu1804

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -22,6 +22,7 @@ jobs:
         container:
           - rockylinux9
           - rockylinux8
+          - ubuntu2404
           - ubuntu2204
           - ubuntu2004
           - ubuntu1804
@@ -44,6 +45,8 @@ jobs:
         exclude:
           - container: debian10
             version: v62
+          - container: ubuntu2404
+            version: v62
           - container: ubuntu1804
             version: v62
           - container: debian10

diff --git a/changelogs/fragments/1221-add_support_for_ubuntu_24.04.yml b/changelogs/fragments/1221-add_support_for_ubuntu_24.04.yml
@@ -0,0 +1,2 @@
+minor_changes:
+  - all roles - Added support for Ubuntu 24.04 (Noble Numbat)
diff --git a/docs/ZABBIX_AGENT_ROLE.md b/docs/ZABBIX_AGENT_ROLE.md
@@ -95,6 +95,7 @@ See the following list of supported Operating systems with the Zabbix releases:
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |

diff --git a/docs/ZABBIX_JAVAGATEWAY_ROLE.md b/docs/ZABBIX_JAVAGATEWAY_ROLE.md
@@ -39,6 +39,7 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |

diff --git a/docs/ZABBIX_PROXY_ROLE.md b/docs/ZABBIX_PROXY_ROLE.md
@@ -82,6 +82,7 @@ See the following list of supported Operating systems with the Zabbix releases.
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
 | Red Hat Fam 7       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |  V  |  V  |  V  |

diff --git a/docs/ZABBIX_SERVER_ROLE.md b/docs/ZABBIX_SERVER_ROLE.md
@@ -79,6 +79,7 @@ See the following list of supported Operating systems with the Zabbix releases:
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |     |     |  V  |

diff --git a/docs/ZABBIX_WEB_ROLE.md b/docs/ZABBIX_WEB_ROLE.md
@@ -58,6 +58,7 @@ See the following list of supported Operating Systems with the Zabbix releases.
 |---------------------|-----|-----|-----|
 | Red Hat Fam 9       |  V  |  V  |  V  |
 | Red Hat Fam 8       |  V  |  V  |  V  |
+| Ubuntu 24.04 noble  |  V  |     |  V  |
 | Ubuntu 22.04 jammy  |  V  |  V  |  V  |
 | Ubuntu 20.04 focal  |  V  |  V  |  V  |
 | Ubuntu 18.04 bionic |     |     |  V  |

diff --git a/molecule/zabbix_web/prepare.yml b/molecule/zabbix_web/prepare.yml
@@ -162,7 +162,14 @@
         - ansible_distribution_major_version >= '22'
         - ansible_os_family == "Debian"
 
-    - name: Set PHP packages (Ubuntu 2204)
+    - name: Set PHP Version (Ubuntu 2404)
+      ansible.builtin.set_fact:
+        __php_default_version_debian: "8.3"
+      when:
+        - ansible_distribution_major_version >= '24'
+        - ansible_os_family == "Debian"
+
+    - name: Set PHP packages (Ubuntu 2204 & 2404)
       ansible.builtin.set_fact:
         __php_packages:
           - php{{ __php_default_version_debian }}-common

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -28,6 +28,10 @@ zabbix_valid_agent_versions:
     - 6.2
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
+
   "22":
     - 6.4
     - 6.2

diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -12,6 +12,9 @@ zabbix_valid_javagateway_versions:
     - 6.2
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
   "22":
     - 6.4
     - 6.2

diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -11,6 +11,9 @@ zabbix_valid_proxy_versions:
     - 6.4
     - 6.2
     - 6.0
+  "24":
+    - 6.4
+    - 6.0
   "22":
     - 6.4
     - 6.2
@@ -36,6 +39,9 @@ mysql_client_pkgs:
     - mariadb-client
     - "{{ zabbix_python_prefix }}-mysqldb"
   # Ubuntu
+  "24":
+    - default-mysql-client
+    - "{{ zabbix_python_prefix }}-mysqldb"
   "22":
     - default-mysql-client
     - "{{ zabbix_python_prefix }}-mysqldb"

diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -17,6 +17,9 @@ zabbix_valid_server_versions:
   "10":
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
   "22":
     - 6.4
     - 6.2

diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
@@ -35,6 +35,9 @@ zabbix_valid_web_versions:
   "10":
     - 6.0
   # Ubuntu
+  "24":
+    - 6.4
+    - 6.0
   "22":
     - 6.4
     - 6.2
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		minor_changes:
		- all roles - Added support for Ubuntu 24.04 (Noble Numbat)
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,10 @@ zabbix_valid_agent_versions: @@
         - 6.2
         - 6.0
       # Ubuntu
+      "24":
+        - 6.4
+        - 6.0
       "22":
         - 6.4
         - 6.2
@@ Expand Down @@