Merge branch '3.0.0' into exclude_ubuntu18

ansible-collections · Oct 6, 2023 · 0e798b6 · 0e798b6
2 parents 9b8ff4a + 52943d1
commit 0e798b6
Show file tree

Hide file tree

Showing 190 changed files with 5,029 additions and 4,821 deletions.
diff --git a/.github/workflows/agent.yml b/.github/workflows/agent.yml
@@ -24,6 +24,7 @@ jobs:
           - rockylinux8
           - ubuntu2204
           - ubuntu2004
+          - debian12
           - debian11
           - debian10
         version:
@@ -35,13 +36,16 @@ jobs:
           - autopsk
           - agent2
           - agent2autopsk
+        exclude:
+          - container: debian12
+            version: v62
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/javagateway.yml b/.github/workflows/javagateway.yml
@@ -25,6 +25,7 @@ jobs:
           - centos7
           - ubuntu2204
           - ubuntu2004
+          - debian12
           - debian11
           - debian10
         version:
@@ -35,14 +36,17 @@ jobs:
           - interpreter: python3
           - interpreter: python
             container: centos7
+        exclude:
+          - container: debian12
+            version: v62
         collection_role:
           - zabbix_javagateway
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/plugins-integration.yml b/.github/workflows/plugins-integration.yml
@@ -31,25 +31,22 @@ jobs:
           - stable-2.15
           - devel
         python:
-          - 3.9
+          - '3.10'
 
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/community/zabbix
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
       - name: Install ansible-base (${{ matrix.ansible }})
         run: pip install https://github.com/ansible/ansible/archive/${{ matrix.ansible }}.tar.gz --disable-pip-version-check
 
-      - name: Install dependencies
-        run: pip install docker-compose
-
       - name: Install ansible.netcommon collection
         run: ansible-galaxy collection install ansible.netcommon -p $GITHUB_WORKSPACE
         working-directory: ./ansible_collections/community/zabbix
@@ -58,8 +55,9 @@ jobs:
       # the Zabbix server. To do this we spin up a Docker container using the `matrix`
       # of version and ports specified earlier.
       - name: Zabbix container server provisioning
-        run: docker-compose up -d
-        working-directory: ./ansible_collections/community/zabbix
+        uses: isbang/[email protected]
+        with:
+          compose-file: "./ansible_collections/community/zabbix/docker-compose.yml"
         env:
           zabbix_version: ${{ matrix.zabbix_container.version }}
 
@@ -76,6 +74,6 @@ jobs:
         working-directory: ./ansible_collections/community/zabbix
 
       # See the repots at https://codecov.io/gh/ansible-collections/community.zabbix
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v3
         with:
           fail_ci_if_error: false
diff --git a/.github/workflows/proxy.yml b/.github/workflows/proxy.yml
@@ -25,6 +25,7 @@ jobs:
           - centos7
           - ubuntu2204
           - ubuntu2004
+          - debian12
           - debian11
           - debian10
         collection_role:
@@ -41,12 +42,15 @@ jobs:
           - interpreter: python3
           - interpreter: python
             container: centos7
+        exclude:
+          - container: debian12
+            version: v62
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/repo-sanity.yml b/.github/workflows/repo-sanity.yml
@@ -10,16 +10,16 @@ jobs:
     strategy:
       matrix:
         python:
-          - 3.9
+          - '3.10'
     runs-on: ubuntu-latest
     steps:
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/community/zabbix
 
       - name: Set up Python ${{ matrix.python }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 
@@ -45,19 +45,19 @@ jobs:
           - stable-2.15
           - devel
         python:
-          - 3.9
+          - '3.10'
     runs-on: ubuntu-latest
     steps:
       # ansible-test requires the collection to be in a directory in the form
       # .../ansible_collections/NAMESPACE/COLLECTION_NAME/
 
       - name: Check out code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           path: ansible_collections/community/zabbix
 
       - name: Set up Python ${{ matrix.ansible }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python }}
 

diff --git a/.github/workflows/server.yml b/.github/workflows/server.yml
@@ -24,6 +24,7 @@ jobs:
           - rockylinux8
           - ubuntu2204
           - ubuntu2004
+          - debian12
           - debian11
           - debian10
         collection_role:
@@ -38,16 +39,18 @@ jobs:
         include:
           - interpreter: python3
         exclude:
+          - container: debian12
+            version: v62
           - container: debian10
             version: v62
           - container: debian10
             version: v64
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/.github/workflows/web.yml b/.github/workflows/web.yml
@@ -24,6 +24,7 @@ jobs:
           - rockylinux8
           - ubuntu2204
           - ubuntu2004
+          - debian12
           - debian11
           - debian10
         collection_role:
@@ -44,12 +45,14 @@ jobs:
             version: v62
           - container: debian10
             version: v64
+          - container: debian12
+            version: v62
     steps:
       - name: Check out code
-        uses: actions/checkout@v1
+        uses: actions/checkout@v4
 
       - name: Set up Python 3.9
-        uses: actions/setup-python@v1
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -5,6 +5,42 @@ community.zabbix Release Notes
 .. contents:: Topics
 
 
