Fixed another python script bug and enabled debugging

functions/extensions/wazuh/custom-shuffle.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Created by Shuffle, AS. <frikky@shuffler.io>.
 # Based on the Slack integration using Webhooks
 
@@ -24,7 +24,7 @@ except Exception as e:
 
 # Global vars
 
-debug_enabled = False
+debug_enabled = True 
 pwd = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
 json_alert = {}
 now = time.strftime("%a %b %d %H:%M:%S %Z %Y")
@@ -56,8 +56,8 @@ def main(args):
     debug("# Processing alert")
     try:
         debug(json_alert)
-    except:
-        debug("Failed getting json_alert")
+    except Exception as e:
+        debug("Failed getting json_alert %s" % e)
         sys.exit(1)
 
     debug("# Generating message")

functions/onprem/orborus/go.mod

@@ -8,5 +8,5 @@ require (
 	github.com/docker/go-connections v0.4.0 // indirect
 	github.com/mackerelio/go-osstat v0.2.1
 	github.com/satori/go.uuid v1.2.0
-	github.com/shuffle/shuffle-shared v0.2.64
+	github.com/shuffle/shuffle-shared v0.2.82
 )

functions/onprem/orborus/go.sum

@@ -792,6 +792,8 @@ github.com/shuffle/shuffle-shared v0.2.63 h1:IF82o5WS4+6wEIirqAd1qEm/pBCuQMbn2CJ
 github.com/shuffle/shuffle-shared v0.2.63/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
 github.com/shuffle/shuffle-shared v0.2.64 h1:WpCKiL5tNt7wTJaHkf1zXhjeUB5ltFap1dXgU6ijKq4=
 github.com/shuffle/shuffle-shared v0.2.64/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
+github.com/shuffle/shuffle-shared v0.2.82 h1:V3bYw7MxHPQgydUuWLGHONpX7NwbRPPAALovKqsdaW0=
+github.com/shuffle/shuffle-shared v0.2.82/go.mod h1:YuMle0RjwXb3hxR5PdaOOD9e+hUyK34OABS0UbrT/Sk=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
 github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=

functions/onprem/orborus/orborus.go

@@ -834,6 +834,18 @@ func checkSwarmService(ctx context.Context) {
 
 // Initial loop etc
 func main() {
+	startupDelay := os.Getenv("SHUFFLE_ORBORUS_STARTUP_DELAY")
+	if len(startupDelay) > 0 {
+		log.Printf("[DEBUG] Setting startup delay to %#v", startupDelay)
+
+		tmpInt, err := strconv.Atoi(startupDelay)
+		if err == nil {
+			time.Sleep(time.Duration(tmpInt) * time.Second)
+		} else {
+			log.Printf("[WARNING] Env SHUFFLE_ORBORUS_STARTUP_DELAY must be a number, not %s", startupDelay)
+		}
+	}
+
 	log.Println("[INFO] Setting up execution environment")
 
 	//FIXME