...

.drone.yml

@@ -25,7 +25,7 @@ pipeline:
       - DOCKER_HOST=tcp://0.0.0.0:2375
     commands:
       - apt-get update && apt-get  install -yq php-gmp
-      - apt-get update && apt-get install -yq lsb-release
+      - apt-get update && apt-get install -yq lsb-release time
       - . /etc/os-release; echo $ID
       - lsb_release -cs
       - env

tools/src/Release.php

@@ -288,7 +288,7 @@ inventory=inventory.ini
 	;
     }
 
-    function addSupervisord(){
+    function addSupervisord($composer, $config = array(), $flavor = "dev"){
 
 	$version = "latest";
 	extract($config);
@@ -304,12 +304,10 @@ inventory=inventory.ini
 		->addEnviroment("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink")
 	 
 	;
-
-
     }
 
 
-    function addMySql($composer, $config, $flavor = "dev"){
+    function addMySql($composer, $config = array(), $flavor = "dev"){
 	$version = "latest";
 	$domain = "fd3.flowdat.com";
 	extract($config);
@@ -324,6 +322,32 @@ inventory=inventory.ini
 	;
     }
 
+    function addGrafana($composer, $config = array(), $flavor = "dev"){
+	$version = "latest";
+	$domain = "fd3.flowdat.com";
+	extract($config);
+
+
+	$composer->addService("grafana")->image("grafana/grafana")
+
+		//->addLinks("jsendpoint","endpoint")
+		->addLinks("mysql")
+		->restart("always")
+		->addEnviroment("VIRTUAL_HOST", "grafana.".$domain)
+		->addEnviroment("HTTPS_METHOD", 	"nohttps")
+
+		->addEnviroment("./statsd/grafana/lib", "/var/lib/grafana")
+		->addEnviroment("GF_SECURITY_ADMIN_PASSWORD", "queRini6")
+		->addEnviroment("GF_INSTALL_PLUGINS", "grafana-simple-json-datasource")
+		->addEnviroment("GF_DEFAULT_THEME", "light")
+		->addEnviroment("GF_AUTH_ANONYMOUS_ORG_NAME", "Main Org.")
+		->addEnviroment("GF_AUTH_ANONYMOUS_ORG_ROLE", "Viewer")
+		->addEnviroment("GF_AUTH_ANONYMOUS_ENABLED", "true")
+		->addEnviroment("GF_DATABASE_URL", "mysql://root:".$mysql_root_pass."@mysql:3306/grafana")
+		->addEnviroment("GF_SERVER_ROOT_URL", "http://grafana.".$fd_domain."/")
+	;
+    }
+
     function getDockerComposer( $version = "latest", $host_env_file = "host.env", $registry = "docker.infra.flowdat.com/", $fd_domain = "fd3.flowdat.com")
     {
 
@@ -340,15 +364,16 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 
 	$this->addNginx($composer, $base_vars);
 
+	/**************************************************************************************/
+	/* Apps / Web UI */
+	/**************************************************************************************/
+
 	$this->addBase($composer, $base_vars); 
 	$this->addFtth($composer, $base_vars);
 	$this->addStats($composer, $base_vars);
 	$this->addMapas($composer, $base_vars);
 
 
-
-
-
 	/**************************************************************************************/
 	/* Servicios */
 	/**************************************************************************************/
@@ -362,11 +387,24 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 		->restart("always")
 	;
 
+	$this->addMongDb($composer, $base_vars);
+
+	/**************************************************************************************/
+	/* Grafana y compoenentes de las estadisticas*/
+	/**************************************************************************************/
+	$this->addGrafana($composer, $base_vars + array(
+		'mysql_user' => $mysql_user,
+                'mysql_pass' => $mysql_pass,
+		));
+
+
 
 	/**************************************************************************************/
 	/* Workers */
 	/**************************************************************************************/
 
+	$this->addSupervisord($composer, $base_vars);
+
 	//$composer->addService("ftth_worker")->image($registry."fd3/ftth:" . $v)
 	//	->build("./ftth/")
 	//	->restart("always")
@@ -400,24 +438,6 @@ $oauth_client_secret = "5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k";
 	//;
 
 
-	//$composer->addService("grafana")->image("grafana/grafana")
-
-	//	->addLinks("jsendpoint","endpoint")
-	//	->addLinks("mysql")
-	//	->restart("always")
-	//	->addEnviroment("VIRTUAL_HOST", "grafana.".$fd_domain)
-	//	->addEnviroment("HTTPS_METHOD", 	"nohttps")
-
-	//	->addEnviroment("./statsd/grafana/lib", "/var/lib/grafana")
-	//	->addEnviroment("GF_SECURITY_ADMIN_PASSWORD", "queRini6")
-	//	->addEnviroment("GF_INSTALL_PLUGINS", "grafana-simple-json-datasource")
-	//	->addEnviroment("GF_DEFAULT_THEME", "light")
-	//	->addEnviroment("GF_AUTH_ANONYMOUS_ORG_NAME", "Main Org.")
-	//	->addEnviroment("GF_AUTH_ANONYMOUS_ORG_ROLE", "Viewer")
-	//	->addEnviroment("GF_AUTH_ANONYMOUS_ENABLED", "true")
-	//	->addEnviroment("GF_DATABASE_URL", "mysql://root:".$mysql_root_pass."@mysql:3306/grafana")
-	//	->addEnviroment("GF_SERVER_ROOT_URL", "http://grafana.".$fd_domain."/")
-	//;
 
 	//$composer->addService("jsendpoint")
 	//	->build("./extra/statsd/endpoint/json")