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

zabbix_action - allowing string for esc_period #66841

Merged
merged 4 commits into from Feb 15, 2020
Merged

Conversation

rockaut
Copy link
Contributor

@rockaut rockaut commented Jan 28, 2020

SUMMARY

Fixes #51345

ISSUE TYPE
  • Bugfix Pull Request
COMPONENT NAME

zabbix_action

ADDITIONAL INFORMATION

In my opinion a specific check for the value type regarding the Zabbix version isn't needed. If one doesn't read the readme and is using a string for <= 3.2 the API request would fail and an error is raised.

If I should add one please comment.

@ansibot
Copy link
Contributor

ansibot commented Jan 28, 2020

@ansibot ansibot added affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. community_review In order to be merged, this PR must follow the community review workflow. module This issue/PR relates to a module. monitoring Monitoring category needs_triage Needs a first human triage before being processed. support:community This issue/PR relates to code supported by the Ansible community. zabbix Zabbix community labels Jan 28, 2020
@ansibot
Copy link
Contributor

ansibot commented Jan 28, 2020

The test ansible-test sanity --test validate-modules [explain] failed with 1 error:

test/sanity/ignore.txt:1970:1: A100: Ignoring 'doc-default-incompatible-type' on 'lib/ansible/modules/monitoring/zabbix/zabbix_action.py' is unnecessary

click here for bot help

@ansibot ansibot added ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed community_review In order to be merged, this PR must follow the community review workflow. ci_verified Changes made in this PR are causing tests to fail. labels Jan 28, 2020
@ansibot
Copy link
Contributor

ansibot commented Jan 28, 2020

The test ansible-test sanity --test validate-modules [explain] failed with 1 error:

test/sanity/ignore.txt:1970:1: A100: Ignoring 'doc-default-incompatible-type' on 'lib/ansible/modules/monitoring/zabbix/zabbix_action.py' is unnecessary

click here for bot help

@ansibot ansibot added the ci_verified Changes made in this PR are causing tests to fail. label Jan 28, 2020
@rockaut
Copy link
Contributor Author

rockaut commented Jan 28, 2020

Can someone please tell me what this CI error means? Don't get it.

@D3DeFi
Copy link
Contributor

D3DeFi commented Jan 28, 2020

Can someone please tell me what this CI error means? Don't get it.

delete line 1970 from test/sanity/ignore.txt and you should be good to go. It seems that by introducing this patch, you have fixed the original reason, why was sanity test doc-default-incompatible-type skipped for this module. With your patch, this sanity test should no longer be ignored, thus shippable is complaining (new modules and PRs are required to match ansible sanity standards)

Edit: reason seems to be that esc_period has implicit default type: str in module documentation when it should have been explicit type: int before this patch

@ansibot
Copy link
Contributor

ansibot commented Jan 28, 2020

@ansibot ansibot added support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. and removed ci_verified Changes made in this PR are causing tests to fail. needs_triage Needs a first human triage before being processed. labels Jan 28, 2020
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.

Works for me with ZBX > 3.4

-label needs_triage
shipit

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jan 28, 2020
@rockaut
Copy link
Contributor Author

rockaut commented Jan 28, 2020

Thank you @D3DeFi ... as a warning: there will be some more PR coming in the next weeks as I proceed to implement the different modules ;-)

@D3DeFi
Copy link
Contributor

D3DeFi commented Jan 28, 2020

Thank you @D3DeFi ... as a warning: there will be some more PR coming in the next weeks as I proceed to implement the different modules ;-)

Thank you for being so active :)

@sky-joker
Copy link
Contributor

Hi @rockaut

Could you please rebase and resolve the conflicts?

@ansibot ansibot removed the core_review In order to be merged, this PR must follow the core review workflow. label Jan 30, 2020
@ansibot ansibot added needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jan 30, 2020
@rockaut
Copy link
Contributor Author

rockaut commented Jan 30, 2020

Could you please rebase and resolve the conflicts?

@sky-joker can you give me a hint here? I've remove the one line because of the conversation with @D3DeFi on the sanity CI checks. As I understand the conflict it tells me I'm not allowed to remove this line but then the CI fails because it wants an int which is now a str because this would fix the "bug".

@D3DeFi
Copy link
Contributor

D3DeFi commented Jan 30, 2020

Could you please rebase and resolve the conflicts?

@sky-joker can you give me a hint here? I've remove the one line because of the conversation with @D3DeFi on the sanity CI checks. As I understand the conflict it tells me I'm not allowed to remove this line but then the CI fails because it wants an int which is now a str because this would fix the "bug".

here ya go
https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html

edit: nothing wrong on your part. This is very common with frequently modified resources (as is the case with ignore.txt for sanity testing). You just got caught in the middle of never ending changes to upstream. This wouldn't be a problem if your PR had been merged within a minutes of you opening it, but that is unfortunately not always possible. Sorry and thanks for understanding :)

@ansibot ansibot removed needs_rebase https://docs.ansible.com/ansible/devel/dev_guide/developing_rebasing.html support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Jan 30, 2020
@ansibot ansibot added the support:core This issue/PR relates to code supported by the Ansible Engineering Team. label Jan 30, 2020
@D3DeFi
Copy link
Contributor

D3DeFi commented Jan 30, 2020

cc @Akasurde (due to ignore.txt == support:core). Can this get merged please? :)
shipit

@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Jan 30, 2020
@sky-joker
Copy link
Contributor

Thank you @rockaut for resolved conflicts!

shipit

@ansibot ansibot added shipit This PR is ready to be merged by Core and removed core_review In order to be merged, this PR must follow the core review workflow. labels Jan 31, 2020
@gundalow gundalow merged commit 98bc53d into ansible:devel Feb 15, 2020
@ansible ansible locked and limited conversation to collaborators Mar 17, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.10 This issue/PR affects Ansible v2.10 bug This issue/PR relates to a bug. module This issue/PR relates to a module. monitoring Monitoring category shipit This PR is ready to be merged by Core support:community This issue/PR relates to code supported by the Ansible community. support:core This issue/PR relates to code supported by the Ansible Engineering Team. test This PR relates to tests. zabbix Zabbix community
Projects
None yet
Development

Successfully merging this pull request may close these issues.

zabbix_action: support for suffixed time values missing
5 participants