Skip to content
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.

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

Fixes for Zabbix 6.0 #683

Merged
merged 27 commits into from
May 7, 2022
Merged

Fixes for Zabbix 6.0 #683

merged 27 commits into from
May 7, 2022

Conversation

BGmot
Copy link
Collaborator

@BGmot BGmot commented May 2, 2022

SUMMARY

Many modules currently fail with Zabbix 6.0.
This PR makes all modules correctly work with 6.0 with backward compatibility to previous Zabbix versions.

ISSUE TYPE
  • Feature Pull Request
COMPONENT NAME

plugins/modules/zabbix_action.py
plugins/modules/zabbix_maintenance.py
plugins/modules/zabbix_mediatype.py
plugins/modules/zabbix_proxy.py
plugins/modules/zabbix_service.py

@codecov
Copy link

codecov bot commented May 2, 2022

Codecov Report

Merging #683 (f81c03e) into main (de43c65) will increase coverage by 5.45%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #683      +/-   ##
==========================================
+ Coverage   70.39%   75.85%   +5.45%     
==========================================
  Files          27       27              
  Lines        3581     3641      +60     
  Branches      935      988      +53     
==========================================
+ Hits         2521     2762     +241     
+ Misses        772      571     -201     
- Partials      288      308      +20     
Impacted Files Coverage Δ
...community/zabbix/plugins/modules/zabbix_service.py 79.60% <0.00%> (-6.54%) ⬇️
...mmunity/zabbix/plugins/modules/zabbix_mediatype.py 87.32% <0.00%> (+0.36%) ⬆️
.../community/zabbix/plugins/modules/zabbix_screen.py 70.25% <0.00%> (+1.02%) ⬆️
...ns/community/zabbix/plugins/modules/zabbix_host.py 83.01% <0.00%> (+1.04%) ⬆️
...s/community/zabbix/plugins/modules/zabbix_proxy.py 51.93% <0.00%> (+1.14%) ⬆️
...ommunity/zabbix/plugins/modules/zabbix_template.py 78.43% <0.00%> (+1.48%) ⬆️
...unity/zabbix/plugins/modules/zabbix_maintenance.py 70.70% <0.00%> (+1.66%) ⬆️
...unity/zabbix/plugins/modules/zabbix_globalmacro.py 76.52% <0.00%> (+1.73%) ⬆️
.../community/zabbix/plugins/modules/zabbix_action.py 66.02% <0.00%> (+2.99%) ⬆️
...mmunity/zabbix/plugins/modules/zabbix_user_info.py 82.85% <0.00%> (+5.71%) ⬆️
... and 4 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 83c6c0c...f81c03e. Read the comment docs.

BGmot added 23 commits May 3, 2022 23:30
…d passwd must not be provided in API call (Zabbix 6.0)
…are dicts and lists instead of just strings).
@dj-wasabi
Copy link
Contributor

Looks good @BGmot 👍

As long as the [WIP] is in the title, I won't do anything btw.. So when you think you are happy to have it merged, please remove the [WIP].. Thank you for all the work you do! 👍

@BGmot BGmot changed the title [WIP] Fixes for Zabbix 6.0 Fixes for Zabbix 6.0 May 5, 2022
@BGmot
Copy link
Collaborator Author

BGmot commented May 5, 2022

Removed [WIP]. Thanks for your help!

@D3DeFi D3DeFi self-requested a review May 5, 2022 14:25
@D3DeFi
Copy link
Contributor

D3DeFi commented May 5, 2022

I would like to read through this first tomorrow so I better understand all of the changes and then we can merge

Copy link
Contributor

@D3DeFi D3DeFi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What an amazing patch this is! Really good job @BGmot , thank you!

Can you please check my comments and help me understand some of the logic I pin-pointed? I think this is almost ready to be merged. And there are even tests! <3

Can you please also drop short changelog fragments to changelogs/fragments/683-zbx60.yml? https://docs.ansible.com/ansible/latest/community/development_process.html#creating-a-changelog-fragment

Copy link
Contributor

@D3DeFi D3DeFi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then I am ok with merging :)

Or will you be pushing removal of i2?

@BGmot
Copy link
Collaborator Author

BGmot commented May 6, 2022

I will be pushing removal of i2 and updating CHANGELOG but it's going to be later, stupid work distracts me from what I love doing -(

Copy link
Contributor

@D3DeFi D3DeFi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome! :) Once again, thank you very much for this amazing patch!

@D3DeFi D3DeFi merged commit eeee550 into ansible-collections:main May 7, 2022
@BGmot
Copy link
Collaborator Author

BGmot commented May 7, 2022

Once again, thank you very much for this amazing patch!

Anytime. Thanks for your your guidance.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants