mirror of
https://github.com/Security-Onion-Solutions/securityonion.git
synced 2025-12-06 17:22:49 +01:00
Merge branch '2.4/dev' into reyesj2/retention
This commit is contained in:
@@ -41,13 +41,13 @@ create_temp_file() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
log_title() {
|
log_title() {
|
||||||
if [ $1 == "LOG" ]; then
|
if [ "$1" == "LOG" ]; then
|
||||||
echo -e "\n${BOLD}================ $2 ================${NC}\n"
|
echo -e "\n${BOLD}================ $2 ================${NC}\n"
|
||||||
elif [ $1 == "OK" ]; then
|
elif [ "$1" == "OK" ]; then
|
||||||
echo -e "${GREEN} $2 ${NC}"
|
echo -e "${GREEN} $2 ${NC}"
|
||||||
elif [ $1 == "WARN" ]; then
|
elif [ "$1" == "WARN" ]; then
|
||||||
echo -e "${YELLOW} $2 ${NC}"
|
echo -e "${YELLOW} $2 ${NC}"
|
||||||
elif [ $1 == "ERROR" ]; then
|
elif [ "$1" == "ERROR" ]; then
|
||||||
echo -e "${RED} $2 ${NC}"
|
echo -e "${RED} $2 ${NC}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
@@ -1138,8 +1138,9 @@ else
|
|||||||
for i in "${!scheduled_indices_names[@]}"; do
|
for i in "${!scheduled_indices_names[@]}"; do
|
||||||
sorted_indices+=("${scheduled_indices_days[$i]}|${scheduled_indices_names[$i]}|${scheduled_indices_sizes[$i]}")
|
sorted_indices+=("${scheduled_indices_days[$i]}|${scheduled_indices_names[$i]}|${scheduled_indices_sizes[$i]}")
|
||||||
done
|
done
|
||||||
|
OLD_IFS="$IFS"
|
||||||
IFS=$'\n' sorted_indices=($(sort -t'|' -k1 -n <<<"${sorted_indices[*]}"))
|
IFS=$'\n' sorted_indices=($(sort -t'|' -k1 -n <<<"${sorted_indices[*]}"))
|
||||||
unset IFS
|
IFS="$OLD_IFS"
|
||||||
|
|
||||||
for entry in "${sorted_indices[@]}"; do
|
for entry in "${sorted_indices[@]}"; do
|
||||||
IFS='|' read -r days_until index_name size_bytes <<< "$entry"
|
IFS='|' read -r days_until index_name size_bytes <<< "$entry"
|
||||||
|
|||||||
Reference in New Issue
Block a user