Commit Graph

1506 Commits

Author SHA1 Message Date
William Wernert
fe3aec173f Merge branch 'master' into feature/merge-2.3.51
# Conflicts:
#	VERSION
#	salt/influxdb/init.sls
2021-05-21 12:31:54 -04:00
Masaya-A
3450219bc7 Drop error to /dev/null 2021-05-20 09:33:14 +09:00
Masaya-A
6af126b872 Fix array 2021-05-19 10:02:19 +09:00
Masaya-A
ac42cba50b Adding MAC Address for NIC List 2021-05-19 09:06:02 +09:00
Jason Ertel
c207504657 Merge branch '2.3.51' of ssh://github.com/security-onion-solutions/securityonion into 2.3.51 2021-05-18 09:52:07 -04:00
Jason Ertel
fe155222c2 Introduce mixed-case sensor into distributed test 2021-05-18 09:51:54 -04:00
m0duspwnens
e50002e0ca influx and grafana default for manager nodes - https://github.com/Security-Onion-Solutions/securityonion/issues/4207 2021-05-17 16:26:12 -04:00
m0duspwnens
3859f6464a dont be quiet on first grep 2021-05-14 08:56:42 -04:00
m0duspwnens
74f2a61b25 install influxdb and grafana during setup prior to final highstate 2021-05-13 09:06:47 -04:00
m0duspwnens
b01bfda862 Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-05-03 11:49:09 -04:00
William Wernert
19dd9b97d2 Don't ask for node description on eval and import installs 2021-05-03 09:40:53 -04:00
m0duspwnens
93ee96b1cd Ignore "Status .* was not found" due to output from salt http.query or http.wait_for_successful_query states used with retry 2021-04-29 10:19:42 -04:00
m0duspwnens
d9cb018a7d merge with dev, resolve conflicts 2021-04-28 10:19:01 -04:00
Mike Reeves
f2628f2e5b Prime the CentOS Repos 2021-04-23 12:09:41 -04:00
m0duspwnens
4f545eefc2 update preflight 2021-04-22 15:27:57 -04:00
m0duspwnens
6c8a2e68d9 Merge remote-tracking branch 'remotes/origin/dev' into issue/3264 2021-04-21 18:24:07 -04:00
William Wernert
c297031f6b Surround scalar in single quotes 2021-04-21 17:58:13 -04:00
William Wernert
071e5166b4 Set package manager source in patch pillar for yum.conf 2021-04-21 17:57:02 -04:00
William Wernert
261e7f7fd9 sed and grep need input files 2021-04-21 16:29:24 -04:00
William Wernert
c1ae7ff3b6 Set proxy, replace when setting up yum for manager proxy 2021-04-21 16:18:20 -04:00
William Wernert
f3d663f090 Don't set yum/apt proxy if updating through manager 2021-04-21 15:59:37 -04:00
William Wernert
075ba0d83b Fix salt-master check 2021-04-21 12:01:21 -04:00
William Wernert
3f007f1026 Disable fastestmirror during setup + soup 2021-04-20 15:18:06 -04:00
William Wernert
3d90423495 Fix summary message to preserve empty line 2021-04-20 14:44:58 -04:00
William Wernert
113e558a05 Set manager early for proxy config 2021-04-20 14:32:17 -04:00
William Wernert
ca9ac46cd2 Add keypress instruction at end of summary 2021-04-20 13:27:52 -04:00
William Wernert
95bb757b03 Fix salt-master check 2021-04-20 13:12:55 -04:00
William Wernert
bbf16d0f11 Show airgap prompt within if statement + persist variable for node installs 2021-04-20 11:34:17 -04:00
m0duspwnens
115764ae38 merge with dev and fix merge conflict in so-functions https://github.com/Security-Onion-Solutions/securityonion/issues/3264 2021-04-20 10:03:15 -04:00
William Wernert
b449955711 Proxy whiptail fixes
* Don't try to set up proxy/manager proxy during network only flow
* Fix logic to never show new menu on airgap, set MANAGERUPDATES to 1 on airgap minions
2021-04-19 16:26:53 -04:00
William Wernert
d2067a42bd Don't skip new menu on airgap minions 2021-04-19 14:12:53 -04:00
William Wernert
b37da027fd ECDSA to ED25519 2021-04-19 14:08:25 -04:00
William Wernert
d8457255cb n -> z 2021-04-19 14:06:10 -04:00
William Wernert
7948906f51 Fix minion airgap logic 2021-04-19 14:04:01 -04:00
William Wernert
ba9a45bd0f Split network init + ssh copy notices 2021-04-19 14:02:00 -04:00
William Wernert
07e0ce563d Symmetrical spaces + remove useless logic 2021-04-19 13:50:30 -04:00
William Wernert
002fa99055 Fix whiptail order 2021-04-19 13:47:50 -04:00
William Wernert
59247b4579 Add exit check to new menu 2021-04-19 13:45:01 -04:00
William Wernert
e8553162a5 [refactor] Change how whiptail asks for proxy settings 2021-04-19 10:51:39 -04:00
Mike Reeves
989c2b23b1 Fix Airgap Automation 2021-04-13 15:34:03 -04:00
m0duspwnens
78ff84f968 Merge remote-tracking branch 'remotes/origin/dev' into salt3003.1 2021-04-13 12:05:58 -04:00
m0duspwnens
eb94c011e2 update location of yum keys and repo files for setup 2021-04-13 11:15:15 -04:00
William Wernert
25637b74db Add back removed testing skip 2021-04-12 16:14:47 -04:00
William Wernert
cc344d921a Skip whiptail during testing, echo error message to setup log 2021-04-12 16:13:32 -04:00
William Wernert
8cb4a75eb1 Merge branch 'dev' into feature/setup-check-manager 2021-04-12 13:14:51 -04:00
William Wernert
73a1bdd885 Send stdout to log, and actually populate error message 2021-04-12 12:59:45 -04:00
William Wernert
4db20a00ff Add quotes around description, since it can contain spaces 2021-04-09 10:16:19 -04:00
William Wernert
026ce76966 Change airgap prompt to menu 2021-04-09 10:11:00 -04:00
William Wernert
764307bfa0 Reformat airgap whiptail prompt 2021-04-09 10:09:28 -04:00
William Wernert
fc9df2bbae Update airgap question to ask during minion installs too 2021-04-09 10:00:50 -04:00