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

circumvent file.patch putting ERROR in log if patch doesnt need applied

Browse Source
This commit is contained in:
m0duspwnens
2021-05-14 15:19:45 -04:00
parent 3859f6464a
commit 231e07dbbd
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
salt/salt/python3-influxdb.sls
View File

@@ -15,6 +15,9 @@ python3_influxdb:
{{PYTHONINSTALLER}}.installed: {{PYTHONINSTALLER}}.installed:
- name: {{ PYTHON3INFLUX }} - name: {{ PYTHON3INFLUX }}
# We circumvent the file.patch state putting ERROR in the log by using the unless and file.touch below
# https://github.com/saltstack/salt/pull/47010 and https://github.com/saltstack/salt/issues/52329
#https://github.com/saltstack/salt/issues/59766 #https://github.com/saltstack/salt/issues/59766
influxdb_continuous_query.present_patch: influxdb_continuous_query.present_patch:
file.patch: file.patch:
@@ -23,8 +26,15 @@ influxdb_continuous_query.present_patch:
- require: - require:
- {{PYTHONINSTALLER}}: python3_influxdb - {{PYTHONINSTALLER}}: python3_influxdb
- pkg: patch_package - pkg: patch_package
- unless: ls /opt/so/state/influxdb_continuous_query.py.patched
#https://github.com/saltstack/salt/issues/59761 influxdb_continuous_query.py.patched:
file.touch:
- name: /opt/so/state/influxdb_continuous_query.py.patched
- onchanges:
- file: influxdb_continuous_query.present_patch
#https://github.com/saltstack/salt/issues/59761
influxdb_retention_policy.present_patch: influxdb_retention_policy.present_patch:
file.patch: file.patch:
- name: {{ SALT_STATE_CODE_PATH }}/influxdb_retention_policy.py - name: {{ SALT_STATE_CODE_PATH }}/influxdb_retention_policy.py
@@ -32,6 +42,13 @@ influxdb_retention_policy.present_patch:
- require: - require:
- {{PYTHONINSTALLER}}: python3_influxdb - {{PYTHONINSTALLER}}: python3_influxdb
- pkg: patch_package - pkg: patch_package
- unless: ls /opt/so/state/influxdb_retention_policy.py.patched
influxdb_retention_policy.py.patched:
file.touch:
- name: /opt/so/state/influxdb_retention_policy.py.patched
- onchanges:
- file: influxdb_retention_policy.present_patch
# We should be able to set reload_modules: True in this state in order to tell salt to reload its python modules due to us possibly installing # We should be able to set reload_modules: True in this state in order to tell salt to reload its python modules due to us possibly installing
# and possibly modifying modules in this state. This is bugged according to https://github.com/saltstack/salt/issues/24925 # and possibly modifying modules in this state. This is bugged according to https://github.com/saltstack/salt/issues/24925
@@ -41,4 +58,13 @@ influxdbmod.py_shard_duration_patch:
- source: salt://salt/files/influxdbmod.py.patch - source: salt://salt/files/influxdbmod.py.patch
- require: - require:
- {{PYTHONINSTALLER}}: python3_influxdb - {{PYTHONINSTALLER}}: python3_influxdb
- pkg: patch_package - pkg: patch_package
- unless: ls /opt/so/state/influxdbmod.py.patched
influxdbmod.py.patched:
file.touch:
- name: /opt/so/state/influxdbmod.py.patched
- onchanges:
- file: influxdbmod.py_shard_duration_patch