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

Follow up Kapacitor module enhancements. #46825

Merged
merged 5 commits into from Apr 16, 2018

Conversation

@aabouzaid
Copy link
Contributor

@aabouzaid aabouzaid commented Apr 3, 2018

What issues does this PR fix or reference?

A follow up for #46294

  • Update versionadded for new conf.
  • Make database name mandatory.

Previous Behavior

Database name was set to None where it was producing an error.

New Behavior

Database name is a mandatory field.

Tests written?

No need.

Commits signed with GPG?

Yes

@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 3, 2018

Copy link
Contributor

@cachedout cachedout left a comment

Approved pending the lint errors being fixed.

@aabouzaid aabouzaid force-pushed the kapacitor_enhancements branch from 4c4cdfd to 20f4be7 Apr 4, 2018
@@ -154,6 +159,12 @@ def define_task(name,
salt '*' kapacitor.define_task cpu salt://kapacitor/cpu.tick database=telegraf
'''
if not database and not dbrps:
Copy link
Contributor Author

@aabouzaid aabouzaid Apr 4, 2018

@cachedout Since we cannot change the parameter directly from optional to mandatory to avoid breaking anything, what do you think about this approach? 🤔

Copy link
Contributor

@cachedout cachedout Apr 9, 2018

If we do this we should also log an error with log.error() IMHO

@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 9, 2018

re-run py

@rallytime
Copy link
Contributor

@rallytime rallytime commented Apr 9, 2018

@aabouzaid It looks like your change is causing the following test to fail:

  • unit.modules.test_kapacitor.KapacitorTestCase.test_define_task

https://jenkins.saltstack.com/job/PR/job/salt-pr-linode-cent7-py3/3893/testReport/junit/unit.modules.test_kapacitor/KapacitorTestCase/test_define_task/

Can you take a look?

@cachedout
Copy link
Contributor

@cachedout cachedout commented Apr 12, 2018

Bump @aabouzaid. Will you be able to investigate the failing test?

@aabouzaid
Copy link
Contributor Author

@aabouzaid aabouzaid commented Apr 13, 2018

@cachedout I'm checking it right now, thanks.

@aabouzaid
Copy link
Contributor Author

@aabouzaid aabouzaid commented Apr 15, 2018

@cachedout everything looks fine now 🎉

@cachedout cachedout merged commit 5852993 into saltstack:develop Apr 16, 2018
5 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants