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

Projects
None yet
3 participants
@terminalmage
Copy link
Contributor

commented Jul 11, 2018

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.

terminalmage added some commits Jul 11, 2018

Enhancements to wtmp beacon
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.
Improve output formatting in slack engine
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

This comment has been minimized.

Copy link
Collaborator

commented Jul 11, 2018

Changelog docs?

@terminalmage

This comment has been minimized.

Copy link
Contributor Author

commented Jul 12, 2018

Added.

@rallytime
Copy link
Contributor

left a comment

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

This comment has been minimized.

Copy link
@rallytime

rallytime Jul 12, 2018

Contributor

Double backticks for code demarcation? :)

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

This comment has been minimized.

Copy link
@terminalmage

terminalmage Jul 13, 2018

Author Contributor

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

terminalmage added some commits Jul 13, 2018

@rallytime rallytime merged commit f0fc854 into saltstack:develop Jul 13, 2018

7 of 17 checks passed

codeclimate 4 issues to fix
Details
jenkins/PR/salt-pr-linode-cent7-py3 Pull Requests » Salt PR - Linode CentOS 7 - PY3 #6448 — FAILURE
Details
jenkins/PR/salt-pr-linode-ubuntu14-n Pull Requests » Salt PR - Linode Ubuntu14.04 #24376 — FAILURE
Details
jenkins/pr/py3-centos-7 The py3-centos-7 job has failed
Details
default Build started sha1 is merged.
Details
jenkins/PR/salt-pr-linode-ubuntu16-py3 Pull Requests » Salt PR - Linode Ubuntu16.04 - PY3 #11418 — RUNNING
Details
jenkins/PR/salt-pr-rs-cent7-n Pull Requests » Salt PR - RS CentOS 7 #20501 — RUNNING
Details
jenkins/pr/py2-centos-7 running py2-centos-7...
Details
jenkins/pr/py2-ubuntu-1604 running py2-ubuntu-1604...
Details
jenkins/pr/py3-ubuntu-1604 running py3-ubuntu-1604...
Details
WIP ready for review
Details
continuous-integration/jenkins/pr-merge This commit looks good
Details
jenkins/PR/salt-pr-clone Pull Requests » Salt PR - Clone #26664 — SUCCESS
Details
jenkins/PR/salt-pr-docs-n Pull Requests » Salt PR - Docs #18693 — SUCCESS
Details
jenkins/PR/salt-pr-lint-n Pull Requests » Salt PR - Code Lint #23330 — SUCCESS
Details
jenkins/pr/docs The docs job has passed
Details
jenkins/pr/lint The lint job has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.