Merge pull request #11713 from Security-Onion-Solutions/2.4/agentupdate

defensivedepth · web-flow · commit 3ff74948d84b · 2023-11-03T15:23:55.000-04:00
Upgrade Elastic Agent
diff --git a/salt/manager/tools/sbin/soup b/salt/manager/tools/sbin/soup
@@ -431,8 +431,7 @@ post_to_2.4.4() {
 }
 
 post_to_2.4.5() {
-  echo "Regenerating Elastic Agent Installers"
-  /sbin/so-elastic-agent-gen-installers
+  echo "Nothing to apply"
   POSTVERSION=2.4.5
 }
 
@@ -449,7 +448,8 @@ post_to_2.4.20() {
 }
 
 post_to_2.4.30() {
-  echo "Nothing to apply"
+  echo "Regenerating Elastic Agent Installers"
+  /sbin/so-elastic-agent-gen-installers
   POSTVERSION=2.4.30
 }
 
@@ -511,7 +511,7 @@ up_to_2.4.4() {
 }
 
 up_to_2.4.5() {
-  determine_elastic_agent_upgrade
+  echo "Nothing to do for 2.4.5"
 
   INSTALLEDVERSION=2.4.5
 }
@@ -529,7 +529,7 @@ up_to_2.4.20() {
 }
 
 up_to_2.4.30() {
-  echo "Nothing to do for 2.4.30"
+  determine_elastic_agent_upgrade
   
   INSTALLEDVERSION=2.4.30
 }

Original file line number	Diff line number	Diff line change
`@@ -431,8 +431,7 @@ post_to_2.4.4() {`
`431`	`431`	`}`
`432`	`432`
`433`	`433`	`post_to_2.4.5() {`
`434`		`- echo "Regenerating Elastic Agent Installers"`
`435`		`- /sbin/so-elastic-agent-gen-installers`
	`434`	`+ echo "Nothing to apply"`
`436`	`435`	`POSTVERSION=2.4.5`
`437`	`436`	`}`
`438`	`437`
`@@ -449,7 +448,8 @@ post_to_2.4.20() {`
`449`	`448`	`}`
`450`	`449`
`451`	`450`	`post_to_2.4.30() {`
`452`		`- echo "Nothing to apply"`
	`451`	`+ echo "Regenerating Elastic Agent Installers"`
	`452`	`+ /sbin/so-elastic-agent-gen-installers`
`453`	`453`	`POSTVERSION=2.4.30`
`454`	`454`	`}`
`455`	`455`
`@@ -511,7 +511,7 @@ up_to_2.4.4() {`
`511`	`511`	`}`
`512`	`512`
`513`	`513`	`up_to_2.4.5() {`
`514`		`- determine_elastic_agent_upgrade`
	`514`	`+ echo "Nothing to do for 2.4.5"`
`515`	`515`
`516`	`516`	`INSTALLEDVERSION=2.4.5`
`517`	`517`	`}`
`@@ -529,7 +529,7 @@ up_to_2.4.20() {`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`up_to_2.4.30() {`
`532`		`- echo "Nothing to do for 2.4.30"`
	`532`	`+ determine_elastic_agent_upgrade`
`533`	`533`
`534`	`534`	`INSTALLEDVERSION=2.4.30`
`535`	`535`	`}`