FIX : error with "if" instruction tu run elk beats

FIX : Mysql release
end-of-game · Apr 14, 2017 · 02b28c5 · 02b28c5
1 parent 1901a36
commit 02b28c5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/cu-services/images/modules/mysql-5-5/Dockerfile b/cu-services/images/modules/mysql-5-5/Dockerfile
@@ -44,7 +44,7 @@ RUN apt-get update && apt-get install -y perl --no-install-recommends && rm -rf
 RUN apt-get update && apt-get install -y libaio1 pwgen && rm -rf /var/lib/apt/lists/*
 
 ENV MYSQL_MAJOR 5.5
-ENV MYSQL_VERSION 5.5.54
+ENV MYSQL_VERSION 5.5.55
 
 # gpg: key 5072E1F5: public key "MySQL Release Engineering <[email protected]>" imported
 RUN apt-get update && apt-get install -y ca-certificates wget --no-install-recommends && rm -rf /var/lib/apt/lists/* \

diff --git a/cu-services/images/modules/mysql-5-6/docker-entrypoint.sh b/cu-services/images/modules/mysql-5-6/docker-entrypoint.sh
@@ -131,12 +131,12 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		echo 'MySQL init process done. Ready for start up.'
 		echo
 		echo
-		echo 'Start metricbeat agent with mysql module.'
-
-		if [[ -z "$APPLICATIVE_MONITORING" ]] || [ "$APPLICATIVE_MONITORING" -eq 1 ]; then
-			/opt/cloudunit/monitoring-agents/metricbeat/metricbeat -c /opt/cloudunit/monitoring-agents/metricbeat/conf.d/mysql.yml&
-		fi
-
+	fi
+	if [[ -z "$APPLICATIVE_MONITORING" ]] || [ "$APPLICATIVE_MONITORING" -eq 1 ]; then
+    		echo
+	    	echo 'Start metricbeat agent with mysql module.'
+            echo
+    		/opt/cloudunit/monitoring-agents/metricbeat/metricbeat -c /opt/cloudunit/monitoring-agents/metricbeat/conf.d/mysql.yml&
 	fi
 fi
 

diff --git a/cu-services/images/modules/mysql-5-7/docker-entrypoint.sh b/cu-services/images/modules/mysql-5-7/docker-entrypoint.sh
@@ -128,12 +128,12 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
 		echo
 		echo 'MySQL init process done. Ready for start up.'
 		echo
-		echo
-		echo 'Start metricbeat agent with mysql module.'
-		if [[ -z "$APPLICATIVE_MONITORING" ]] || [ "$APPLICATIVE_MONITORING" -eq 1 ]; then
-			/opt/cloudunit/monitoring-agents/metricbeat/metricbeat -c /opt/cloudunit/monitoring-agents/metricbeat/conf.d/mysql.yml&
-		fi
-
+	fi
+	if [[ -z "$APPLICATIVE_MONITORING" ]] || [ "$APPLICATIVE_MONITORING" -eq 1 ]; then
+    		echo
+	    	echo 'Start metricbeat agent with mysql module.'
+            echo
+    		/opt/cloudunit/monitoring-agents/metricbeat/metricbeat -c /opt/cloudunit/monitoring-agents/metricbeat/conf.d/mysql.yml&
 	fi
 fi