Skip to content

Commit

Permalink
Merge branch 'release-2.0.0' into develop
Browse files Browse the repository at this point in the history
# Conflicts:
#	.devcontainer/python_development/devcontainer.json
#	.github/ISSUE_TEMPLATE/bug-or-error-report.md
#	.github/PULL_REQUEST_TEMPLATE.md
#	.github/workflows/cluster.yml
#	.github/workflows/linux_only.yml
#	.gitignore
#	Chapter 1 Files/Group Policy Objects/{3B4DDB7C-64A7-4E0D-AC21-9FEC36F944B0}/DomainSysvol/GPO/Machine/Preferences/Groups/Groups.xml
#	Chapter 1 Files/Group Policy Objects/{3B4DDB7C-64A7-4E0D-AC21-9FEC36F944B0}/DomainSysvol/GPO/Machine/Preferences/Services/Services.xml
#	Chapter 1 Files/Group Policy Objects/{3B4DDB7C-64A7-4E0D-AC21-9FEC36F944B0}/DomainSysvol/GPO/Machine/comment.cmtx
#	Chapter 1 Files/Group Policy Objects/{3B4DDB7C-64A7-4E0D-AC21-9FEC36F944B0}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
#	Chapter 1 Files/Group Policy Objects/{ADC94B57-F661-4DF6-9876-69CC352B6D27}/DomainSysvol/GPO/Machine/Preferences/Services/Services.xml
#	Chapter 1 Files/Group Policy Objects/{ADC94B57-F661-4DF6-9876-69CC352B6D27}/DomainSysvol/GPO/Machine/comment.cmtx
#	Chapter 1 Files/Group Policy Objects/{ADC94B57-F661-4DF6-9876-69CC352B6D27}/DomainSysvol/GPO/Machine/microsoft/windows nt/SecEdit/GptTmpl.inf
#	Chapter 1 Files/Group Policy Objects/{ADC94B57-F661-4DF6-9876-69CC352B6D27}/DomainSysvol/GPO/Machine/registry.pol
#	Chapter 1 Files/lme_gpo_for_windows.zip
#	Chapter 1 Files/lme_wec_config.xml
#	Chapter 3 Files/dashboard_update.sh
#	Chapter 3 Files/deploy.sh
#	Chapter 4 Files/dashboards/alerting_dashboard.ndjson
#	Chapter 4 Files/dashboards/computer_software_overview.ndjson
#	Chapter 4 Files/dashboards/healthcheck_dashboard_overview.ndjson
#	Chapter 4 Files/dashboards/process_explorer.ndjson
#	Chapter 4 Files/dashboards/security_dashboard_security_log.ndjson
#	Chapter 4 Files/dashboards/user_hr.ndjson
#	Chapter 4 Files/dashboards/user_security.ndjson
#	README.md
#	dashboards/elastic/sysmon_summary.ndjson
#	docs/markdown/chapter1/chapter1.md
#	docs/markdown/chapter1/guide_to_ous.md
#	docs/markdown/chapter2.md
#	docs/markdown/chapter3/chapter3.md
#	docs/markdown/chapter3/resilience.md
#	docs/markdown/chapter4.md
#	docs/markdown/logging-guidance/other-logging.md
#	docs/markdown/maintenance/backups.md
#	docs/markdown/maintenance/certificates.md
#	docs/markdown/maintenance/upgrading.md
#	docs/markdown/prerequisites.md
#	docs/markdown/reference/dashboard-descriptions.md
#	docs/markdown/reference/troubleshooting.md
#	testing/InstallTestbed.ps1
#	testing/configure/azure_scripts/download_in_container.ps1
#	testing/configure/linux_install_lme.exp
#	testing/development/docker-compose.yml
#	testing/development/upgrade_lme.sh
#	testing/merging_version.sh
#	testing/tests/.env_example
#	testing/tests/README.md
#	testing/tests/api_tests/data_insertion_tests/conftest.py
#	testing/tests/api_tests/data_insertion_tests/test_server.py
#	testing/tests/api_tests/helpers.py
#	testing/tests/api_tests/linux_only/conftest.py
#	testing/tests/api_tests/linux_only/test_server.py
#	testing/tests/api_tests/winlogbeat/conftest.py
#	testing/tests/api_tests/winlogbeat/test_server.py
#	testing/tests/selenium_tests/cluster/conftest.py
#	testing/tests/selenium_tests/cluster/test_computer_software_overview_dashboard.py
#	testing/tests/selenium_tests/cluster/test_health_check_dashboard.py
#	testing/tests/selenium_tests/cluster/test_process_explorer_dashboard.py
#	testing/tests/selenium_tests/cluster/test_security_dashboard_security_log.py
#	testing/tests/selenium_tests/cluster/test_sysmon_summary_dashboard.py
#	testing/tests/selenium_tests/cluster/test_user_h_r_dashboard.py
#	testing/tests/selenium_tests/cluster/test_user_security_dashboard.py
#	testing/tests/selenium_tests/linux_only/conftest.py
#	testing/tests/selenium_tests/linux_only/test_basic_loading.py
#	testing/tests/selenium_tests/linux_only/test_computer_software_overview_dashboard_lo.py
#	testing/tests/selenium_tests/linux_only/test_health_check_dashboard_lo.py
#	testing/tests/selenium_tests/linux_only/test_security_dashboard_security_log_lo.py
#	testing/tests/selenium_tests/linux_only/test_sysmon_summary_dashboard_lo.py
#	testing/tests/selenium_tests/linux_only/test_user_h_r_dashboard_lo.py
#	testing/tests/selenium_tests/linux_only/test_user_security_dashboard_lo.py
  • Loading branch information
cbaxley committed Nov 6, 2024
2 parents 4a935b1 + e96a52c commit 7298cc6
Show file tree
Hide file tree
Showing 148 changed files with 8,416 additions and 7,819 deletions.
1 change: 0 additions & 1 deletion Chapter 1 Files/Group Policy Objects/manifest.xml

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
Binary file removed Chapter 2 Files/GPO Deployment/sysmon_gpo.zip
Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Binary file not shown.
105 changes: 0 additions & 105 deletions Chapter 2 Files/GPO Deployment/update.bat

This file was deleted.

1 change: 0 additions & 1 deletion Chapter 2 Files/SCCM Deployment/Install_Sysmon64.ps1

This file was deleted.

5 changes: 0 additions & 5 deletions Chapter 2 Files/SCCM Deployment/Uninstall_Sysmon64.ps1

This file was deleted.

1 change: 0 additions & 1 deletion Chapter 3 Files/.gitignore

This file was deleted.

Loading

0 comments on commit 7298cc6

Please sign in to comment.