@@ -54,6 +54,7 @@ services:
5454
5555 sentinel-kit-server-fluentbit :
5656 container_name : sentinel-kit-server-fluentbit
57+ hostname : sentinel-kit-server-fluentbit
5758 build :
5859 context : .
5960 dockerfile : config/docker-config/Dockerfile.fluentbit
@@ -75,6 +76,7 @@ services:
7576
7677 sentinel-kit-server-sftp :
7778 container_name : sentinel-kit-server-sftp
79+ hostname : sentinel-kit-server-sftp
7880 image : atmoz/sftp
7981 restart : on-failure
8082 command : ${SFTP_USER}:${SFTP_PASSWORD}:1001
@@ -89,18 +91,35 @@ services:
8991
9092 sentinel-kit-db-mysql :
9193 container_name : sentinel-kit-db-mysql
94+ hostname : sentinel-kit-db-mysql
9295 image : mysql:9.4.0
9396 restart : on-failure
9497 environment :
9598 MYSQL_ROOT_PASSWORD : ${MYSQL_ROOT_PASSWORD}
9699 MYSQL_DATABASE : ${MYSQL_DATABASE}
97100 MYSQL_USER : ${MYSQL_USER}
98101 MYSQL_PASSWORD : ${MYSQL_PASSWORD}
102+ MYSQL_EXPORTER_PASSWORD : ${MYSQL_EXPORTER_PASSWORD}
99103 volumes :
100- - ./data/mysql_data:/var/lib/mysql
104+ - sentinel-kit_db_mysql_data:/var/lib/mysql
105+ - ./config/mysql/init_mysqld_exporter.sh:/docker-entrypoint-initdb.d/init_mysqld_exporter.sh:ro
101106 networks :
102107 - sentinel-kit-network
103108
109+ sentinel-kit-utils-phpmyadmin :
110+ container_name : sentinel-kit-utils-phpmyadmin
111+ hostname : ${SENTINELKIT_PMA_HOSTNAME}
112+ image : phpmyadmin/phpmyadmin
113+ restart : on-failure
114+ environment :
115+ PMA_HOST : sentinel-kit-db-mysql
116+ PMA_PORT : 3306
117+ networks :
118+ - sentinel-kit-network
119+ depends_on :
120+ - sentinel-kit-db-mysql
121+ profiles : ["phpmyadmin"]
122+
104123 sentinel-kit-server-caddy :
105124 image : caddy:2.10.2-alpine
106125 container_name : sentinel-kit-server-caddy
@@ -278,8 +297,6 @@ services:
278297 - ./config/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml
279298 networks :
280299 - sentinel-kit-network
281- depends_on :
282- - sentinel-kit-server-fluentbit
283300 profiles : ["internal-monitoring"]
284301
285302 sentinel-kit-utils-grafana :
@@ -298,11 +315,11 @@ services:
298315 - GF_SECURITY_ADMIN_PASSWORD=${GF_SECURITY_ADMIN_PASSWORD}
299316 - GF_SERVER_HTTP_PORT=3000
300317 - ES_PASSWORD=${ELASTICSEARCH_PASSWORD}
318+ - MYSQL_DATABASE=${MYSQL_DATABASE}
319+ - MYSQL_USER=${MYSQL_USER}
320+ - MYSQL_PASSWORD=${MYSQL_PASSWORD}
301321 networks :
302322 - sentinel-kit-network
303- depends_on :
304- - sentinel-kit-utils-prometheus
305- - sentinel-kit-db-elasticsearch-es01
306323 entrypoint :
307324 - /bin/sh
308325 - -c
@@ -312,19 +329,45 @@ services:
312329 /run.sh
313330 profiles : ["internal-monitoring"]
314331
315- sentinel-kit-utils-phpmyadmin :
316- container_name : sentinel-kit-utils-phpmyadmin
317- hostname : ${SENTINELKIT_PMA_HOSTNAME}
318- image : phpmyadmin/phpmyadmin
332+ sentinel-kit-utils-elastic-exporter :
333+ hostname : sentinel-kit-utils-elastic-exporter
334+ container_name : sentinel-kit-utils-elastic-exporter
335+ image : justwatch/elasticsearch_exporter:latest
319336 restart : on-failure
320337 environment :
321- PMA_HOST : sentinel-kit-db-mysql
322- PMA_PORT : 3306
338+ - ES_URI=https://sentinel-kit-db-elasticsearch-es01:9200
339+ - ES_ALL=true
340+ - ES_TIMEOUT=10s
341+ - ES_SKIP_TLS_VERIFY=false
342+ - ES_CA_PATH=/usr/share/exporter/ca/ca.crt
343+ - ES_USERNAME=elastic
344+ - ES_PASSWORD=${ELASTICSEARCH_PASSWORD}
345+ volumes :
346+ - sentinel-kit_certificates_elasticsearch:/usr/share/exporter/ca
347+ networks :
348+ - sentinel-kit-network
349+ depends_on :
350+ sentinel-kit-db-elasticsearch-es01 :
351+ condition : service_healthy
352+ profiles : ["internal-monitoring"]
353+
354+ sentinel-kit-utils-mysql-exporter :
355+ hostname : sentinel-kit-utils-mysql-exporter
356+ container_name : sentinel-kit-utils-mysql-exporter
357+ image : prom/mysqld-exporter:latest
358+ restart : on-failure
359+ environment :
360+ - MYSQLD_EXPORTER_PASSWORD=${MYSQL_EXPORTER_PASSWORD}
361+ volumes :
362+ - ./config/mysql/my.cnf:/etc/mysql/my.cnf:ro
363+ command :
364+ [ "--config.my-cnf=/etc/mysql/my.cnf" ]
323365 networks :
324366 - sentinel-kit-network
325367 depends_on :
326368 - sentinel-kit-db-mysql
327- profiles : ["phpmyadmin"]
369+ profiles : ["internal-monitoring"]
370+
328371networks :
329372 sentinel-kit-network :
330373 driver : bridge
@@ -334,6 +377,7 @@ volumes:
334377 sentinel-kit_server_caddy_config :
335378 sentinel-kit_db_elasticsearch_es01_data :
336379 sentinel-kit_db_elasticsearch_es02_data :
380+ sentinel-kit_db_mysql_data :
337381 sentinel-kit_server_backend_vendor_cache :
338382 sentinel-kit_server_backend_var_cache :
339383 sentinel-kit_server_backend_public :
0 commit comments