From a2ed9a86ff8ff13ac5d06a04ff3a3bc6c5747851 Mon Sep 17 00:00:00 2001 From: m0duspwnens Date: Tue, 18 Jan 2022 11:33:36 -0500 Subject: [PATCH] remove influixdb salt state files and update patch files for influxdb salt modules/state --- salt/common/tools/sbin/soup | 2 ++ salt/salt/files/influxdb_continuous_query.py.patch | 2 +- salt/salt/files/influxdb_retention_policy.py.patch | 8 ++++---- salt/salt/files/influxdbmod.py.patch | 8 ++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/salt/common/tools/sbin/soup b/salt/common/tools/sbin/soup index 588b30e46..2c49ce444 100755 --- a/salt/common/tools/sbin/soup +++ b/salt/common/tools/sbin/soup @@ -711,6 +711,8 @@ up_to_2.3.90() { up_to_2.3.100() { echo "Updating to Security Onion 2.3.100" 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() { diff --git a/salt/salt/files/influxdb_continuous_query.py.patch b/salt/salt/files/influxdb_continuous_query.py.patch index a596983ff..0922342fa 100644 --- a/salt/salt/files/influxdb_continuous_query.py.patch +++ b/salt/salt/files/influxdb_continuous_query.py.patch @@ -1,4 +1,4 @@ -60c60 +56c56 < database, name, query, resample_time, coverage_period --- > database, name, query, resample_time, coverage_period, **client_args diff --git a/salt/salt/files/influxdb_retention_policy.py.patch b/salt/salt/files/influxdb_retention_policy.py.patch index 7180f8934..917d96a30 100644 --- a/salt/salt/files/influxdb_retention_policy.py.patch +++ b/salt/salt/files/influxdb_retention_policy.py.patch @@ -1,16 +1,16 @@ -38c38 +34c34 < hours = int(duration.split("h")) --- > 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, shard_duration="1d", **client_args): -77c77 +73c73 < database, name, duration, replication, 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, shard_duration, default, **client_args diff --git a/salt/salt/files/influxdbmod.py.patch b/salt/salt/files/influxdbmod.py.patch index b653265cb..150fdfe15 100644 --- a/salt/salt/files/influxdbmod.py.patch +++ b/salt/salt/files/influxdbmod.py.patch @@ -1,16 +1,16 @@ -427c427 +421c421 < database, name, duration, replication, 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, shard_duration) -468c468 +462c462 < database, name, duration, replication, 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, shard_duration)