Merge remote-tracking branch 'origin/release/v10.9.6' into release/v10.9.6

Author: mjabascal10

.github/workflows/v10-deployment-pipeline.yml

@@ -249,15 +249,6 @@ jobs:
       image_name: sophos
       tag: ${{ needs.setup_deployment.outputs.tag }}
 
-  build_threadwinds_ingestion:
-    name: Build Threadwinds-Ingestion Microservice
-    needs: [validations,setup_deployment]
-    if: ${{ needs.setup_deployment.outputs.tag != '' }}
-    uses: ./.github/workflows/reusable-golang.yml
-    with:
-      image_name: threadwinds-ingestion
-      tag: ${{ needs.setup_deployment.outputs.tag }}
-
   build_user_auditor:
     name: Build User-Auditor Microservice
     needs: [validations,setup_deployment]
@@ -290,7 +281,6 @@ jobs:
       build_aws, build_backend, build_correlation, build_frontend,
       build_bitdefender, build_mutate, build_office365,
       build_log_auth_proxy, build_soc_ai, build_sophos,
-      build_threadwinds_ingestion,
       build_user_auditor, build_web_pdf
     ]
     if: ${{ needs.setup_deployment.outputs.tag != '' }}

installer/types/compose.go

@@ -596,38 +596,6 @@ func (c *Compose) Populate(conf *Config, stack *StackConfig) *Compose {
 		},
 	}
 
-	threadwindsIngestionMem := stack.ServiceResources["threadwinds-ingestion"].AssignedMemory
-	c.Services["threadwinds-ingestion"] = Service{
-		Image: utils.Str("ghcr.io/utmstack/utmstack/threadwinds-ingestion:" + conf.Branch),
-		DependsOn: []string{
-			"postgres",
-			"node1",
-			"backend",
-		},
-		Environment: []string{
-			"INTERNAL_KEY=" + conf.InternalKey,
-			"ENCRYPTION_KEY=" + conf.InternalKey,
-			"BACKEND_URL=http://backend:8080",
-			"ENV=" + conf.Branch,
-			"OPENSEARCH_HOST=node1",
-			"OPENSEARCH_PORT=9200",
-			"DB_HOST=postgres",
-			"DB_PORT=5432",
-			"DB_USER=postgres",
-			"DB_PASS=" + conf.Password,
-			"DB_NAME=utmstack",
-		},
-		Logging: &dLogging,
-		Deploy: &Deploy{
-			Placement: &pManager,
-			Resources: &Resources{
-				Limits: &Res{
-					Memory: utils.Str(fmt.Sprintf("%vM", threadwindsIngestionMem)),
-				},
-			},
-		},
-	}
-
 	webPDFMem := stack.ServiceResources["web-pdf"].AssignedMemory
 	c.Services["web-pdf"] = Service{
 		Image: utils.Str("ghcr.io/utmstack/utmstack/web-pdf:" + conf.Branch),

installer/types/stack.go

@@ -39,7 +39,6 @@ var Services = []utils.ServiceConfig{
 	{Name: "socai", Priority: 3, MinMemory: 30, MaxMemory: 512},
 	{Name: "bitdefender", Priority: 3, MinMemory: 30, MaxMemory: 100},
 	{Name: "office365", Priority: 3, MinMemory: 30, MaxMemory: 100},
-	{Name: "threadwinds-ingestion", Priority: 3, MinMemory: 50, MaxMemory: 256},
 }
 
 func (s *StackConfig) Populate(c *Config) error {