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.

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

show last highstate date/time on grid metrics screen; expose maxUploa… #12090

Merged
merged 1 commit into from
Dec 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions salt/soc/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1640,6 +1640,9 @@ soc:
query: '* | groupby destination.port rule.name event.severity_label'
- name: Ungroup
query: '*'
grid:
maxUploadSize: 26214400
staleMetricsMs: 120000
cases:
advanced: false
aggregationActionsEnabled: false
Expand Down
7 changes: 7 additions & 0 deletions salt/soc/soc_soc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,13 @@ soc:
alerts: *appSettings
cases: *appSettings
dashboards: *appSettings
grid:
maxUploadSize:
description: The maximum number of bytes for an uploaded PCAP import file.
global: True
staleMetricsMs:
description: The age in milliseconds of node metrics when they are considered stale. Stale metrics have a faded appearance on the Grid screen.
global: True
case:
analyzerNodeId:
description: The node ID on which analyzers will be executed.
Expand Down
12 changes: 12 additions & 0 deletions salt/telegraf/defaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ telegraf:
eval:
- checkfiles.sh
- influxdbsize.sh
- lasthighstate.sh
- oldpcap.sh
- os.sh
- raid.sh
Expand All @@ -25,6 +26,7 @@ telegraf:
- checkfiles.sh
- eps.sh
- influxdbsize.sh
- lasthighstate.sh
- oldpcap.sh
- os.sh
- raid.sh
Expand All @@ -36,23 +38,27 @@ telegraf:
- zeekloss.sh
manager:
- influxdbsize.sh
- lasthighstate.sh
- os.sh
- raid.sh
- redis.sh
- sostatus.sh
managersearch:
- eps.sh
- influxdbsize.sh
- lasthighstate.sh
- os.sh
- raid.sh
- redis.sh
- sostatus.sh
import:
- influxdbsize.sh
- lasthighstate.sh
- os.sh
- sostatus.sh
sensor:
- checkfiles.sh
- lasthighstate.sh
- oldpcap.sh
- os.sh
- raid.sh
Expand All @@ -64,6 +70,7 @@ telegraf:
heavynode:
- checkfiles.sh
- eps.sh
- lasthighstate.sh
- oldpcap.sh
- os.sh
- raid.sh
Expand All @@ -74,22 +81,27 @@ telegraf:
- zeekcaptureloss.sh
- zeekloss.sh
idh:
- lasthighstate.sh
- os.sh
- sostatus.sh
searchnode:
- eps.sh
- lasthighstate.sh
- os.sh
- raid.sh
- sostatus.sh
receiver:
- eps.sh
- lasthighstate.sh
- os.sh
- raid.sh
- redis.sh
- sostatus.sh
fleet:
- lasthighstate.sh
- os.sh
- sostatus.sh
desktop:
- lasthighstate.sh
- os.sh
- sostatus.sh
1 change: 1 addition & 0 deletions salt/telegraf/enabled.sls
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ so-telegraf:
- /opt/so/log/suricata:/var/log/suricata:ro
- /opt/so/log/raid:/var/log/raid:ro
- /opt/so/log/sostatus:/var/log/sostatus:ro
- /opt/so/log/salt:/var/log/salt:ro
{% if DOCKER.containers['so-telegraf'].custom_bind_mounts %}
{% for BIND in DOCKER.containers['so-telegraf'].custom_bind_mounts %}
- {{ BIND }}
Expand Down
18 changes: 18 additions & 0 deletions salt/telegraf/scripts/lasthighstate.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
#
# Copyright Security Onion Solutions LLC and/or licensed to Security Onion Solutions LLC under one
# or more contributor license agreements. Licensed under the Elastic License 2.0 as shown at
# https://securityonion.net/license; you may not use this file except in compliance with the
# Elastic License 2.0.

# if this script isn't already running
if [[ ! "`pidof -x $(basename $0) -o %PPID`" ]]; then

LAST_HIGHSTATE_END=$([ -e "/var/log/salt/lasthighstate" ] && date -r /var/log/salt/lasthighstate +%s || echo 0)
NOW=$(date +%s)
HIGHSTATE_AGE_SECONDS=$((NOW-LAST_HIGHSTATE_END))
echo "salt highstate_age_seconds=$HIGHSTATE_AGE_SECONDS"

fi

exit 0
Loading