Skip to content

Commit 17ccc9b

Browse files
author
research bot
committed
Merge remote-tracking branch 'github_origin/develop' into gitlab_release_v4.35.0
2 parents 43b2fe5 + 3e64dfb commit 17ccc9b

File tree

60 files changed

+244
-198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+244
-198
lines changed

.github/workflows/validate-and-build.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
- uses: actions/setup-python@v4
1818
with:
19-
python-version: '3.9' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
19+
python-version: '3.11' #Available versions here - https://github.com/actions/python-versions/releases easy to change/make a matrix/use pypy
2020
architecture: 'x64' # optional x64 or x86. Defaults to x64 if not specified
2121

2222
- name: Install System Packages
@@ -25,24 +25,22 @@ jobs:
2525
sudo apt install jq -qq
2626
2727

28-
- name: Install Python Dependencies and ContentCTL
28+
- name: Install Python Dependencies and ContentCTL and Atomic Red Team
2929
run: |
30-
pip3 install poetry
31-
git submodule update --init contentctl
32-
cd contentctl
33-
git checkout main
34-
poetry install
30+
python3.11 -m venv .venv
31+
source .venv/bin/activate
32+
pip install contentctl
33+
git clone --depth=1 --single-branch --branch=master https://github.com/redcanaryco/atomic-red-team.git
3534
3635
- name: content_ctl validate
3736
run: |
38-
cd contentctl
39-
poetry run contentctl -p ../ validate
37+
source .venv/bin/activate
38+
contentctl validate
4039
4140
- name: contentctl generate
4241
run: |
43-
cd contentctl
44-
poetry run contentctl -p ../ build
45-
cd ..
42+
source .venv/bin/activate
43+
contentctl build --enrichments
4644
mkdir artifacts
4745
mv dist/DA-ESS-ContentUpdate-latest.tar.gz artifacts/
4846

CODEOWNERS

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,4 @@ Unless required by applicable law or agreed to in writing, software
9999
distributed under the License is distributed on an "AS IS" BASIS,
100100
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
101101
See the License for the specific language governing permissions and
102-
limitations under the License.
102+
limitations under the License.

dist/DA-ESS-ContentUpdate/default/analyticstories.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#############
22
# Automatically generated by 'contentctl build' from
33
# https://github.com/splunk/contentctl
4-
# On Date: 2024-06-26T20:12:44 UTC
4+
# On Date: 2024-06-26T20:16:58 UTC
55
# Author: Splunk Threat Research Team - Splunk
66
77
#############

dist/DA-ESS-ContentUpdate/default/app.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#############
22
# Automatically generated by 'contentctl build' from
33
# https://github.com/splunk/contentctl
4-
# On Date: 2024-06-26T20:12:44 UTC
4+
# On Date: 2024-06-26T20:16:58 UTC
55
# Author: Splunk Threat Research Team - Splunk
66
77
#############
@@ -11,7 +11,7 @@
1111
is_configured = false
1212
state = enabled
1313
state_change_requires_restart = false
14-
build = 20240626201214
14+
build = 20240626201627
1515

1616
[triggers]
1717
reload.analytic_stories = simple

dist/DA-ESS-ContentUpdate/default/collections.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#############
22
# Automatically generated by 'contentctl build' from
33
# https://github.com/splunk/contentctl
4-
# On Date: 2024-06-26T20:12:44 UTC
4+
# On Date: 2024-06-26T20:16:58 UTC
55
# Author: Splunk Threat Research Team - Splunk
66
77
#############

dist/DA-ESS-ContentUpdate/default/content-version.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#############
22
# Automatically generated by 'contentctl build' from
33
# https://github.com/splunk/contentctl
4-
# On Date: 2024-06-26T20:12:44 UTC
4+
# On Date: 2024-06-26T20:16:58 UTC
55
# Author: Splunk Threat Research Team - Splunk
66
77
#############

dist/DA-ESS-ContentUpdate/default/data/ui/panels/workbench_panel_all_backup_logs_for_host___response_task.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#############
33
# Automatically generated by 'contentctl build' from
44
# https://github.com/splunk/contentctl
5-
# On Date: 2024-06-26T20:12:45 UTC
5+
# On Date: 2024-06-26T20:16:59 UTC
66
# Author: Splunk Threat Research Team - Splunk
77
88
#############

dist/DA-ESS-ContentUpdate/default/data/ui/panels/workbench_panel_amazon_eks_kubernetes_activity_by_src_ip___response_task.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#############
33
# Automatically generated by 'contentctl build' from
44
# https://github.com/splunk/contentctl
5-
# On Date: 2024-06-26T20:12:45 UTC
5+
# On Date: 2024-06-26T20:16:59 UTC
66
# Author: Splunk Threat Research Team - Splunk
77
88
#############

dist/DA-ESS-ContentUpdate/default/data/ui/panels/workbench_panel_aws_investigate_security_hub_alerts_by_dest___response_task.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#############
33
# Automatically generated by 'contentctl build' from
44
# https://github.com/splunk/contentctl
5-
# On Date: 2024-06-26T20:12:45 UTC
5+
# On Date: 2024-06-26T20:16:59 UTC
66
# Author: Splunk Threat Research Team - Splunk
77
88
#############

0 commit comments

Comments
 (0)