Code

Merge Main into Dev#11957

Code

Merged

TOoSmOotH merged 26 commits into2.4/devSecurity-Onion-Solutions/securityonion:2.4/devfrom mergebackSecurity-Onion-Solutions/securityonion:mergebackCopy head branch name to clipboardDec 6, 2023

+25-15

Commits

Commits on Nov 29, 2023

• Update import-evtx-logs.json

  Show description for ece3c36
  chateaulav

  authored
  ece3c36

  Copy full SHA for ece3c36

• Update HOTFIX

  weslambert

  authored
  a6d20bd

  Copy full SHA for a6d20bd

• Merge pull request #11902 from Security-Onion-Solutions/fix/hotfix_version

  Show description for 317b6cb
  weslambert

  authored
  317b6cb

  Copy full SHA for 317b6cb

• Fix action file names

  weslambert

  committed
  2368e8b

  Copy full SHA for 2368e8b

• Ensure indices managed by ILM can be managed by Curator

  weslambert

  committed
  a605c5c

  Copy full SHA for a605c5c

Commits on Nov 30, 2023

• Merge pull request #11907 from Security-Onion-Solutions/fix/curator_close

  Show description for 32b03f5
  weslambert

  authored
  32b03f5

  Copy full SHA for 32b03f5

• Merge pull request #11890 from chateaulav/chateaulav-import-evtx-logs-11889

  Show description for 4fc3c85
  dougburks

  authored
  4fc3c85

  Copy full SHA for 4fc3c85

Commits on Dec 1, 2023

• Remove action changes

  weslambert

  committed
  6fa4a69

  Copy full SHA for 6fa4a69

• Remove close changes

  weslambert

  committed
  e36044e

  Copy full SHA for e36044e

• Merge pull request #11919 from Security-Onion-Solutions/fix/remove_curator_changes

  Show description for 55052c4
  weslambert

  authored
  55052c4

  Copy full SHA for 55052c4

• move wait_for_salt_minion for hotfix

  m0duspwnens

  committed
  265cde5

  Copy full SHA for 265cde5

• Merge pull request #11923 from Security-Onion-Solutions/hf_soup

  Show description for ace5dff
  m0duspwnens

  authored
  ace5dff

  Copy full SHA for ace5dff

Commits on Dec 4, 2023

• avoid exiting salt when ca state applied in post for 2.4.30

  m0duspwnens

  committed
  38868af

  Copy full SHA for 38868af

• Merge pull request #11929 from Security-Onion-Solutions/hf_soup

  Show description for 11a3e12
  m0duspwnens

  authored
  11a3e12

  Copy full SHA for 11a3e12

• Update soup

  TOoSmOotH

  authored
  55a8b10

  Copy full SHA for 55a8b10

• Update soup

  TOoSmOotH

  authored
  0b6ba6d

  Copy full SHA for 0b6ba6d

• Merge pull request #11931 from Security-Onion-Solutions/TOoSmOotH-patch-2

  Show description for 802bf9c
  TOoSmOotH

  authored
  802bf9c

  Copy full SHA for 802bf9c

Commits on Dec 5, 2023

• Update soup

  TOoSmOotH

  authored
  90d9e5b

  Copy full SHA for 90d9e5b

• Merge pull request #11939 from Security-Onion-Solutions/TOoSmOotH-patch-3

  Show description for b7227e1
  TOoSmOotH

  authored
  b7227e1

  Copy full SHA for b7227e1

• Update soup

  TOoSmOotH

  authored
  fdd4173

  Copy full SHA for fdd4173

• Update soup

  TOoSmOotH

  authored
  9446b75

  Copy full SHA for 9446b75

• Merge pull request #11942 from Security-Onion-Solutions/TOoSmOotH-patch-4

  Show description for 8eaa07a
  TOoSmOotH

  authored
  8eaa07a

  Copy full SHA for 8eaa07a

Commits on Dec 6, 2023

• 2.4.30 hotfix

  TOoSmOotH

  committed
  386e921

  Copy full SHA for 386e921

• Merge pull request #11951 from Security-Onion-Solutions/2.4.30hf3

  Show description for b878728
  TOoSmOotH

  authored
  b878728

  Copy full SHA for b878728

• Merge pull request #11918 from Security-Onion-Solutions/hotfix/2.4.30

  Show description for d7bf52d
  TOoSmOotH

  authored
  d7bf52d

  Copy full SHA for d7bf52d

• Merge branch '2.4/dev' into mergeback

  TOoSmOotH

  authored
  0160cae

  Copy full SHA for 0160cae