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.

Sign up for GitHub

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

Jump to bottom

2.4/dev #1

Closed
wants to merge 292 commits into from
Closed

2.4/dev #1

wants to merge 292 commits into from

Conversation

reyesj2
Copy link
Owner

@reyesj2 reyesj2 commented Jun 25, 2024

No description provided.

m0duspwnens and others added 30 commits April 10, 2024 13:14
@m0duspwnens
Merge remote-tracking branch 'origin/2.4/dev' into kaffytaffy
e9e61ea
@m0duspwnens
disable logstash and redis if kafka enabled
d3bd56b
@reyesj2
Remove references to kafkanode
af53dcd 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Run kafka-clusterid script when pillar values are missing
ca7253a 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Update annotation for global.pipeline
6b28dc7 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Use global.pipeline for redis / kafka states
3955587 
Signed-off-by: reyesj2 <[email protected]>
@m0duspwnens
add kafka to receiver
f514e5e
@m0duspwnens
move kafka_cluster_id to kafka:cluster_id
a54a72c
@m0duspwnens
create kratos local pillar dirs during setup
0ed9894
@reyesj2
Make global.pipeline use GLOBALMERGED value
fbd3cff 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Merge kaffytaffy
af29ae1 
Signed-off-by: reyesj2 <[email protected]>
@m0duspwnens
add receiver managersearch and standalone to kafka.nodes pillar
04ddcd5
@m0duspwnens
order kafka pillar assignment
d73ba7d
@reyesj2
Note to remove so-kafka-clusterid. Update soup and setup to generate …
a6ff92b 
…needed kafka pillar values

Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Typo
911ee57 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Merge kaffytaffy
fcfbb1e 
Signed-off-by: reyesj2 <[email protected]>
@m0duspwnens
need /opt/so/conf/ca/cacerts on receiver for kafka to run
c014508
@m0duspwnens
just broker as default process
bb983d4
@reyesj2
update default process.role to broker only
de6ea29 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Merge remote-tracking branch 'remotes/origin/kaffytaffy' into reyesj2…
eedea2c 
…/kafka
@m0duspwnens
restart salt minion if a manager and signing policies change
c4994a2
@m0duspwnens
watch pillar files for changes and do something
4b79623
@reyesj2
Update Kafka nodeid
665b719 
Update so-minion to include running kafka.nodes state to ensure nodeid is generated for new brokers

Signed-off-by: reyesj2 <[email protected]>
@m0duspwnens
watch a pillar in files and take action
4caa6a1
@m0duspwnens
more comments, better logging
506bbd3
@m0duspwnens
improve it
610dd2c
@reyesj2
Update map files to handle empty kafka:nodes pillar
5cc358d 
Signed-off-by: reyesj2 <[email protected]>
@m0duspwnens
match keys better. go through files reverse first found is prio
1f6eb9c
@reyesj2
Variables no longer used. Replaced by map file
fe81ffa 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
update so-kafka-clusterid
746128e 
This is a temporary script used to setup kafka secret and clusterid needed for kafka to start. This scripts functionality will be replaced by soup/setup scripts

Signed-off-by: reyesj2 <[email protected]>
reyesj2 and others added 28 commits June 20, 2024 16:18
@reyesj2
Merge pull request Security-Onion-Solutions#13242 from Security-Onion…
8781419 
…-Solutions/annotupd

update kafka annotations
@TOoSmOotH
Update soc_manager.yaml
aae1b69
@TOoSmOotH
Merge pull request Security-Onion-Solutions#13244 from Security-Onion…
f1dc22a 
…-Solutions/TOoSmOotH-patch-4

Update soc_manager.yaml
@TOoSmOotH
Update so-repo-sync
70c001e
@TOoSmOotH
Make soup use reposync from the repo
c5ce710
@TOoSmOotH
Make soup use reposync from the repo
ff4679e
@TOoSmOotH
Make soup use reposync from the repo
b84521c
@TOoSmOotH
Make soup use reposync from the repo
6a9d78f
@TOoSmOotH
Make soup use reposync from the repo
0295b8d
@TOoSmOotH
Make soup use reposync from the repo
77dedc5
@TOoSmOotH
Make soup use reposync from the repo
9577c3f
@weslambert
Add option for detections without license
bf91030
@weslambert
Merge pull request Security-Onion-Solutions#13246 from Security-Onion…
6141c7a 
…-Solutions/fix/detections_license_none

Add option for detections without a license
@TOoSmOotH
Merge pull request Security-Onion-Solutions#13245 from Security-Onion…
9fce85c 
…-Solutions/proxysoup

Fix soup for proxy servers
@reyesj2
remove import/heavynode artifact caused by kafka cert not existing bu…
c332cd7 
…t being bound in docker. (empty dir created)

Signed-off-by: reyesj2 <[email protected]>
@reyesj2
update firewall
ea771ed 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Re-add manager sbin_jinja file recurse
680e848 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Merge pull request Security-Onion-Solutions#13251 from Security-Onion…
9a0bad8 
…-Solutions/kafkaflt

FIX: update firewall defaults
@reyesj2
remove unused sbin_jinja from kafka config
cb727bf 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
delete commented block
81ce762 
Signed-off-by: reyesj2 <[email protected]>
@reyesj2
Merge pull request Security-Onion-Solutions#13253 from Security-Onion…
93378e9 
…-Solutions/kafkaflt

Remove unused sbin_jinja for kafka
@TOoSmOotH
2.4.80
af5e7cd
@TOoSmOotH
Update DOWNLOAD_AND_VERIFY_ISO.md
d34605a
@TOoSmOotH
Merge pull request Security-Onion-Solutions#13254 from Security-Onion…
d4107dc 
…-Solutions/2.4.80

2.4.80
@TOoSmOotH
Merge branch '2.4/main' of github.com:Security-Onion-Solutions/securi…
81b4c4e 
…tyonion into fixmain
@TOoSmOotH
Merge pull request Security-Onion-Solutions#13256 from Security-Onion…
156176c 
…-Solutions/fixmain

Fix git
@TOoSmOotH
Update .gitleaks.toml
caec424
@TOoSmOotH
Merge pull request Security-Onion-Solutions#13259 from Security-Onion…
51bb483 
…-Solutions/TOoSmOotH-patch-5

Update .gitleaks.toml
@reyesj2 reyesj2 closed this Jun 25, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Jun 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@reyesj2 @m0duspwnens @TOoSmOotH @weslambert @coreyogburn @jertel @defensivedepth @dougburks @mc-wright