-
Notifications
You must be signed in to change notification settings - Fork 492
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #13391 from Security-Onion-Solutions/2.4/dev
2.4.90
- Loading branch information
Showing
50 changed files
with
659 additions
and
416 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
2.4.80 | ||
2.4.90 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{% set node_types = {} %} | ||
{% for minionid, ip in salt.saltutil.runner( | ||
'mine.get', | ||
tgt='elasticsearch:enabled:true', | ||
fun='network.ip_addrs', | ||
tgt_type='pillar') | dictsort() | ||
%} | ||
|
||
# only add a node to the pillar if it returned an ip from the mine | ||
{% if ip | length > 0%} | ||
{% set hostname = minionid.split('_') | first %} | ||
{% set node_type = minionid.split('_') | last %} | ||
{% if node_type not in node_types.keys() %} | ||
{% do node_types.update({node_type: {hostname: ip[0]}}) %} | ||
{% else %} | ||
{% if hostname not in node_types[node_type] %} | ||
{% do node_types[node_type].update({hostname: ip[0]}) %} | ||
{% else %} | ||
{% do node_types[node_type][hostname].update(ip[0]) %} | ||
{% endif %} | ||
{% endif %} | ||
{% endif %} | ||
{% endfor %} | ||
|
||
|
||
elasticsearch: | ||
nodes: | ||
{% for node_type, values in node_types.items() %} | ||
{{node_type}}: | ||
{% for hostname, ip in values.items() %} | ||
{{hostname}}: | ||
ip: {{ip}} | ||
{% endfor %} | ||
{% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
{% set node_types = {} %} | ||
{% for minionid, ip in salt.saltutil.runner( | ||
'mine.get', | ||
tgt='redis:enabled:true', | ||
fun='network.ip_addrs', | ||
tgt_type='pillar') | dictsort() | ||
%} | ||
|
||
# only add a node to the pillar if it returned an ip from the mine | ||
{% if ip | length > 0%} | ||
{% set hostname = minionid.split('_') | first %} | ||
{% set node_type = minionid.split('_') | last %} | ||
{% if node_type not in node_types.keys() %} | ||
{% do node_types.update({node_type: {hostname: ip[0]}}) %} | ||
{% else %} | ||
{% if hostname not in node_types[node_type] %} | ||
{% do node_types[node_type].update({hostname: ip[0]}) %} | ||
{% else %} | ||
{% do node_types[node_type][hostname].update(ip[0]) %} | ||
{% endif %} | ||
{% endif %} | ||
{% endif %} | ||
{% endfor %} | ||
|
||
|
||
redis: | ||
nodes: | ||
{% for node_type, values in node_types.items() %} | ||
{{node_type}}: | ||
{% for hostname, ip in values.items() %} | ||
{{hostname}}: | ||
ip: {{ip}} | ||
{% endfor %} | ||
{% endfor %} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
salt/influxdb/templates/dashboard-security_onion_performance.json
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.