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

Enhancements to slack engine and wtmp beacon #48532

Merged
merged 6 commits into from Jul 13, 2018

Conversation

terminalmage
Copy link
Contributor

For the slack engine, the reuturn from commands spawned using the engine is now formatted using the engine specified in the raw return. Previously this would use the highstate outputter for all functions from the state module, and the yaml outputter for everything else.

For the wtmp beacon, the following was added:

  • action key added to the event data (either "login" or "logout")
  • Configurable ut_type to distinguish login and logout events (because hey, why the hell not)
  • Use of __context__ to store user attached to a given tty so that we can report the user that logged out.

Additionally, the wtmp and btmp beacon docs have been modified to include a reactor use case for using the events that are fired by the beacons.

This adds the following functionality:

- `action` key added to the event data (either "login" or "logout")
- Configurable ut_type to distinguish login and logout events (because
  hey, why the hell not)
- Use of `__context__` to store user attached to a given tty so that we
  can report the user that logged out.
This uses the outputter from the raw return dict instead of hard-coding
the highstate outputter for the state module and using yaml for
everything else.
@cachedout
Copy link
Contributor

Changelog docs?

@terminalmage
Copy link
Contributor Author

Added.

Copy link
Contributor

@rallytime rallytime left a comment

Choose a reason for hiding this comment

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

I have one picky comment, but it's not a big deal. Only something I noticed.

Enhancements to :py:mod:`wtmp <salt.beacons.wtmp>` Beacon
=========================================================

A new key, `action`, has been added to the events fired by this beacon, which
Copy link
Contributor

Choose a reason for hiding this comment

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

Double backticks for code demarcation? :)

There's some other examples below that also need double backticks instead of single.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch. I have been writing a lot of markdown this week and my head was still in that mode. 😄

@rallytime rallytime merged commit f0fc854 into saltstack:develop Jul 13, 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.

None yet

3 participants