Skip to content

Follow up Kapacitor module enhancements.#46825

Merged
cachedout merged 5 commits intosaltstack:developfrom
aabouzaid:kapacitor_enhancements
Apr 16, 2018
Merged

Follow up Kapacitor module enhancements.#46825
cachedout merged 5 commits intosaltstack:developfrom
aabouzaid:kapacitor_enhancements

Conversation

@aabouzaid
Copy link
Contributor

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

Copy link
Contributor

@cachedout cachedout left a comment

Choose a reason for hiding this comment

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

Approved pending the lint errors being fixed.

@aabouzaid aabouzaid force-pushed the kapacitor_enhancements branch from 4c4cdfd to 20f4be7 Compare April 4, 2018 09:02

salt '*' kapacitor.define_task cpu salt://kapacitor/cpu.tick database=telegraf
'''
if not database and not dbrps:
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@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

Choose a reason for hiding this comment

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

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

@rallytime
Copy link
Contributor

re-run py

@rallytime
Copy link
Contributor

@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

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

@aabouzaid
Copy link
Contributor Author

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

@aabouzaid
Copy link
Contributor Author

@cachedout everything looks fine now 🎉

@cachedout cachedout merged commit 5852993 into saltstack:develop Apr 16, 2018
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