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

Remove references to kafkanode #12792

Merged
merged 9 commits into from
Apr 12, 2024
Merged

Remove references to kafkanode #12792

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
af53dcd
Remove references to kafkanode
reyesj2 Apr 11, 2024
ca7253a
Run kafka-clusterid script when pillar values are missing
reyesj2 Apr 11, 2024
6b28dc7
Update annotation for global.pipeline
reyesj2 Apr 11, 2024
3955587
Use global.pipeline for redis / kafka states
reyesj2 Apr 11, 2024
fbd3cff
Make global.pipeline use GLOBALMERGED value
reyesj2 Apr 12, 2024
af29ae1
Merge kaffytaffy
reyesj2 Apr 12, 2024
a6ff92b
Note to remove so-kafka-clusterid. Update soup and setup to generate …
reyesj2 Apr 12, 2024
911ee57
Typo
reyesj2 Apr 12, 2024
fcfbb1e
Merge kaffytaffy
reyesj2 Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use global.pipeline for redis / kafka states 
Signed-off-by: reyesj2 <94730068+reyesj2@users.noreply.github.com>
  • Loading branch information
@reyesj2
reyesj2 committed Apr 11, 2024
commit 39555873729731bbf79ee3ebbe32d7c4c01e9ad9
3 changes: 2 additions & 1 deletion salt/global/defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
global:
pcapengine: STENO
pcapengine: STENO
pipeline: REDIS
2 changes: 2 additions & 0 deletions salt/global/soc_global.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ global:
advanced: True
pipeline:
description: Sets which pipeline technology for events to use. Currently only Redis is fully supported. Kafka is experimental and requires a Security Onion Pro license.
regex: ^(REDIS|KAFKA)$
regexFailureMessage: You must enter either REDIS or KAFKA.
global: True
advanced: True
repo_host:
Expand Down
3 changes: 2 additions & 1 deletion salt/kafka/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@
# Elastic License 2.0.

{% from 'kafka/map.jinja' import KAFKAMERGED %}
{% from 'vars/globals.map.jinja' import GLOBALS %}

include:
{% if KAFKAMERGED.enabled %}
{% if GLOBALS.pipeline == "KAFKA" and KAFKAMERGED.enabled %}
- kafka.enabled
{% else %}
- kafka.disabled
Expand Down
3 changes: 2 additions & 1 deletion salt/manager/tools/sbin/soup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,8 @@ post_to_2.4.60() {
}

post_to_2.4.70() {
echo "Nothing to apply"
echo "Removing global.pipeline pillar configuration"
sed -i '/pipeline:/d' /opt/so/saltstack/local/pillar/global/soc_global.sls
POSTVERSION=2.4.70
}

Expand Down
4 changes: 2 additions & 2 deletions salt/redis/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
# Elastic License 2.0.

{% from 'redis/map.jinja' import REDISMERGED %}
{% from 'kafka/map.jinja' import KAFKAMERGED %}
{% from 'vars/globals.map.jinja' import GLOBALS %}

include:
{% if REDISMERGED.enabled and not KAFKAMERGED.enabled %}
{% if GLOBALS.pipeline == "REDIS" and REDISMERGED.enabled %}
- redis.enabled
{% else %}
- redis.disabled
Expand Down
1 change: 0 additions & 1 deletion salt/vars/kafkanode.map.jinja
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion setup/so-functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1327,7 +1327,6 @@ create_global() {

# Continue adding other details
echo " imagerepo: '$IMAGEREPO'" >> $global_pillar_file
echo " pipeline: 'redis'" >> $global_pillar_file
echo " repo_host: '$HOSTNAME'" >> $global_pillar_file
echo " influxdb_host: '$HOSTNAME'" >> $global_pillar_file
echo " registry_host: '$HOSTNAME'" >> $global_pillar_file
Expand Down