2.0.0 (ansible-collections#979)

* Server update (#1) (ansible-collections#895)

* Initial Update to Server Role

* Update python version to 3.9

* Trying to get molecule to work

* Fixed python shell command problems

* Defined zabbix_os_user

* Fixed Rocky9 Idempotence Test

* Fixed Interpreter Values

* Think I fixed the username check.  Not sure why we changed the username in the first place

* Fixed Failed Test for file owner/group

* Fixed problems with Centos 9 Zabbix6.0

* Fixed Tests

* Fixed the config file problem that kept most instances from running

* 2.0.0 dev2 (ansible-collections#904)

* Server update (#1) (#2)

* Initial Update to Server Role

* Update python version to 3.9

* Trying to get molecule to work

* Fixed python shell command problems

* Defined zabbix_os_user

* Fixed Rocky9 Idempotence Test

* Fixed Interpreter Values

* Think I fixed the username check.  Not sure why we changed the username in the first place

* Fixed Failed Test for file owner/group

* Fixed problems with Centos 9 Zabbix6.0

* Fixed Tests

* Fixed the config file problem that kept most instances from running

* Proxy update (#3)

* Standardizing database file path
* Fixed SQL file location
* Fixed Proxy Prepare file to handle mariadb install on RHEL9
* Added supported versions of proxy that were left out for some reason
* Fixed testing
* Consolidated SElinux items
* Fixed SQLite

* Java gw (#4)

Refactor Java Gateway

* Web (#6)

* Removed unnecessary files

* Fixed Valid Versions

* Fixed Server Name issue

* Fixing Molecule

* Cleaned up Documentation

* Fixed Prepare for Centos8

* Lots of changes for Debian

* Fixed Idempotency Issue

* Added curl to prepare

* Fixed Prepare for Centos 8+ and Ubuntu 2204

* Fixed Error with V6 Rocky 9

* Hopefully fixed all of the PgSQL stuff

* Think I fixed my pgsql problem

* Nginx Work

* Fixed Accidental Install from Epel

* Fixed Error With Centos 7

* Enabled all Server Tests

* Remove Support for 5.X from Web

* More 5.0 Removal Cleanup

* Think I fixed my RHEL Problem

* Bgmot usergroup update (ansible-collections#893)

* zabbix_usergroup module: added hostgroup_rights and templategroup_rights (Zabbix >= 6.2).

* zabbix_usergroup module: added userdirectory parameter (Zabbix >= 6.2).

* Changelog fragment added.

* zabbix_usergroup: fix compatibility with Zabbix < 6.2.

* zabbix_agent - Fix MacOS/Darwin install (ansible-collections#897)

* zabbix_agent role - Add support for SUSE Linux Enterprise Server for SAP Applications ("SLES_SAP"). (ansible-collections#899)

* Add support for SLES_SAP

* Renamed to pr number

---------

Co-authored-by: Bram Mol <bram.mol@cfit.nl>

* Bgmot fix python interpreter (ansible-collections#900)

* zabbix_agent role: fix python_interpreter error.

* zabbix_proxy role: fix python_interpreter error.

* Code clean up.

* Remove code used to debugging.

* 1.9.2prep (ansible-collections#902)

* Remove warn: for module shell for Ansible 2.14. (ansible-collections#877)

* Bgmot python version (ansible-collections#890)

* Bump Python version to 3.9 to satisfy ansible 7.0.

* Bump ansible from 4.6.0 to 7.0.0 in /molecule.

* Bump ansible-core from 2.11.5 to 2.14.2 in /molecule.

* In new Ansible version need to specify Python interpreter explicitely for some (like Rocky linux) distros of Linux.

* Remove warn: for module command for Ansible 2.14 in molecule tests.

* Ansible does not set correct Python interpreter only for rockylinux.

* Deal with Python versions mess on different OS/versions.

* zabbix_agent - Fix MacOS/Darwin install (ansible-collections#897)

* Bgmot fix python interpreter (ansible-collections#900)

* zabbix_agent role: fix python_interpreter error.

* zabbix_proxy role: fix python_interpreter error.

* Code clean up.

* Remove code used to debugging.

* Missing changelog fragments added.

* CHANGELOG updated by antsibull-changelog.

* galaxy.yml updated with 1.9.2 version.

* README.md updated.

---------

Co-authored-by: Benjamin Pinchon <dev@mdfr.me>

* zabbix_user: several mailto: for email media type (ansible-collections#907)

* zabbix_user: fix ability to specify several e-mail addresses in media.

* Changelog fragment added.

* Switch to ansible core version of LooseVersion.

* Fix postgres tags (ansible-collections#910)

Use tags apropriate for role

* Bgmot fix netcommon (ansible-collections#915)

* Fix to work with ansible.netcommon 5.0.

* Remove unused variable.

* Changelog fragment added.

* Bgmot user mailto1 (ansible-collections#916)

* zabbix_user: fix ability to specify several e-mail addresses in media (attempt #2).

* Changelog fragment added.

* Zabbix 6.4 from BGmot (ansible-collections#927)

* The stupidiest fix for user vs username parameter during authentication.

* Modules integration tests: first get API version then do login accordingly.

* Do not use zabbix-api in zabbix_action module integration tests as zabbix-api is broken for Zabbix 6.4.

* Fix sanity test.

* zabbix_user_directory module updated to work with Zabbix 6.4.

* zabbix_user_directory: update examples for Zabbix 6.4.

* zabbix_authentication module updated to work with Zabbix 6.4.

* zabbix_authentication: re-do tests introducing clean up and adding tests for Zabbix 6.4.

* zabbix_discovery_rule module updated to work with Zabbix 6.4.

* zabbix_mediatype module updated to work with Zabbix 6.4.

* zabbix_user module updated to work with Zabbix 6.4.

* Make tests for zabbix_host compatible with Zabbix 6.4.

* Make tests for zabbix_template compatible with Zabbix 6.4.

* Make tests for zabbix_template_info compatible with Zabbix 6.4.

* zabbix_user_group module updated to work with Zabbix 6.4.

* Fix linter errors.

* zabbix_action module updated with new parameter in Zabbix 6.4.

* Add 6.4 to plugins-integration test suite.

* Changelog fragment added.

* zabbix_authentication: fix backward compatibility with Zabbix 6.2.

* zabbix_mediatype: fix backward compatibility with Zabbix 6.2.

* Update examples with task level vars (instead of PR ansible-collections#920) (ansible-collections#929)

* Update examples with task level vars

* Cleanup 5.0 Removal

* Remove epel (#8)

* Updated Java Gateway

* Updated Server

* Updated Proxy

* Updated Web

* Removed Epel and Other related tasks

* Fixed EPEL leftover in Proxy

* Server update (#1)

* Initial Update to Server Role

* Update python version to 3.9

* Trying to get molecule to work

* Fixed python shell command problems

* Defined zabbix_os_user

* Fixed Rocky9 Idempotence Test

* Fixed Interpreter Values

* Think I fixed the username check.  Not sure why we changed the username in the first place

* Fixed Failed Test for file owner/group

* Fixed problems with Centos 9 Zabbix6.0

* Fixed Tests

* Fixed the config file problem that kept most instances from running

* Proxy update (#3)

* Standardizing database file path
* Fixed SQL file location
* Fixed Proxy Prepare file to handle mariadb install on RHEL9
* Added supported versions of proxy that were left out for some reason
* Fixed testing
* Consolidated SElinux items
* Fixed SQLite

* Web (#6)

* Removed unnecessary files

* Fixed Valid Versions

* Fixed Server Name issue

* Fixing Molecule

* Cleaned up Documentation

* Fixed Prepare for Centos8

* Lots of changes for Debian

* Fixed Idempotency Issue

* Added curl to prepare

* Fixed Prepare for Centos 8+ and Ubuntu 2204

* Fixed Error with V6 Rocky 9

* Hopefully fixed all of the PgSQL stuff

* Think I fixed my pgsql problem

* Nginx Work

* Fixed Accidental Install from Epel

* Fixed Error With Centos 7

* Enabled all Server Tests

* Remove Support for 5.X from Web

* More 5.0 Removal Cleanup

* Think I fixed my RHEL Problem

* Bgmot usergroup update (ansible-collections#893)

* zabbix_usergroup module: added hostgroup_rights and templategroup_rights (Zabbix >= 6.2).

* zabbix_usergroup module: added userdirectory parameter (Zabbix >= 6.2).

* Changelog fragment added.

* zabbix_usergroup: fix compatibility with Zabbix < 6.2.

* zabbix_user: several mailto: for email media type (ansible-collections#907)

* zabbix_user: fix ability to specify several e-mail addresses in media.

* Changelog fragment added.

* Switch to ansible core version of LooseVersion.

* Bgmot user mailto1 (ansible-collections#916)

* zabbix_user: fix ability to specify several e-mail addresses in media (attempt #2).

* Changelog fragment added.

* Zabbix 6.4 from BGmot (ansible-collections#927)

* The stupidiest fix for user vs username parameter during authentication.

* Modules integration tests: first get API version then do login accordingly.

* Do not use zabbix-api in zabbix_action module integration tests as zabbix-api is broken for Zabbix 6.4.

* Fix sanity test.

* zabbix_user_directory module updated to work with Zabbix 6.4.

* zabbix_user_directory: update examples for Zabbix 6.4.

* zabbix_authentication module updated to work with Zabbix 6.4.

* zabbix_authentication: re-do tests introducing clean up and adding tests for Zabbix 6.4.

* zabbix_discovery_rule module updated to work with Zabbix 6.4.

* zabbix_mediatype module updated to work with Zabbix 6.4.

* zabbix_user module updated to work with Zabbix 6.4.

* Make tests for zabbix_host compatible with Zabbix 6.4.

* Make tests for zabbix_template compatible with Zabbix 6.4.

* Make tests for zabbix_template_info compatible with Zabbix 6.4.

* zabbix_user_group module updated to work with Zabbix 6.4.

* Fix linter errors.

* zabbix_action module updated with new parameter in Zabbix 6.4.

* Add 6.4 to plugins-integration test suite.

* Changelog fragment added.

* zabbix_authentication: fix backward compatibility with Zabbix 6.2.

* zabbix_mediatype: fix backward compatibility with Zabbix 6.2.

* Update examples with task level vars (instead of PR ansible-collections#920) (ansible-collections#929)

* Update examples with task level vars

* Convert bool values to lowercase in modules documentation.x (ansible-collections#933)

* user to username Zabbix 6.4 (ansible-collections#917)

* The stupidiest fix for user vs username parameter during authentication.

* Modules integration tests: first get API version then do login accordingly.

* Do not use zabbix-api in zabbix_action module integration tests as zabbix-api is broken for Zabbix 6.4.

* Fix sanity test.

* Possibility to add custom includes in apache vhost config (zabbix_web) (ansible-collections#935)

* add custom includes for apache configuration

* remove length check

* change if statement in template

---------

Co-authored-by: JHauf <johannes.hauf@datev.cloud>

* Roles to Zabbix 6.4 (ansible-collections#937)

* Zabbix proxy configuration template updated for Zabbix 6.4.

* Zabbix server configuration template updated for Zabbix 6.4.

* zabbix_server role: adjusting defaults.

* zabbix_server role: fix zabbix_server_proxyconfigfrequency variable.

* Add 6.4 version to all roles and make it essentially default.

* zabbix_server role: restore accidentally deleted parameter.

* READMEs for role updated with Zabbix 6.4.

* Changelog fragment added.

* Fix molecule test for zabbix_web.

* 1.9.3prep (ansible-collections#938)

* Add missing changelog fragments.

* Fix changelog format.

* CHANGELOG.rst generated.

* galaxy.yml updated.

* README.md updated.

* Switch GitHub runner image to ubuntu-latest.

* Switch to Ubuntu 22.04 for web test.

* Switch to Ubuntu 20.04 for web test.

* Switch to Ubuntu 20.04 for all molecule tests.

* Fix sanity tests for Ansible dev.

* Do not ignore any failing sanity tests.

* zabbix_host: fix integration test to properly handle removing all linked templates.

* zabbix_action: re-name message paremeter into op_message.

* Changelog fragment added.

* Proxy update (#3)

* Standardizing database file path
* Fixed SQL file location
* Fixed Proxy Prepare file to handle mariadb install on RHEL9
* Added supported versions of proxy that were left out for some reason
* Fixed testing
* Consolidated SElinux items
* Fixed SQLite

* Bgmot fix python interpreter (ansible-collections#900)

* zabbix_agent role: fix python_interpreter error.

* zabbix_proxy role: fix python_interpreter error.

* Code clean up.

* Remove code used to debugging.

* Cleanup 5.0 Removal

* Remove epel (#8)

* Updated Java Gateway

* Updated Server

* Updated Proxy

* Updated Web

* Removed Epel and Other related tasks

* Fixed EPEL leftover in Proxy

* Server update (#1)

* Initial Update to Server Role

* Update python version to 3.9

* Trying to get molecule to work

* Fixed python shell command problems

* Defined zabbix_os_user

* Fixed Rocky9 Idempotence Test

* Fixed Interpreter Values

* Think I fixed the username check.  Not sure why we changed the username in the first place

* Fixed Failed Test for file owner/group

* Fixed problems with Centos 9 Zabbix6.0

* Fixed Tests

* Fixed the config file problem that kept most instances from running

* Proxy update (#3)

* Standardizing database file path
* Fixed SQL file location
* Fixed Proxy Prepare file to handle mariadb install on RHEL9
* Added supported versions of proxy that were left out for some reason
* Fixed testing
* Consolidated SElinux items
* Fixed SQLite

* Web (#6)

* Removed unnecessary files

* Fixed Valid Versions

* Fixed Server Name issue

* Fixing Molecule

* Cleaned up Documentation

* Fixed Prepare for Centos8

* Lots of changes for Debian

* Fixed Idempotency Issue

* Added curl to prepare

* Fixed Prepare for Centos 8+ and Ubuntu 2204

* Fixed Error with V6 Rocky 9

* Hopefully fixed all of the PgSQL stuff

* Think I fixed my pgsql problem

* Nginx Work

* Fixed Accidental Install from Epel

* Fixed Error With Centos 7

* Enabled all Server Tests

* Remove Support for 5.X from Web

* More 5.0 Removal Cleanup

* Think I fixed my RHEL Problem

---------

Co-authored-by: Evgeny <ey@bgmot.com>
Co-authored-by: Benjamin Pinchon <dev@mdfr.me>
Co-authored-by: brnl <3243133+brnl@users.noreply.github.com>
Co-authored-by: Bram Mol <bram.mol@cfit.nl>
Co-authored-by: Robert Szulist <szuro@users.noreply.github.com>
Co-authored-by: anmg <a.gangan@gmail.com>
Co-authored-by: johansenha <35975241+johansenha@users.noreply.github.com>
Co-authored-by: JHauf <johannes.hauf@datev.cloud>

* Server fix (ansible-collections#943)

* Added 6.4 to the testing matrix

* Proxy fix (ansible-collections#944)

* Fixed some proxy issues from the rebase

* fixed missing DB path

* Removed breaking change from epel

* Other fixes (ansible-collections#945)

* Updated Testing Matrix on Web and javagw

* Fixed undefined variable in web

* Agent Update (ansible-collections#948)

* Get rid of vars and tasks files for unsported versions

* removed fedora and debian 9 from testing pipeline

* removed version check test (see ansible-collections#947)

* Updated Testing Matrix

* Documentation (ansible-collections#954)

- Updated documentation for all roles
- Standardized naming conventions of variables
- Removed unused variables

* Fix all the errors after re-basing against main.

* modules 2.0.0 (ansible-collections#963)

* zabbix-api removed.

* zabbix_inventory: do not use zabbix-api, ability to authenticate with auth token.

* Clean up modules tests.

* Remove unsupported versions of Zabbix from modules test matrix.

* Fix sanity test errors.

* Changelog fragment added.

* Tag cleanup (ansible-collections#964)

* Standardized tags on all roles

* Updated Documentation

* Removed old apt keys from vars files (ansible-collections#965)

* Fix default version (ansible-collections#966)

* Updated Default Versions to 6.4

* Created Change Fragment (ansible-collections#967)

* Replaced deprecated apt_key (ansible-collections#969)

* replaced deprecated apt_key

---------

Co-authored-by: Hernan Garcia <hernan.garcia@percona.com>

* CI: don't hardcode the workspace (ansible-collections#971)

* Correct minimum ansible version (ansible-collections#974)

* Bgmot modules old versions 200 (ansible-collections#976)

* zabbix_action module cleaned up of old Zabbix versions.

* zabbix_authentication module cleaned up of old Zabbix versions.

* zabbix_autoregister module cleaned up of old Zabbix versions.

* zabbix_discovery_rule module cleaned up of old Zabbix versions.

* zabbix_globalmacro module cleaned up of old Zabbix versions.

* zabbix_group_info module: update python version requirement. Remove zabbix_group_facts module (deprecated in favour of zabbix_group_info).

* zabbix_group_info module: code clean up.

* zabbix_host_events_info module: code clean up.

* zabbix_host_info module cleaned up of old Zabbix versions. zabbix_host_facts deprecated in favour of zabbix_host_info.

* zabbix_hostmacro module cleaned up of old Zabbix versions.

* zabbix_host module cleaned up of old Zabbix versions.

* zabbix_housekeeping module cleaned up of old Zabbix versions.

* zabbix_housekeeping module tests cleaned up of old Zabbix versions.

* zabbix_maintenance module cleaned up of old Zabbix versions.

* zabbix_maintenance module: use only double quotes.

* zabbix_map module cleaned up of old Zabbix versions.

* zabbix_mediatype module cleaned up of old Zabbix versions.

* zabbix_proxy_info module: use only double quotes.

* zabbix_proxy module cleaned up of old Zabbix versions.

* zabbix_screen module removed.

* zabbix_script module cleaned up of old Zabbix versions.

* zabbix_service module cleaned up of old Zabbix versions.

* zabbix_template_info module cleaned up of old Zabbix versions.

* zabbix_template module cleaned up of old Zabbix versions.

* zabbix_user_directory module: switch to double quotes everywhere.

* zabbix_usergroup module cleaned up of old Zabbix versions and switched to double quotes in code.

* zabbix_user_info module cleaned up of old Zabbix versions.

* zabbix_user module cleaned up of old Zabbix versions.

* zabbix_user_role module: switch to double quotes everywhere.

* zabbix_valuemap module: switch to double quotes everywhere.

* Fix sanity checks.

* Fix zabbix_host module tests.

* Fix zabbix_template_info module tests.

* Move changelog fragment into right place.

* Changelog fragment added.

* Rename changelog fragment file to reflect PR number.

* Correct minimum dependency for ansible.netcommon (ansible-collections#952)

Connection plugin options are broken in versions before 3.1.1.

---------

Co-authored-by: flowerysong <junk+github@flowerysong.com>

* More code clean up (ansible-collections#977)

* zabbix_agent role cleaned up.

* zabbix_agent role: more clean up and README updated.

* zabbix_proxy role cleaned up.

* Remove unneeded any longer require_creds_params function from all modules.

* zabbix_agent role: update documentation.

* More code clean up.

* zabbix.py inventory script re-coded not to use zabbix-api.

* scripts/inventory/zabbix.py: fix saity test error.

* Fix typo in changelog fragment.

* Missing changelog fragment added.

* Missing changelog fragment added.

* Moved "installation from epel" from major_changes to breaking_changes in changelog fragment.

* Antsibull-changelog run.

* galaxy.yml updated with 2.0.0.

---------

Co-authored-by: Troy W <pyrodie18@gmail.com>
Co-authored-by: Benjamin Pinchon <dev@mdfr.me>
Co-authored-by: brnl <3243133+brnl@users.noreply.github.com>
Co-authored-by: Bram Mol <bram.mol@cfit.nl>
Co-authored-by: Robert Szulist <szuro@users.noreply.github.com>
Co-authored-by: anmg <a.gangan@gmail.com>
Co-authored-by: johansenha <35975241+johansenha@users.noreply.github.com>
Co-authored-by: JHauf <johannes.hauf@datev.cloud>
Co-authored-by: Hernan Garcia <hernandanielg@gmail.com>
Co-authored-by: Hernan Garcia <hernan.garcia@percona.com>
Co-authored-by: flowerysong <junk+github@flowerysong.com>

.github/workflows/agent.yml

@@ -19,35 +19,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        molecule_distro:
-          - container: centos8
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-          - container: centos7
-            image: geerlingguy/docker-centos7-ansible:latest
-          - container: fedora32
-            image: geerlingguy/docker-fedora32-ansible:latest
-          - container: ubuntu2004
-            image: geerlingguy/docker-ubuntu2004-ansible
-          - container: pgsql-ubuntu1804
-            image: geerlingguy/docker-ubuntu1804-ansible
-          - container: debian11
-            image: geerlingguy/docker-debian11-ansible
-          - container: debian10
-            image: geerlingguy/docker-debian10-ansible
-          - container: debian9
-            image: geerlingguy/docker-debian9-ansible
+        container:
+          - rockylinux9
+          - rockylinux8
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian11
+          - debian10
+        version:
+            - v64
+            - v62
+            - v60
         scenario_name:
           - default
           - autopsk
           - agent2
           - agent2autopsk
-        exclude: # zabbix-agent2 is not supported on debian8
-          - molecule_distro:
-              container: debian8
-            scenario_name: agent2
-          - molecule_distro:
-              container: debian8
-            scenario_name: agent2autopsk
 
     steps:
       - name: Check out code
@@ -77,7 +65,8 @@ jobs:
       - name: Run role tests
         working-directory: molecule/zabbix_agent_tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
-          molecule -c common/molecule.yml test -s ${{ matrix.scenario_name }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_VERSION=${{ matrix.version }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
+          molecule -c common/molecule.yml test -s ${{ matrix.scenario_name }}

.github/workflows/javagateway.yml

@@ -3,29 +3,39 @@ name: "community.zabbix.zabbix_javagateway"
 on:
   push:
     paths:
-      - 'roles/zabbix_javagateway/**'
-      - 'molecule/zabbix_javagateway/**'
-      - 'molecule/requirements.txt'
-      - '.github/workflows/javagateway.yml'
+      - "roles/zabbix_javagateway/**"
+      - "molecule/zabbix_javagateway/**"
+      - "molecule/requirements.txt"
+      - ".github/workflows/javagateway.yml"
   pull_request:
     paths:
-      - 'roles/zabbix_javagateway/**'
-      - 'molecule/zabbix_javagateway/**'
-      - 'molecule/requirements.txt'
-      - '.github/workflows/javagateway.yml'
+      - "roles/zabbix_javagateway/**"
+      - "molecule/zabbix_javagateway/**"
+      - "molecule/requirements.txt"
+      - ".github/workflows/javagateway.yml"
 jobs:
   molecule:
     runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        molecule_distro:
-          - container: centos
-            image: geerlingguy/docker-centos8-ansible:latest
-          - container: ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-          - container: debian
-            image: geerlingguy/docker-debian10-ansible
+        container:
+          - rockylinux9
+          - rockylinux8
+          - centos7
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian11
+          - debian10
+        version:
+          - v64
+          - v62
+          - v60
+        include:
+          - interpreter: python3
+          - interpreter: python
+            container: centos7
         collection_role:
           - zabbix_javagateway
     steps:
@@ -50,10 +60,11 @@ jobs:
       - name: Install the collection
         run: ansible-galaxy collection install $COLLECTION_FILE
 
-      - name: Run role tests
+      - name: Run server role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
-          MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_VERSION=${{ matrix.version }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
+          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
           molecule test -s ${{ matrix.collection_role }}

.github/workflows/plugins-integration.yml

@@ -20,9 +20,6 @@ jobs:
       fail-fast: false
       matrix:
         zabbix_container:
-          - version: "4.0"
-          - version: "5.0"
-          # - version: "5.4" # only activate after basic compatibility
           - version: "6.0"
           - version: "6.2"
           - version: "6.4"
@@ -53,7 +50,7 @@ jobs:
         run: pip install docker-compose zabbix-api
 
       - name: Install ansible.netcommon collection
-        run: ansible-galaxy collection install ansible.netcommon -p /home/runner/work/community.zabbix/community.zabbix
+        run: ansible-galaxy collection install ansible.netcommon -p $GITHUB_WORKSPACE
         working-directory: ./ansible_collections/community/zabbix
 
       # For Zabbix integration tests we need to test against different versions of

.github/workflows/proxy.yml

@@ -19,38 +19,29 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        molecule_distro:
-          - container: mysql-centos
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: mysql
-          - container: pgsql-centos
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: postgresql
-          - container: sqlite-centos
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: sqlite3
-          - container: mysql-ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: mysql
-          - container: pgsql-ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: postgresql
-            command: /sbin/init
-          - container: sqlite-ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: sqlite3
-            command: /sbin/init
-          - container: mysql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: mysql
-          - container: pgsql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: postgresql
-          - container: sqlite-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: sqlite3
+        container:
+          - rockylinux9
+          - rockylinux8
+          - centos7
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian11
+          - debian10
         collection_role:
           - zabbix_proxy
+        database:
+          - mysql
+          - pgsql
+          - sqlite3
+        version:
+          - v64
+          - v62
+          - v60
+        include:
+          - interpreter: python3
+          - interpreter: python
+            container: centos7
     steps:
       - name: Check out code
         uses: actions/checkout@v1
@@ -75,8 +66,10 @@ jobs:
 
       - name: Run role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
-          MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_VERSION=${{ matrix.version }}
+          MY_MOLECULE_DATABASE=${{ matrix.database }}
+          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}

.github/workflows/server.yml

@@ -19,28 +19,34 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        molecule_distro:
-          - container: mysql-centos
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: mysql
-          - container: pgsql-centos
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: postgresql
-          - container: mysql-ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: mysql
-          - container: pgsql-ubuntu
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: postgresql
-            command: /sbin/init
-          - container: mysql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: mysql
-          - container: pgsql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: postgresql
+        container:
+          - rockylinux9
+          - rockylinux8
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian11
+          - debian10
         collection_role:
           - zabbix_server
+        database:
+          - mysql
+          - pgsql
+        version:
+          - v64
+          - v62
+          - v60
+        include:
+          - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v62
+          - container: ubuntu1804
+            version: v62
+          - container: ubuntu1804
+            version: v64
+          - container: debian10
+            version: v64
     steps:
       - name: Check out code
         uses: actions/checkout@v1
@@ -63,10 +69,12 @@ jobs:
       - name: Install the collection
         run: ansible-galaxy collection install $COLLECTION_FILE
 
-      - name: Run role tests
+      - name: Run server role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
-          MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_VERSION=${{ matrix.version }}
+          MY_MOLECULE_DATABASE=${{ matrix.database }}
+          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}

.github/workflows/web.yml

@@ -19,27 +19,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        molecule_distro:
-          - container: mysql-centos8
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: mysql
-          - container: pgsql-centos8
-            image: geerlingguy/docker-rockylinux8-ansible:latest
-            group: postgresql
-          - container: mysql-ubuntu18
-            image: geerlingguy/docker-ubuntu1804-ansible
-            group: mysql
-          - container: pgsql-ubuntu20
-            image: geerlingguy/docker-ubuntu2004-ansible
-            group: postgresql
-          - container: mysql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: mysql
-          - container: pgsql-debian
-            image: geerlingguy/docker-debian11-ansible
-            group: postgresql
+        container:
+          - rockylinux9
+          - rockylinux8
+          - ubuntu2204
+          - ubuntu2004
+          - ubuntu1804
+          - debian11
+          - debian10
         collection_role:
           - zabbix_web
+        database:
+          - mysql
+          - pgsql
+        web_server:
+          - nginx
+        version:
+          - v64
+          - v62
+          - v60
+        include:
+          - interpreter: python3
+        exclude:
+          - container: debian10
+            version: v62
+          - container: ubuntu1804
+            version: v62
+          - container: debian10
+            version: v64
+          - container: ubuntu1804
+            version: v64
     steps:
       - name: Check out code
         uses: actions/checkout@v1
@@ -64,8 +73,11 @@ jobs:
 
       - name: Run role tests
         run: >-
-          MY_MOLECULE_CONTAINER=${{ matrix.molecule_distro.container }}
-          MY_MOLECULE_IMAGE=${{ matrix.molecule_distro.image }}
-          MY_MOLECULE_GROUP=${{ matrix.molecule_distro.group }}
-          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.molecule_distro.command }}
+          MY_MOLECULE_CONTAINER=${{ matrix.container }}
+          MY_MOLECULE_IMAGE=${{ matrix.container }}
+          MY_MOLECULE_VERSION=${{ matrix.version }}
+          MY_MOLECULE_DATABASE=${{ matrix.database }}
+          MY_MOLECULE_WEB_SERVER=${{ matrix.web_server }}
+          MY_MOLECULE_INTERPRETER=${{ matrix.interpreter }}
+          MY_MOLECULE_DOCKER_COMMAND=${{ matrix.command }}
           molecule test -s ${{ matrix.collection_role }}