Merge branch 'release/v12.0.0' into backlog/v12_integation_index_patterns

Author: Kbayero

collectors/forwarder/serv/service.go

@@ -88,7 +88,7 @@ func (p *program) run() {
 
 	ctx = metadata.AppendToOutgoingContext(ctx, "key", cnf.CollectorKey)
 	ctx = metadata.AppendToOutgoingContext(ctx, "id", strconv.Itoa(int(cnf.CollectorID)))
-	ctx = metadata.AppendToOutgoingContext(ctx, "type", "agent")
+	ctx = metadata.AppendToOutgoingContext(ctx, "type", "collector")
 
 	p.goSafe("StartPing", func() {
 		upstream.StartPing(cnf, ctx)

installer/docker/plugins.go

@@ -21,6 +21,7 @@ type PluginConfig struct {
 	PostgreSQL    PostgreConfig    `yaml:"postgresql,omitempty"`
 	ServerName    string           `yaml:"serverName,omitempty"`
 	InternalKey   string           `yaml:"internalKey,omitempty"`
+	EncryptionKey string           `yaml:"encryptionKey,omitempty"`
 	Env           string           `yaml:"env,omitempty"`
 	AgentManager  string           `yaml:"agentManager,omitempty"`
 	Backend       string           `yaml:"backend,omitempty"`
@@ -82,6 +83,7 @@ func SetPluginsConfigs(conf *config.Config, stack *StackConfig) error {
 		},
 		ServerName:    conf.ServerName,
 		InternalKey:   conf.InternalKey,
+		EncryptionKey: conf.InternalKey,
 		Env:           conf.Branch,
 		AgentManager:  "10.21.199.3:9000",
 		Backend:       "http://backend:8080",

installer/templates/front-end.go

@@ -8,7 +8,7 @@ const FrontEnd string = `server {
     location / {
       root /usr/share/nginx/html;
       index index.html index.htm;
-      try_files $uri $uri/ /index.html =404;
+      try_files $uri /index.html =404;
     }
 
     set $utmstack_backend http://backend:8080;
@@ -32,6 +32,18 @@ const FrontEnd string = `server {
     	proxy_set_header X-Forwarded-Proto $scheme;
 	}
 
+    location ~ ^/api/v1/soar/ws/ {
+        proxy_pass $utmstack_backend;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "Upgrade";
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_read_timeout 900;
+    }
+
     location /api {
         proxy_pass  $utmstack_backend;
         proxy_set_header Host $host;