+v2.1.0
+======
+
+Minor Changes
+-------------
+
+- Multiple Roles - Replaced depricated 'include' statements with 'include_tasks'
+- Update action_groups variable in runtime.yml
+- all roles - Added support for Debian 12 (Bookworm)
+- all roles - Delete gpg ids variable.
+- all roles - Modified to allow a non-root user to run the role.
+- all roles - Updated testing to account for the correct version of Zabbix
+- zabbix_hostmacro module - Add description property for Host macro creation/update. Allow to set/update description of Zabbix host macros.
+- zabbix_proxy - Added installation of PyMySQL pip package
+- zabbix_proxy - Modified installation of Centos 7 MySQL client
+- zabbix_proxy - Standardized MySQL client installed on Debian and Ubuntu
+- zabbix_regexp module added
+- zabbix_settings module added
+- zabbix_token module added
+
+Bugfixes
+--------
+
+- agent role - Added missing become statement to allow run to role as nonroot
+- zabbix_host module - fix updating hosts that were discovered via LLD
+- zabbix_proxy role - failed at version validation. Fix adds cast of zabbix_proxy_version to float, similarly to the other roles.
+- zabbix_proxy role - undefined vars at updating proxy definition. Fix adds null defaults for zabbix_proxy_tlsaccept and zabbix_proxy_tlsconnect.
+- zabbix_web role - removed 'ssl on;' nginx configuration, which is no longer supported since nginx version 1.25.1.
+
+New Modules
+-----------
+
+- community.zabbix.zabbix_regexp - Create/update/delete Zabbix regular expression
+- community.zabbix.zabbix_settings - Update Zabbix global settings.
+- community.zabbix.zabbix_token - Create/Update/Generate/Delete Zabbix token.
+
 v2.0.1
 ======
 

diff --git a/README.md b/README.md
@@ -43,6 +43,7 @@ Click on the name of a plugin or module to view that content's documentation:
     - [zabbix_discovery_rule](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_discovery_rule_module.html)
     - [zabbix_globalmacro](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_globalmacro_module.html)
     - [zabbix_group_info](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_group_info_module.html)
+    - [zabbix_group_events_info](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_group_events_info_module.html)
     - [zabbix_group](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_group_module.html)
     - [zabbix_host_events_info](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_host_events_info_module.html)
     - [zabbix_host_info](https://docs.ansible.com/ansible/latest/collections/community/zabbix/zabbix_host_info_module.html)
@@ -103,7 +104,7 @@ You can also include it in a `requirements.yml` file along with other required c
 ---
 collections:
   - name: community.zabbix
-    version: 2.0.0
+    version: 2.1.0
   - name: ansible.posix
     version: 1.3.0
   - name: community.general
@@ -130,7 +131,7 @@ To use a module or role from this collection, reference them with their Fully Qu
       ...
 
 - name: If Zabbix WebUI runs on non-default (zabbix) path, e.g. http://<FQDN>/zabbixeu
-  set_fact:
+  ansible.builtin.set_fact:
     ansible_zabbix_url_path: 'zabbixeu'
 
 - name: Using Zabbix collection to manage Zabbix Server's elements with username/password
@@ -203,7 +204,7 @@ Or you include collection name `community.zabbix` in the playbook's `collections
     ansible_zabbix_auth_key: 8ec0d52432c15c91fcafe9888500cf9a607f44091ab554dbee860f6b44fac895
   tasks:
     - name: Ensure host is monitored by Zabbix
-      zabbix_host:
+      community.zabbix.zabbix_host:
         ...
 ```
 

diff --git a/changelogs/.plugin-cache.yaml b/changelogs/.plugin-cache.yaml
@@ -1,5 +1,4 @@
-objects:
-  role: {}
+objects: {}
 plugins:
   become: {}
   cache: {}
@@ -103,6 +102,11 @@ plugins:
       name: zabbix_proxy_info
       namespace: ''
       version_added: 1.5.0
+    zabbix_regexp:
+      description: Create/update/delete Zabbix regular expression
+      name: zabbix_regexp
+      namespace: ''
+      version_added: 2.1.0
     zabbix_script:
       description: Create/update/delete Zabbix scripts
       name: zabbix_script
@@ -113,6 +117,11 @@ plugins:
       name: zabbix_service
       namespace: ''
       version_added: null
+    zabbix_settings:
+      description: Update Zabbix global settings.
+      name: zabbix_settings
+      namespace: ''
+      version_added: 2.1.0
     zabbix_template:
       description: Create/update/delete Zabbix template
       name: zabbix_template
@@ -123,6 +132,11 @@ plugins:
       name: zabbix_template_info
       namespace: ''
       version_added: null
+    zabbix_token:
+      description: Create/Update/Generate/Delete Zabbix token.
+      name: zabbix_token
+      namespace: ''
+      version_added: 2.1.0
     zabbix_user:
       description: Create/update/delete Zabbix users
       name: zabbix_user
@@ -157,4 +171,4 @@ plugins:
   shell: {}
   strategy: {}
   vars: {}
-version: 2.0.1
+version: 2.1.0