Add custom script to loop to jobs we want to trigger from master

s0undt3ch · s0undt3ch · commit 5c0ca15d34e3 · 2023-07-06T06:49:52.000+01:00
Signed-off-by: Pedro Algarvio &lt;palgarvio@vmware.com&gt;
diff --git a/docker/elastic/centosstream8.Dockerfile b/docker/elastic/centosstream8.Dockerfile
@@ -30,14 +30,13 @@ RUN ls -lah /src \
 
 FROM base as minion-2
 
+RUN dnf install -y salt-minion
 ADD docker/elastic/conf/supervisord.minion.conf /etc/supervisor/conf.d/minion.conf
 ADD docker/elastic/conf/beacons.conf /etc/salt/minion.d/beacons.conf
 ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.conf
-ADD docker/elastic/conf/demo-schedule.conf /etc/salt/minion.d/demo-schedule.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/minion.d/logging.conf
 RUN mkdir -p /etc/salt/minion.d \
   && echo 'id: minion-2' > /etc/salt/minion.d/id.conf \
-  && echo 'master: master-1' > /etc/salt/minion.d/master.conf \
-  && dnf install -y salt-minion
+  && echo 'master: master-1' > /etc/salt/minion.d/master.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
diff --git a/docker/elastic/centosstream9.Dockerfile b/docker/elastic/centosstream9.Dockerfile
@@ -30,27 +30,28 @@ RUN ls -lah /src \
 
 FROM base as master-1
 
+RUN dnf install -y salt-master
 ADD docker/elastic/conf/supervisord.master.conf /etc/supervisor/conf.d/master.conf
+ADD docker/elastic/conf/supervisord.loop-jobs.conf /etc/supervisor/conf.d/loop-jobs.conf
+ADD docker/elastic/loop-jobs.sh /usr/bin/loop-jobs.sh
 ADD docker/elastic/conf/analytics.master.conf /etc/salt/master.d/salt-analytics.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/master.d/logging.conf
 RUN mkdir -p /etc/salt/master.d \
   && echo 'id: master-1' > /etc/salt/master.d/id.conf \
-  && echo 'open_mode: true' > /etc/salt/master.d/open-mode.conf \
-  && dnf install -y salt-master
+  && echo 'open_mode: true' > /etc/salt/master.d/open-mode.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
 
 
 FROM base as minion-1
 
+RUN dnf install -y salt-minion
 ADD docker/elastic/conf/supervisord.minion.conf /etc/supervisor/conf.d/minion.conf
 ADD docker/elastic/conf/beacons.conf /etc/salt/minion.d/beacons.conf
 ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.conf
-ADD docker/elastic/conf/demo-schedule.conf /etc/salt/minion.d/demo-schedule.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/minion.d/logging.conf
 RUN mkdir -p /etc/salt/minion.d \
   && echo 'id: minion-1' > /etc/salt/minion.d/id.conf \
-  && echo 'master: master-1' > /etc/salt/minion.d/master.conf \
-  && dnf install -y salt-minion
+  && echo 'master: master-1' > /etc/salt/minion.d/master.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
diff --git a/docker/elastic/conf/analytics.master.conf b/docker/elastic/conf/analytics.master.conf
@@ -12,14 +12,20 @@ analytics:
   processors:
     job-aggregate:
       plugin: job-aggregate
+    cast-to-es:
+      plugin: jobs_to_es
 
   forwarders:
-    test-forwarder:
-      plugin: test
+    elasticsearch-forwarder:
+      plugin: elasticsearch
+      hosts:
+        - http://node01:9200
 
   pipelines:
 
     jobs-pipeline:
       collect: events-collector
-      process: job-aggregate
-      forward: test-forwarder
+      process:
+        - job-aggregate
+        - cast-to-es
+      forward: elasticsearch-forwarder
diff --git a/docker/elastic/conf/demo-schedule.conf b/docker/elastic/conf/demo-schedule.conf
diff --git a/docker/elastic/conf/supervisord.loop-jobs.conf b/docker/elastic/conf/supervisord.loop-jobs.conf
@@ -0,0 +1,2 @@
+[program:loop-jobs]
+command=/bin/sh /usr/bin/loop-jobs.sh
diff --git a/docker/elastic/debian10.Dockerfile b/docker/elastic/debian10.Dockerfile
@@ -30,14 +30,13 @@ RUN ls -lah /src \
 
 FROM base as minion-4
 
+RUN apt install -y salt-minion
 ADD docker/elastic/conf/supervisord.minion.conf /etc/supervisor/conf.d/minion.conf
 ADD docker/elastic/conf/beacons.conf /etc/salt/minion.d/beacons.conf
 ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.conf
-ADD docker/elastic/conf/demo-schedule.conf /etc/salt/minion.d/demo-schedule.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/minion.d/logging.conf
 RUN mkdir -p /etc/salt/minion.d \
   && echo 'id: minion-4' > /etc/salt/minion.d/id.conf \
-  && echo 'master: master-2' > /etc/salt/minion.d/master.conf \
-  && apt install -y salt-minion
+  && echo 'master: master-2' > /etc/salt/minion.d/master.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
diff --git a/docker/elastic/debian11.Dockerfile b/docker/elastic/debian11.Dockerfile
@@ -30,27 +30,28 @@ RUN ls -lah /src \
 
 FROM base as master-2
 
+RUN apt install -y salt-master
 ADD docker/elastic/conf/supervisord.master.conf /etc/supervisor/conf.d/master.conf
+ADD docker/elastic/conf/supervisord.loop-jobs.conf /etc/supervisor/conf.d/loop-jobs.conf
+ADD docker/elastic/loop-jobs.sh /usr/bin/loop-jobs.sh
 ADD docker/elastic/conf/analytics.master.conf /etc/salt/master.d/salt-analytics.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/master.d/logging.conf
 RUN mkdir -p /etc/salt/master.d \
   && echo 'id: master-2' > /etc/salt/master.d/id.conf \
-  && echo 'open_mode: true' > /etc/salt/master.d/open-mode.conf \
-  && apt install -y salt-master
+  && echo 'open_mode: true' > /etc/salt/master.d/open-mode.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
 
 
 FROM base as minion-3
 
+RUN apt install -y salt-minion
 ADD docker/elastic/conf/supervisord.minion.conf /etc/supervisor/conf.d/minion.conf
 ADD docker/elastic/conf/beacons.conf /etc/salt/minion.d/beacons.conf
 ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.conf
-ADD docker/elastic/conf/demo-schedule.conf /etc/salt/minion.d/demo-schedule.conf
 ADD docker/elastic/conf/logging.conf /etc/salt/minion.d/logging.conf
 RUN mkdir -p /etc/salt/minion.d \
   && echo 'id: minion-3' > /etc/salt/minion.d/id.conf \
-  && echo 'master: master-2' > /etc/salt/minion.d/master.conf \
-  && apt install -y salt-minion
+  && echo 'master: master-2' > /etc/salt/minion.d/master.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
diff --git a/docker/elastic/docker-compose.yml b/docker/elastic/docker-compose.yml
@@ -30,6 +30,15 @@ services:
       - es-network
     depends_on:
       - node01
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "curl -s -I http://localhost:5601 | grep -q 'HTTP/1.1 302 Found'",
+        ]
+      interval: 10s
+      timeout: 10s
+      retries: 120
 
   metricbeat:
     image: docker.elastic.co/beats/metricbeat:${STACK_VERSION}
@@ -45,7 +54,8 @@ services:
 
   master-1:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
     container_name: master-1
     build:
       context: ../../
@@ -55,9 +65,21 @@ services:
       es-network:
         aliases:
           - master-1
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "ps $(cat /var/run/salt-master.pid) > /dev//null 2>&1 && test -S /var/run/salt/master/workers.ipc",
+        ]
+      interval: 5s
+      timeout: 10s
+      retries: 120
   minion-1:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
+      master-1:
+        condition: service_healthy
     container_name: minion-1
     build:
       context: ../../
@@ -69,7 +91,10 @@ services:
           - minion-1
   minion-2:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
+      master-1:
+        condition: service_healthy
     container_name: minion-2
     build:
       context: ../../
@@ -81,7 +106,8 @@ services:
           - minion-2
   master-2:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
     container_name: master-2
     build:
       context: ../../
@@ -91,9 +117,21 @@ services:
       es-network:
         aliases:
           - master-2
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "ps $(cat /var/run/salt-master.pid) > /dev//null 2>&1 && test -S /var/run/salt/master/workers.ipc",
+        ]
+      interval: 5s
+      timeout: 10s
+      retries: 120
   minion-3:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
+      master-2:
+        condition: service_healthy
     container_name: minion-3
     build:
       context: ../../
@@ -105,7 +143,10 @@ services:
           - minion-3
   minion-4:
     depends_on:
-      - kibana
+      kibana:
+        condition: service_healthy
+      master-2:
+        condition: service_healthy
     container_name: minion-4
     build:
       context: ../../
diff --git a/docker/elastic/loop-jobs.sh b/docker/elastic/loop-jobs.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+sleep 20
+while true; do
+    SLEEP=$(shuf -i 3-10 -n 1)
+    sleep $SLEEP
+    /usr/bin/salt \* test.fib 3
+    SLEEP=$(shuf -i 3-10 -n 1)
+    sleep $SLEEP
+    /usr/bin/salt \* test.ping
+done

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[program:loop-jobs]`
	`2`	`+command=/bin/sh /usr/bin/loop-jobs.sh`