8000 2.0.0 by BGmot · Pull Request #979 · ansible-collections/community.zabbix · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

2.0.0 #979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 24 commits into from
May 3, 2023
Merged

2.0.0 #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
8a8647d
Server update (#1) (#895)
pyrodie18 Feb 8, 2023
99e0c76
2.0.0 dev2 (#904)
pyrodie18 Apr 8, 2023
cbb44b3
Server fix (#943)
pyrodie18 Apr 8, 2023
19c4796
Proxy fix (#944)
pyrodie18 Apr 9, 2023
0bd2dc5
Other fixes (#945)
pyrodie18 Apr 9, 2023
b5d366c
Agent Update (#948)
pyrodie18 Apr 9, 2023
eab3905
Documentation (#954)
pyrodie18 Apr 12, 2023
aa718eb
Fix all the errors after re-basing against main.
BGmot Apr 16, 2023
7f7520c
modules 2.0.0 (#963)
BGmot Apr 18, 2023
3778dd3
Tag cleanup (#964)
pyrodie18 Apr 29, 2023
2a4e1b9
Removed old apt keys from vars files (#965)
pyrodie18 Apr 29, 2023
0c0bb72
Fix default version (#966)
pyrodie18 Apr 29, 2023
cf1f762
Created Change Fragment (#967)
pyrodie18 Apr 29, 2023
bf20dcf
Replaced deprecated apt_key (#969)
hernandanielg May 1, 2023
8c5d91b
CI: don't hardcode the workspace (#971)
flowerysong May 1, 2023
493d5ab
Correct minimum ansible version (#974)
flowerysong May 1, 2023
672a49d
Bgmot modules old versions 200 (#976)
BGmot May 1, 2023
b95335a
More code clean up (#977)
BGmot May 3, 2023
c0f942f
Fix typo in changelog fragment.
BGmot May 3, 2023
9104552
Missing changelog fragment added.
BGmot May 3, 2023
49d3805
Missing changelog fragment added.
BGmot May 3, 2023
7688d32
Moved "installation from epel" from major_changes to breaking_changes…
BGmot May 3, 2023
3e466b7
Antsibull-changelog run.
BGmot May 3, 2023
70351ff
galaxy.yml updated with 2.0.0.
BGmot May 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 17 additions & 28 deletions .github/workflows/agent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,35 +19,23 @@ jobs:
strategy:
fail-fast: false
matrix:
molecule_distro:
- container: centos8
image: geerlingguy/docker-rockylinux8-ansible:latest
- container: centos7
image: geerli 10000 ngguy/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
Expand Down Expand Up @@ -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 }}
51 changes: 31 additions & 20 deletions .github/workflows/javagateway.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
5 changes: 1 addition & 4 deletions .github/workflows/plugins-integration.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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
Expand Down
61 changes: 27 additions & 34 deletions .github/workflows/proxy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
58 changes: 33 additions & 25 deletions .github/workflows/server.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
58 changes: 35 additions & 23 deletions .github/workflows/web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 }}
Loading
0