Initial Push

pyrodie18 · Oct 22, 2023 · ce95bd6 · ce95bd6
1 parent 29090f2
commit ce95bd6
Show file tree

Hide file tree

Showing 19 changed files with 45 additions and 9 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -30,6 +30,7 @@ jobs:
           - debian10
         version:
             - v60
+            - v65
         scenario_name:
           - default
           - autopsk

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -30,6 +30,7 @@ jobs:
           - debian10
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python

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

diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -36,6 +36,7 @@ jobs:
           - sqlite3
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
           - interpreter: python

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -34,6 +34,7 @@ jobs:
           - pgsql
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
     steps:

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -36,6 +36,7 @@ jobs:
           - nginx
         version:
           - v60
+          - v65
         include:
           - interpreter: python3
     steps:

diff --git a/molecule/zabbix_agent_tests/common/molecule.yml b/molecule/zabbix_agent_tests/common/molecule.yml
@@ -37,6 +37,8 @@ provisioner:
         zabbix_agent_tlsaccept: psk
       v60:
         zabbix_agent_version: 6.0
+      v65:
+        zabbix_agent_version: 6.5
 scenario:
   test_sequence:
     - dependency

diff --git a/molecule/zabbix_javagateway/molecule.yml b/molecule/zabbix_javagateway/molecule.yml
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_javagateway_version: 6.0
+      v65:
+        zabbix_javagateway_version: 6.5
 
 verifier:
   name: testinfra
diff --git a/molecule/zabbix_proxy/molecule.yml b/molecule/zabbix_proxy/molecule.yml
@@ -28,6 +28,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_proxy_version: 6.0
+      v65:
+        zabbix_proxy_version: 6.5
       mysql:
         zabbix_proxy_dbname: zabbix
         zabbix_proxy_dbuser: zabbix-dbuser

diff --git a/molecule/zabbix_server/molecule.yml b/molecule/zabbix_server/molecule.yml
@@ -29,6 +29,8 @@ provisioner:
         ansible_python_interpreter: /usr/bin/python
       v60:
         zabbix_server_version: 6.0
+      v65:
+        zabbix_server_version: 6.5
       mysql:
         zabbix_server_dbname: zabbix
         zabbix_server_dbuser: zabbix-dbuser

diff --git a/molecule/zabbix_web/molecule.yml b/molecule/zabbix_web/molecule.yml
@@ -41,6 +41,9 @@ provisioner:
       v60:
         zabbix_server_version: 6.0
         zabbix_web_version: 6.0
+      v65:
+        zabbix_server_version: 6.5
+        zabbix_web_version: 6.5
       mysql:
         zabbix_server_database: mysql
         zabbix_server_dbport: 3306

diff --git a/roles/zabbix_agent/vars/Debian.yml b/roles/zabbix_agent/vars/Debian.yml
@@ -9,19 +9,24 @@ zabbix_agent2_conf: zabbix_agent2.conf
 zabbix_valid_agent_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
 
   "11":
+    - 6.5
     - 6.0
 
   "10":
+    - 6.5
     - 6.0
 
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
 
   "20":
+    - 6.5
     - 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,8 +8,11 @@ zabbix_agent2_conf: zabbix_agent2.conf
 
 zabbix_valid_agent_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
   "7":
+    - 6.5
     - 6.0
diff --git a/roles/zabbix_javagateway/vars/Debian.yml b/roles/zabbix_javagateway/vars/Debian.yml
@@ -1,15 +1,19 @@
 zabbix_valid_javagateway_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_javagateway/vars/RedHat.yml b/roles/zabbix_javagateway/vars/RedHat.yml
@@ -1,8 +1,10 @@
 ---
 zabbix_valid_javagateway_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
   "7":
     - 6.0
diff --git a/roles/zabbix_proxy/vars/Debian.yml b/roles/zabbix_proxy/vars/Debian.yml
@@ -1,23 +1,18 @@
 zabbix_valid_proxy_versions:
   # Debian
   "12":
-    - 6.4
+    - 6.5
     - 6.0
   "11":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "10":
-    - 6.4
-    - 6.2
     - 6.0
   "22":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
   "20":
-    - 6.4
-    - 6.2
+    - 6.5
     - 6.0
 
 mysql_client_pkgs:

diff --git a/roles/zabbix_server/vars/Debian.yml b/roles/zabbix_server/vars/Debian.yml
@@ -8,15 +8,19 @@ mysql_create_dir: ""
 zabbix_valid_server_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/

diff --git a/roles/zabbix_server/vars/RedHat.yml b/roles/zabbix_server/vars/RedHat.yml
@@ -10,8 +10,10 @@ __epel_repo:
 
 zabbix_valid_server_versions:
   "9":
+    - 6.5
     - 6.0
   "8":
+    - 6.5
     - 6.0
 
 pgsql_depenencies:

diff --git a/roles/zabbix_web/vars/Debian.yml b/roles/zabbix_web/vars/Debian.yml
@@ -26,15 +26,19 @@ _nginx_tls_dhparam: /etc/ssl/private/dhparams.pem
 zabbix_valid_web_versions:
   # Debian
   "12":
+    - 6.5
     - 6.0
   "11":
+    - 6.5
     - 6.0
   "10":
     - 6.0
   # Ubuntu
   "22":
+    - 6.5
     - 6.0
   "20":
+    - 6.5
     - 6.0
 
 debian_keyring_path: /etc/apt/keyrings/
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ jobs: @@
               - debian10
             version:
                 - v60
+                - v65
             scenario_name:
               - default
               - autopsk
@@ Expand Down @@