Split master and minion pipelines

Signed-off-by: Pedro Algarvio <[email protected]>

Author: s0undt3ch

docker/elastic/centosstream8.Dockerfile

@@ -32,7 +32,7 @@ FROM base as minion-2
 
 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/salt-analytics.conf /etc/salt/minion.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.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 \

docker/elastic/centosstream9.Dockerfile

@@ -31,8 +31,7 @@ RUN ls -lah /src \
 FROM base as master-1
 
 ADD docker/elastic/conf/supervisord.master.conf /etc/supervisor/conf.d/master.conf
-ADD docker/elastic/conf/beacons.conf /etc/salt/master.d/beacons.conf
-ADD docker/elastic/conf/salt-analytics.conf /etc/salt/master.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.master.conf /etc/salt/master.d/salt-analytics.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 \
@@ -45,7 +44,7 @@ FROM base as minion-1
 
 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/salt-analytics.conf /etc/salt/minion.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.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 \

docker/elastic/conf/analytics.master.conf

@@ -0,0 +1,25 @@
+engines:
+  - analytics
+
+analytics:
+
+  collectors:
+    events-collector:
+      plugin: event-bus
+      tags:
+        - "salt/job/*"
+
+  processors:
+    job-aggregate:
+      plugin: job-aggregate
+
+  forwarders:
+    test-forwarder:
+      plugin: test
+
+  pipelines:
+
+    jobs-pipeline:
+      collect: events-collector
+      process: job-aggregate
+      forward: test-forwarder

docker/elastic/conf/salt-analytics.conf renamed to docker/elastic/conf/analytics.minion.conf

@@ -6,10 +6,10 @@ beacons:
   memusage:
     - percent: 1%
     - interval: 5
-#  salt_monitor:
-#    - salt_fun:
-#      - test.ping
-#    - interval: 5
+  salt_monitor:
+    - salt_fun:
+      - test.ping
+    - interval: 5
 ##  status:
 ##    - interval: 5
 ##  swapusage:

docker/elastic/conf/beacons.conf

@@ -32,7 +32,7 @@ FROM base as minion-4
 
 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/salt-analytics.conf /etc/salt/minion.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.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 \

docker/elastic/debian10.Dockerfile

@@ -31,8 +31,7 @@ RUN ls -lah /src \
 FROM base as master-2
 
 ADD docker/elastic/conf/supervisord.master.conf /etc/supervisor/conf.d/master.conf
-ADD docker/elastic/conf/beacons.conf /etc/salt/master.d/beacons.conf
-ADD docker/elastic/conf/salt-analytics.conf /etc/salt/master.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.master.conf /etc/salt/master.d/salt-analytics.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 \
@@ -45,7 +44,7 @@ FROM base as minion-3
 
 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/salt-analytics.conf /etc/salt/minion.d/salt-analytics.conf
+ADD docker/elastic/conf/analytics.minion.conf /etc/salt/minion.d/salt-analytics.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 \