Some elastic example salt config file changes

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

Author: s0undt3ch

docker/elastic/centosstream8.Dockerfile

@@ -34,9 +34,6 @@ 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/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
+ADD docker/elastic/conf/minion-2.conf /etc/salt/minion.d/minion-2.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]

docker/elastic/centosstream9.Dockerfile

@@ -35,10 +35,7 @@ ADD docker/elastic/conf/supervisord.master.conf /etc/supervisor/conf.d/master.co
 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
+ADD docker/elastic/conf/master-1.conf /etc/salt/master.d/master-1.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]
 
@@ -49,9 +46,6 @@ 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/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
+ADD docker/elastic/conf/minion-1.conf /etc/salt/minion.d/minion-1.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]

docker/elastic/conf/logging.conf

@@ -0,0 +1,5 @@
+id: master-1
+open_mode: true
+log_level_logfile: debug
+grains:
+  datacenter: dt-a

docker/elastic/conf/master-1.conf

@@ -0,0 +1,5 @@
+id: master-2
+open_mode: true
+log_level_logfile: debug
+grains:
+  datacenter: dt-b

docker/elastic/conf/master-2.conf

@@ -0,0 +1,6 @@
+id: minion-1
+master: master-1
+log_level_logfile: debug
+grains:
+  role: db
+  datacenter: dt-a

docker/elastic/conf/minion-1.conf

@@ -0,0 +1,6 @@
+id: minion-2
+master: master-1
+log_level_logfile: debug
+grains:
+  role: web
+  datacenter: dt-a

docker/elastic/conf/minion-2.conf

@@ -0,0 +1,6 @@
+id: minion-3
+master: master-2
+log_level_logfile: debug
+grains:
+  role: db
+  datacenter: dt-b

docker/elastic/conf/minion-3.conf

@@ -0,0 +1,6 @@
+id: minion-4
+master: master-2
+log_level_logfile: debug
+grains:
+  role: web
+  datacenter: dt-b

docker/elastic/conf/minion-4.conf

@@ -34,9 +34,6 @@ 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/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
+ADD docker/elastic/conf/minion-4.conf /etc/salt/minion.d/minion-4.conf
 
 CMD ["/usr/bin/supervisord","-c","/etc/supervisor/supervisord.conf"]