Nicole Thomas
0c02b59ff1
Merge pull request #43349 from michelsen/add-rethinkdb-external-pillar
...
Added RethinkDB external pillar module
2017-09-26 10:35:57 -04:00
Nicole Thomas
499e7e8de9
Merge pull request #43705 from hathawsh/develop
...
Fixed the 'status.procs' and 'status.pid' functions for openvzhn environments
2017-09-26 09:43:18 -04:00
Erik Johnson
175b6f14a2
Merge pull request #43706 from twangboy/win_up_to_date
...
Add an `up_to_date` state to the `win_wua` state module
2017-09-26 07:55:55 -05:00
Erik Johnson
97b4613056
Merge pull request #43647 from sdodsley/inititator_grains
...
Add new grains to display minion storage initiators
2017-09-26 07:42:30 -05:00
Thomas S Hatch
d8f371b8b1
Merge pull request #43669 from moio/develop-limit-minion-processes
...
Introduce process_count_max minion configuration parameter (develop)
2017-09-26 05:56:11 -06:00
Shane Lee
5508fd2a1c
Merge branch 'develop' into win_up_to_date
2017-09-25 13:53:58 -06:00
Nicole Thomas
dd1286f7ed
Merge branch 'develop' into develop
2017-09-25 15:41:19 -04:00
Nicole Thomas
410fed3108
Merge branch 'develop' into add-rethinkdb-external-pillar
2017-09-25 15:36:46 -04:00
Nicole Thomas
16b8ec8471
Merge pull request #43604 from alexbleotu/dvs_states-gh
...
DVS states + dependencies
2017-09-25 15:34:45 -04:00
Nicole Thomas
ade7940837
Merge pull request #43717 from raazvvann/test_nilrt_ip-fixup
...
test_nilrt_ip: Fix set_static_all test
2017-09-25 13:49:23 -04:00
Alexandru Bleotu
3c26d4e3be
Updated all list_differ tests to compare dicts so the key order is not assumed
2017-09-25 13:11:08 -04:00
Alexandru Bleotu
cdb028b794
Added key sorting to have deterministing string repr of RecursiveDictDiffer objects
2017-09-25 13:09:47 -04:00
Nicole Thomas
2e01c98abd
Merge pull request #43721 from sdodsley/purefa_doc
...
Update documentation in Pure Storage [purefa] module
2017-09-25 12:57:42 -04:00
Simon Dodsley
8d6ab66658
Add new core grains to display minion storage initiators
...
Support for Linux and Windows platforms to display both the
iSCSI IQN and Fibre Channel HBA WWPNs.
With the integration of storage modules to allow configuration
of 3rd party external storage arrays, these values are needed to
enable the full auotmation of storage provisioning to minions.
Support for Windows, Linux and AIX (iSCSI only)
2017-09-25 09:17:23 -07:00
Nicole Thomas
86907b330d
Merge branch 'develop' into develop
2017-09-25 12:16:26 -04:00
Nicole Thomas
8739cd62a8
Merge pull request #43726 from saltstack/revert-43688-develop
...
Revert "Extend openscap module command parsing."
2017-09-25 12:12:02 -04:00
Nicole Thomas
68e1bd99eb
Revert "Extend openscap module command parsing."
2017-09-25 12:10:23 -04:00
twangboy
be554c898b
Rename new state to uptodate
2017-09-25 09:23:43 -06:00
twangboy
72d96ed74b
Add an up_to_date state to win_wua
2017-09-25 09:23:43 -06:00
Nicole Thomas
1b6d936e7d
Merge branch 'develop' into add-rethinkdb-external-pillar
2017-09-25 10:15:57 -04:00
Simon Dodsley
3abba0b999
Update documentation in Pure Storage [purefa] module
...
Add external array authentication methods.
Changed version added to be Oxygen
2017-09-25 07:12:52 -07:00
Alexandru Bleotu
2d2f094810
Merge branch 'develop' into dvs_states-gh
2017-09-25 11:22:45 +01:00
Heghedus Razvan
19da1000b4
test_nilrt_ip: Fix set_static_all test
...
The nameservers needs to be specified only by ip address.
Signed-off-by: Heghedus Razvan <razvan.heghedus@ni.com>
2017-09-25 12:49:46 +03:00
Mike Place
68fa74e88f
Merge pull request #43571 from nadvornik/raid_add
...
Add missing devices to RAID array
2017-09-24 19:54:10 -06:00
Mike Place
52bc418ff8
Merge pull request #43690 from bodhi-space/infra5292_fluent
...
INFRA-5292 - add support to fluent logger for Graylog and GELF output formats
2017-09-24 19:30:22 -06:00
Mike Place
cae79d2020
Merge pull request #43699 from rallytime/merge-develop
...
[develop] Merge forward from 2017.7 to develop
2017-09-24 19:27:17 -06:00
Mike Place
f7df8ceb12
Merge pull request #43704 from garethgreenaway/monitor_user_and_time_in_btmp_and_wtmp
...
Updates to btmp and wtmp beacons
2017-09-24 19:25:47 -06:00
Alexandru Bleotu
847debab7a
Fix failing storage and listdiffer tests
2017-09-22 17:50:09 -04:00
Alexandru Bleotu
6b574ec5da
Return sorted added/removed/changed/unchanged keys in RecursiveDictDiffer so result is deterministic
2017-09-22 17:34:12 -04:00
Gareth J. Greenaway
db25b6500b
Fixing one more import.
2017-09-22 14:27:55 -07:00
Gareth J. Greenaway
fb0b987d06
Adding some lines to disable the lint errors on import for salt.ext.six.moves.
2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
2c0bc35963
Fixing lint errors.
2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
ca3f77f81e
Adding test_btmp_beacon.
2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
6fe02e3c6c
Updating btmp & wtmp beacons to work with python3. Adding ability to fire alerts for specific users & specific times. Adding some unit tests for both.
2017-09-22 14:24:31 -07:00
Gareth J. Greenaway
85f7549cb9
Adding the ability to monitoring logins by user & specific time ranges in the btmp & wtmp beacons
2017-09-22 14:24:31 -07:00
Shane Hathaway
ae035f6b4d
Fixed the 'status.procs' and 'status.pid' functions for openvzhn environments.
...
In openvzhn environments, running the 'ps' grain requires python_shell=True. This
may also be true of environments where the 'ps' grain has been customized.
2017-09-22 15:05:47 -06:00
Silvio Moioli
fd4194ade0
process_count_max: disable by default
2017-09-22 21:57:54 +02:00
Silvio Moioli
d53550de35
process_count_max: add unit test
2017-09-22 21:57:04 +02:00
Silvio Moioli
04ab9a6102
process_count_max: adapt existing unit tests
2017-09-22 21:57:04 +02:00
Silvio Moioli
4d181ea523
process_count_max: add defaults and documentation
2017-09-22 21:57:02 +02:00
Silvio Moioli
6baadf7a77
Introduce process_count_max minion configuration parameter
...
This allows users to limit the number of processes or threads a minion
will start in response to published messages, prevents resource
exhaustion in case a high number of concurrent jobs is scheduled in a
short time.
2017-09-22 21:56:26 +02:00
Nicole Thomas
d3db02e747
Merge branch 'develop' into add-rethinkdb-external-pillar
2017-09-22 15:39:06 -04:00
Mike Place
fc3489489e
Merge pull request #43435 from blueyed/boto_elb-register-currently-deregistrating
...
boto_elb.register_instances: do not skip instances being unregistered
2017-09-22 13:36:24 -06:00
Mike Place
93034ead24
Merge pull request #43337 from JoaquinVeira/patch-1
...
Update zabbix_return.py
2017-09-22 13:25:30 -06:00
Nicole Thomas
ba1b45c4b9
Merge pull request #43527 from OrlandoArcapix/patch-1
...
Update yumpkg.py
2017-09-22 15:21:42 -04:00
Mike Place
3ad43a5a67
Merge pull request #43470 from alexbleotu/esxdatacenter-gh
...
Fix to esxdatacenter proxy
2017-09-22 13:18:54 -06:00
rallytime
03ce4d81b7
Reactor Test: Fix incorrect merge conflict resolution
2017-09-22 15:01:11 -04:00
Alexandru Bleotu
c1d3bda729
Added python/pyvmomi compatibility check to salt.modules.vsphere + removed reference to Python 2.6
2017-09-22 14:49:47 -04:00
Alexandru Bleotu
f0a813b126
Review changes
2017-09-22 14:35:23 -04:00
Alexandru Bleotu
3c7c202216
Fixed assert_has_calls in vmware.utils.dvs tests
2017-09-22 14:35:21 -04:00
