From a7e6d9ce90e86675e1c10a727dc812bf3b70a3be Mon Sep 17 00:00:00 2001
From: Udo Waechter <udo@maketank.net>
Date: Sun, 5 Jul 2020 15:19:09 +0200
Subject: [PATCH] migrated to 2 containers

---
 mariadb/docker-mariadb-prometheus/Dockerfile | 2 +-
 mariadb/docker-mariadb/Dockerfile            | 6 +++---
 mariadb/docker-mariadb/docker-entrypoint.sh  | 5 -----
 mariadb/mariadb-deployment.yaml              | 7 +++++++
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/mariadb/docker-mariadb-prometheus/Dockerfile b/mariadb/docker-mariadb-prometheus/Dockerfile
index 0ef62be..e9fe4bc 100644
--- a/mariadb/docker-mariadb-prometheus/Dockerfile
+++ b/mariadb/docker-mariadb-prometheus/Dockerfile
@@ -12,4 +12,4 @@ RUN set -ex; \
 	echo '[client]\nhost=localhost\nuser=prometheus\npassword=prom01\n' >/etc/prometheus-mysql-exporter
 
 EXPOSE 9104
-CMD ["prometheus-mysql-exporter",  "--config.my-cnf", "/etc/prometheus-mysql-exporter"]
+CMD ["prometheus-mysqld-exporter",  "--config.my-cnf", "/etc/prometheus-mysql-exporter"]
diff --git a/mariadb/docker-mariadb/Dockerfile b/mariadb/docker-mariadb/Dockerfile
index 736b43c..436b201 100644
--- a/mariadb/docker-mariadb/Dockerfile
+++ b/mariadb/docker-mariadb/Dockerfile
@@ -51,7 +51,6 @@ RUN set -ex; \
 		pwgen \
 		tzdata \
 		xz-utils \
-		prometheus-mysqld-exporter \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
@@ -94,11 +93,12 @@ RUN set -ex; \
 		| xargs -rt -0 sed -Ei 's/^(bind-address|log)/#&/'; \
 # don't reverse lookup hostnames, they are usually another container
 	echo '[mysqld]\nskip-host-cache\nskip-name-resolve' > /etc/mysql/conf.d/docker.cnf; \
-	echo '[client]\nhost=localhost\nuser=prometheus\npassword=prom01\n' >/etc/prometheus-mysql-exporter
+	apt-get clean -y;
+	
 VOLUME /var/lib/mysql
 
 COPY docker-entrypoint.sh /usr/local/bin/
 
 ENTRYPOINT ["docker-entrypoint.sh"]
-EXPOSE 9104 3306
+EXPOSE 3306
 CMD ["mysqld"]
diff --git a/mariadb/docker-mariadb/docker-entrypoint.sh b/mariadb/docker-mariadb/docker-entrypoint.sh
index 9666c84..44a35e2 100755
--- a/mariadb/docker-mariadb/docker-entrypoint.sh
+++ b/mariadb/docker-mariadb/docker-entrypoint.sh
@@ -252,10 +252,6 @@ docker_setup_db() {
 		docker_process_sql --database=mysql <<<"CREATE DATABASE IF NOT EXISTS \`$MYSQL_DATABASE\` ;"
 	fi
 
-	docker_process_sql --database=mysql <<<"CREATE USER 'prometheus'@'127.0.0.1' IDENTIFIED BY 'prom01' ;"
-	docker_process_sql --database=mysql <<<"GRANT ALL ON *.* TO 'prometheus'@'127.0.0.1' ;"
-	docker_process_sql --database=mysql <<<"FLUSH PRIVILEGES ;"
-	
 	if [ -n "$MYSQL_USER" ] && [ -n "$MYSQL_PASSWORD" ]; then
 		mysql_note "Creating user ${MYSQL_USER}"
 		docker_process_sql --database=mysql <<<"CREATE USER '$MYSQL_USER'@'%' IDENTIFIED BY '$MYSQL_PASSWORD' ;"
@@ -341,7 +337,6 @@ _main() {
 			echo
 		fi
 	fi
-	/usr/bin/prometheus-mysqld-exporter --config.my-cnf /etc/prometheus-mysql-exporter&
 	exec "$@"
 }
 
diff --git a/mariadb/mariadb-deployment.yaml b/mariadb/mariadb-deployment.yaml
index 8b3adf5..2c1e4a0 100644
--- a/mariadb/mariadb-deployment.yaml
+++ b/mariadb/mariadb-deployment.yaml
@@ -31,6 +31,7 @@ spec:
       containers:
       - image: docker-registry.lan/mariadb:arm64 
         name: mariadb
+        imagePullPolicy: Always
         env:
           # Use secret in real usage
         - name: MYSQL_ROOT_PASSWORD
@@ -41,6 +42,12 @@ spec:
         volumeMounts:
         - name: mariadb-persistent-storage
           mountPath: /var/lib/mysql
+      - image: docker-registry.lan/mariadb-prometheus-exporter:arm64
+        name: mariadb-prometheus-exporter
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 9104
+          name: metrics
       volumes:
       - name: mariadb-persistent-storage
         persistentVolumeClaim: