Merged in FD3-344 (pull request #19)

FD3-344 config docker grafana

docker-compose.yml

@@ -284,7 +284,7 @@ services:
     image: fd3_simple_json_endpoint
     ports:
       - 9003:8000
-    build: 
+    build:
       context: ./extra/statsd/endpoint/json
     links:
         - mysql_jsonendpoint:mysql_jsonendpoint
@@ -303,7 +303,7 @@ services:
       - mysql:mysql
     ports:
       - 9000:8000
-    build: 
+    build:
       context: ./extra/statsd/endpoint/mysql
     volumes:
       - ./extra/statsd/endpoint/mysql:/opt/datasource
@@ -316,7 +316,7 @@ services:
       - mongodb:mongodb
     ports:
       - 9002:8000
-    build: 
+    build:
       context: ./extra/statsd/endpoint/mongodb
     volumes:
       - ./extra/statsd/endpoint/mongodb:/opt/datasource
@@ -337,7 +337,7 @@ services:
   statsd:
     restart: always
     image: fd3-statsd-mysql-backend
-    build: 
+    build:
       context: ./extra/statsd/statsd
     ports:
       - "8125:8125/udp"
@@ -367,7 +367,7 @@ services:
       - ./supervisord/bin/fiberlink:/usr/bin/fiberlink
     environment:
       TERM: "xterm"
-  
+
   geoserver:
     build:
       context: ./extra/geoserver/
@@ -396,6 +396,7 @@ services:
             - './extra/nginx/certs:/etc/nginx/certs:ro'
             - './extra/nginx/vhost.d:/etc/nginx/vhost.d'
             - './extra/nginx/share:/usr/share/nginx/html'
+
   redis:
     image: redis:latest
     restart: always

grafana.env

@@ -0,0 +1,11 @@
+CLIENT=''
+VIRTUAL_HOST=grafana.${CLIENT}.flowdat.com
+HTTPS_METHOD=nohttps
+GF_SECURITY_ADMIN_PASSWORD=queRini6
+GF_INSTALL_PLUGINS=grafana-simple-json-datasource
+GF_DEFAULT_THEME=light
+GF_AUTH_ANONYMOUS_ORG_NAME="Main Org."
+GF_AUTH_ANONYMOUS_ORG_ROLE=Viewer
+GF_AUTH_ANONYMOUS_ENABLED=true
+GF_DATABASE_URL="mysql://root:235r2342gtfsw@mysql:3306/grafana"
+GF_SERVER_ROOT_URL=http://${VIRTUAL_HOST}/

tools/src/Release.php

@@ -21,42 +21,52 @@ class Release extends Command
      * @var string Nombre del archivo de log.
      */
     private $_running_log;
+
     /**
      * @var string Contiene la politica de restart de los dockers.
      */
     private $_docker_restart_default;
+
     /**
      * @var array Contiene las variables que se utilizar en la ejecucion del ansible.
      */
     private $_ansible_vars;
+
     /**
      * @var string Contiene el password del usuario root.
      */
     private $_mysql_root_pass;
+
     /**
      * @var string Contiene el usuario de base de datos.
      */
     private $_mysql_user;
+
     /**
      * @var string Contiene la contrasena del  usuario de base de datos.
      */
     private $_mysql_pass;
+
     /**
      * @var DevOps\FileSystem Me permite crear archivos.
      */
     private $_dObj;
+
     /**
      * @var string Contiene el dominio.
      */
     private $_domain;
+
     /**
      * @var string Contiene el nombre del cliente.
      */
     private $_client;
+
     /**
      * @var array Contiene todos los modulos para la instalacion.
      */
     private $_modules_all;
+
     /**
      * @var array Contiene la configuracion de los modulos.
      */
@@ -246,9 +256,9 @@ class Release extends Command
             $this->_domain = $input->getOption("domain");
             $this->_client = $input->getOption("client");
 
-            if (!$this->_client) {
+	        if (!$this->_client) {
                 $this->_client = basename(realpath($dir));
-            }
+	        }
 
             $docker_tag = $input->getOption("docker-tag");
 
@@ -572,7 +582,6 @@ class Release extends Command
             ->addVolumes("./extra/supervisord/bin/fiberlink", "/usr/bin/fiberlink");
     }
 
-
     function addMySql(FileFormat2 $composer, $config = array())
     {
         $module = "mysql";
@@ -691,20 +700,8 @@ class Release extends Command
         ->image("grafana/grafana")
         ->addLinks("mysql")
         ->restart($this->_docker_restart_default)
-        ->addEnv_file("mysql." . $host_env_file)
-        ->addVolumes("./statsd/grafana/lib", "/var/lib/grafana");
-
-        $this->writeVariablesEnviroment($module . "." . $host_env_file, $module,
-        array(
-            "GF_SECURITY_ADMIN_PASSWORD", "queRini6",
-            "GF_INSTALL_PLUGINS", "grafana-simple-json-datasource",
-            "GF_DEFAULT_THEME", "light",
-            "GF_AUTH_ANONYMOUS_ORG_NAME", "Main Org.",
-            "GF_AUTH_ANONYMOUS_ORG_ROLE", "Viewer",
-            "GF_AUTH_ANONYMOUS_ENABLED", "true",
-            "GF_DATABASE_URL", "mysql://root:" . $this->_mysql_root_pass . "@mysql:3306/grafana",
-            "GF_SERVER_ROOT_URL", "http://" . $this->getDomain("grafana") . "/"
-        ));
+        ->addEnv_file("grafana.env")
+        ->addVolumes("./extra/statsd/grafana/lib", "/var/lib/grafana");
 
         $this->addJsonEndPoints($composer, $config);
     }