saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30273 from rallytime/bp-30121

Browse source 
Back-port #30121 to 2015.8
This commit is contained in:
Mike Place 2016-01-12 12:10:16 -07:00
commit c9ade42d10
1 changed files with 36 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
salt/beacons/service.py
View file

@ -11,7 +11,7 @@ import logging
log = logging.getLogger(__name__) # pylint: disable=invalid-name
last_status = {}
LAST_STATUS = {}
def validate(config):
@ -44,20 +44,28 @@ def beacon(config):
The config also supports two other parameters for each service:
`onchangeonly`: when `onchangeonly` is True the beacon will fire
events only when the service status changes. Otherwise, it will fire an event
at each beacon interval. The default is False.
events only when the service status changes. Otherwise, it will fire an
event at each beacon interval. The default is False.
`uncleanshutdown`: If `uncleanshutdown` is present it should point to the location
of a pid file for the service. Most services will not clean up this pid file
if they are shutdown uncleanly (e.g. via `kill -9`) or if they are terminated
through a crash such as a segmentation fault. If the file is present, then
the beacon will add `uncleanshutdown: True` to the event. If not present,
the field will be False. The field is only added when the service is NOT running.
Omitting the configuration variable altogether will turn this feature off.
`uncleanshutdown`: If `uncleanshutdown` is present it should point to the
location of a pid file for the service. Most services will not clean up
this pid file if they are shutdown uncleanly (e.g. via `kill -9`) or if they
are terminated through a crash such as a segmentation fault. If the file is
present, then the beacon will add `uncleanshutdown: True` to the event. If
not present, the field will be False. The field is only added when the
service is NOT running. Omitting the configuration variable altogether will
turn this feature off.
Here is an example that will fire an event whenever the state of nginx changes
and report an uncleanshutdown. This example is for Arch, which places nginx's
pid file in `/run`.
Please note that some init systems can remove the pid file if the service
registers as crashed. One such example is nginx on CentOS 7, where the
service unit removes the pid file when the service shuts down (IE: the pid
file is observed as removed when kill -9 is sent to the nginx master
process). The 'uncleanshutdown' option might not be of much use there,
unless the unit file is modified.
Here is an example that will fire an event whenever the state of nginx
changes and report an uncleanshutdown. This example is for Arch, which
places nginx's pid file in `/run`.
.. code-block:: yaml
@ -72,21 +80,27 @@ def beacon(config):
ret_dict = {}
ret_dict[service] = {'running': __salt__['service.status'](service)}
# If no options is given to the service, we fall back to the defaults
# assign a False value to oncleanshutdown and onchangeonly. Those
# key:values are then added to the service dictionary.
if config[service] is None:
defaults = {
'oncleanshutdown': False,
'onchangeonly': False
}
config[service] = defaults
# We only want to report the nature of the shutdown
# if the current running status is False
# as well as if the config for the beacon asks for it
if 'uncleanshutdown' in config[service] and not ret_dict[service]['running']:
filename = config[service]['uncleanshutdown']
if os.path.exists(filename):
ret_dict[service]['shutdown'] = 'unclean'
else:
ret_dict[service]['shutdown'] = 'clean'
ret_dict[service]['uncleanshutdown'] = True if os.path.exists(filename) else False
if 'onchangeonly' in config[service] and config[service]['onchangeonly'] is True:
if service not in last_status:
last_status[service] = ''
if last_status[service] != ret_dict[service]:
last_status[service] = ret_dict[service]
if service not in LAST_STATUS:
LAST_STATUS[service] = ''
if LAST_STATUS[service] != ret_dict[service]:
LAST_STATUS[service] = ret_dict[service]
ret.append(ret_dict)
else:
ret.append(ret_dict)