CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-06 17:22:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

remove influixdb salt state files and update patch files for influxdb salt modules/state

Browse Source
This commit is contained in:
m0duspwnens
2022-01-18 11:33:36 -05:00
parent 87999453f2
commit a2ed9a86ff
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
salt/common/tools/sbin/soup
View File

@@ -711,6 +711,8 @@ up_to_2.3.90() {
up_to_2.3.100() { up_to_2.3.100() {
echo "Updating to Security Onion 2.3.100" echo "Updating to Security Onion 2.3.100"
fix_wazuh fix_wazuh
echo "Removing /opt/so/state files for patched Salt InfluxDB module and state. This is due to Salt being upgraded and needing to patch the files again."
rm -vrf /opt/so/state/influxdb_continuous_query.py.patched /opt/so/state/influxdb_retention_policy.py.patched /opt/so/state/influxdbmod.py.patched
} }
verify_upgradespace() { verify_upgradespace() {

2
salt/salt/files/influxdb_continuous_query.py.patch
View File

@@ -1,4 +1,4 @@
60c60 56c56
< database, name, query, resample_time, coverage_period < database, name, query, resample_time, coverage_period
--- ---
> database, name, query, resample_time, coverage_period, **client_args > database, name, query, resample_time, coverage_period, **client_args

8
salt/salt/files/influxdb_retention_policy.py.patch
View File

@@ -1,16 +1,16 @@
38c38 34c34
< hours = int(duration.split("h")) < hours = int(duration.split("h"))
--- ---
> hours = int(duration.split("h")[0]) > hours = int(duration.split("h")[0])
52c52 48c48
< def present(name, database, duration="7d", replication=1, default=False, **client_args): < def present(name, database, duration="7d", replication=1, default=False, **client_args):
--- ---
> def present(name, database, duration="7d", replication=1, default=False, shard_duration="1d", **client_args): > def present(name, database, duration="7d", replication=1, default=False, shard_duration="1d", **client_args):
77c77 73c73
< database, name, duration, replication, default, **client_args < database, name, duration, replication, default, **client_args
--- ---
> database, name, duration, replication, shard_duration, default, **client_args > database, name, duration, replication, shard_duration, default, **client_args
119c119 113c113
< database, name, duration, replication, default, **client_args < database, name, duration, replication, default, **client_args
--- ---
> database, name, duration, replication, shard_duration, default, **client_args > database, name, duration, replication, shard_duration, default, **client_args

8
salt/salt/files/influxdbmod.py.patch
View File

@@ -1,16 +1,16 @@
427c427 421c421
< database, name, duration, replication, default=False, **client_args < database, name, duration, replication, default=False, **client_args
--- ---
> database, name, duration, replication, shard_duration, default=False, **client_args > database, name, duration, replication, shard_duration, default=False, **client_args
462c462 456c456
< client.create_retention_policy(name, duration, replication, database, default) < client.create_retention_policy(name, duration, replication, database, default)
--- ---
> client.create_retention_policy(name, duration, replication, database, default, shard_duration) > client.create_retention_policy(name, duration, replication, database, default, shard_duration)
468c468 462c462
< database, name, duration, replication, default=False, **client_args < database, name, duration, replication, default=False, **client_args
--- ---
> database, name, duration, replication, shard_duration, default=False, **client_args > database, name, duration, replication, shard_duration, default=False, **client_args
504c504 498c498
< client.alter_retention_policy(name, database, duration, replication, default) < client.alter_retention_policy(name, database, duration, replication, default)
--- ---
> client.alter_retention_policy(name, database, duration, replication, default, shard_duration) > client.alter_retention_policy(name, database, duration, replication, default, shard_duration)