conflcits

splunk · Jan 17, 2024 · 6c68bd7 · 6c68bd7
2 parents 7096c5a + 99fd815
commit 6c68bd7
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "contentctl"]
 	path = contentctl
 	url = https://github.com/splunk/contentctl.git
-        ignore = all
+	ignore = all
diff --git a/dist/DA-ESS-ContentUpdate/default/analyticstories.conf b/dist/DA-ESS-ContentUpdate/default/analyticstories.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/app.conf b/dist/DA-ESS-ContentUpdate/default/app.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############
@@ -10,7 +10,7 @@
 is_configured = false
 state = enabled
 state_change_requires_restart = false
-build = 20240117182625
+build = 20240117183348
 
 [triggers]
 reload.analytic_stories = simple

diff --git a/dist/DA-ESS-ContentUpdate/default/collections.conf b/dist/DA-ESS-ContentUpdate/default/collections.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/content-version.conf b/dist/DA-ESS-ContentUpdate/default/content-version.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/es_investigations.conf b/dist/DA-ESS-ContentUpdate/default/es_investigations.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/macros.conf b/dist/DA-ESS-ContentUpdate/default/macros.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/savedsearches.conf b/dist/DA-ESS-ContentUpdate/default/savedsearches.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/transforms.conf b/dist/DA-ESS-ContentUpdate/default/transforms.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/DA-ESS-ContentUpdate/default/workflow_actions.conf b/dist/DA-ESS-ContentUpdate/default/workflow_actions.conf
@@ -1,6 +1,6 @@
 #############
 # Automatically generated by generator.py in splunk/security_content
-# On Date: 2024-01-17T18:28:48 UTC
+# On Date: 2024-01-17T18:35:46 UTC
 # Author: Splunk Threat Research Team - Splunk
 # Contact: research@splunk.com
 #############

diff --git a/dist/api/macros.json b/dist/api/macros.json
diff --git a/dist/api/stories.json b/dist/api/stories.json
diff --git a/dist/api/version.json b/dist/api/version.json
@@ -1 +1 @@
-{"version": {"name": "v4.20.0", "published_at": "2024-01-17T18:32:16Z"}}
+{"version": {"name": "v4.20.0", "published_at": "2024-01-17T18:45:19Z"}}
diff --git a/requirements.txt b/requirements.txt
@@ -1,15 +1,15 @@
 attackcti==0.3.9
 docker==6.1.3
-GitPython==3.1.37
+GitPython==3.1.41
 Jinja2==3.1.2
-jsonschema==4.19.1
+jsonschema==4.20.0
 mock==4.0.3
-psutil==5.9.5
+psutil==5.9.7
 pycvesearch==1.2
 pydantic==1.10.8
-pysigma==0.9.8
+pysigma==0.11.0
 pysigma-backend-splunk==1.0.2
-pytest==7.4.2
+pytest==7.4.4
 PyYAML>=5.4.1
 questionary==1.10.0
 requests==2.31.0
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version": {"name": "v4.20.0", "published_at": "2024-01-17T18:32:16Z"}}
		{"version": {"name": "v4.20.0", "published_at": "2024-01-17T18:45:19Z"}}