Merge branch 'master' of bitbucket.org:ikflowdat/installer

docker-compose.yml

@@ -14,7 +14,7 @@ services:
     environment:
       VIRTUAL_HOST: base.fd3.flowdat.com
       HTTPS_METHOD: nohttps
-    volumes: 
+    volumes:
       - ./base/:/opt/base/
 
   ftth:
@@ -38,8 +38,9 @@ services:
       #LETSENCRYPT_HOST: ftth.fd3.flowdat.com
       #LETSENCRYPT_EMAIL: andrade.luciano@gmail.com
       AMQP_KEY: ftth
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
+
   radius:
     restart: always
     image: fd3-radius
@@ -65,7 +66,7 @@ services:
       #LETSENCRYPT_EMAIL: andrade.luciano@gmail.com
     volumes:
       - ./radius/:/opt/radius/
-      
+
   mapas:
     restart: always
     image: fd3-mapas
@@ -84,7 +85,7 @@ services:
       OAUTH_CLIENT_ID : 1_3323sq6urn8kwccg8s4ok848ggwwgkw4c08wsc4cwkc08osocc
       OAUTH_CLIENT_SECRET : 5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k
 
-    volumes: 
+    volumes:
       - ./mapas/:/opt/mapas/
 
   stats:
@@ -96,7 +97,11 @@ services:
       - mysql:mysql
       - base:base
       - nginx-proxy:base.fd3.flowdat.com
+      - nginx-proxy:geoserver.fd3.flowdat.com
       - amqp:amqp
+      - geoserver:geoserver
+      - mysql_jsonendpoint:mysql_jsonendpoint
+      - mongodb_jsonendpoint:mongodb_jsonendpoint
     env_file:
       - host.env
     environment:
@@ -105,9 +110,10 @@ services:
       OAUTH_CLIENT_ID : 1_3323sq6urn8kwccg8s4ok848ggwwgkw4c08wsc4cwkc08osocc
       OAUTH_CLIENT_SECRET : 5w7gx6ptdoo4g8cwwo88o8gowosgco84sso08ssow0osg88g8k
       AMQP_KEY: stats
-    volumes: 
+    volumes:
       - ./stats/:/opt/stats/
-      
+      - ./geoserver/geoserver-shapes:/var/www/shapes
+
   cablemodem:
     restart: always
     image: fd3-cablemodem
@@ -130,15 +136,15 @@ services:
       OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       HTTPS_METHOD: nohttps
     volumes:
-      - ./cablemodem/:/opt/cablemodem/    
- 
+      - ./cablemodem/:/opt/cablemodem/
+
   mysql:
     restart: always
     environment:
         MYSQL_ROOT_PASSWORD: 235r2342gtfsw
         MYSQL_USER: iksop
         MYSQL_PASSWORD: 235r2342gtfsw
-    volumes: 
+    volumes:
       - ./mysql/:/var/lib/mysql/
     image: mysql:5.7
 
@@ -148,7 +154,7 @@ services:
     restart: always
     ports:
       - "8072:15672"
-  
+
   ftth_worker:
     restart: always
     image: fd3-ftth
@@ -168,14 +174,14 @@ services:
       OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: ftth
 
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
-      
+
   command_consumer_worker:
     restart: always
     image: fd3-ftth
     build:
-      context: ./ftth    
+      context: ./ftth
     command: bin/console rabbitmq:consumer command_consumer
     restart: always
     links:
@@ -187,12 +193,12 @@ services:
       HOST_FTTH: ftth.fd3.flowdat.com
       HOST_BASE: base.fd3.flowdat.com
       OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g  
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: ftth
 
-    volumes: 
+    volumes:
       - ./ftth/:/opt/ftth/
-      
+
   stats_command_worker:
     restart: always
     image: docker.infra.flowdat.com/fd3/stats:latest
@@ -210,7 +216,9 @@ services:
       OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
       OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: stats
-      
+    volumes:
+      - ./stats:/opt/stats
+
   log_consumer_worker:
     restart: always
     image: docker.infra.flowdat.com/fd3/base:latest
@@ -221,12 +229,12 @@ services:
       - amqp:amqp
       - nginx-proxy:base.fd3.flowdat.com
     env_file:
-      - host.env      
+      - host.env
     environment:
       OAUTH_CLIENT_ID: 1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g  
+      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
       AMQP_KEY: base
- 
+
   phpmyadmin:
     restart: always
     image: phpmyadmin/phpmyadmin
@@ -269,15 +277,15 @@ services:
     ports:
       - 9003:8000
     build: 
-      context: ./statsd/endpoint/json
+      context: ./extra/statsd/endpoint/json
     links:
         - mysql_jsonendpoint:mysql_jsonendpoint
         - mongodb_jsonendpoint:mongodb_jsonendpoint
     volumes:
-      - ./statsd/endpoint/json:/opt/datasource
+      - ./extra/statsd/endpoint/json:/opt/datasource
     environment:
       TIMEOUT: 60000
-      
+
   mysql_jsonendpoint:
     restart: always
     image: fd3_simple_json_endpoint_mysql
@@ -288,9 +296,9 @@ services:
     ports:
       - 9000:8000
     build: 
-      context: ./statsd/endpoint/mysql
+      context: ./extra/statsd/endpoint/mysql
     volumes:
-      - ./statsd/endpoint/mysql:/opt/datasource
+      - ./extra/statsd/endpoint/mysql:/opt/datasource
 
 
   mongodb_jsonendpoint:
@@ -301,9 +309,9 @@ services:
     ports:
       - 9002:8000
     build: 
-      context: ./statsd/endpoint/mongodb
+      context: ./extra/statsd/endpoint/mongodb
     volumes:
-      - ./statsd/endpoint/mongodb:/opt/datasource
+      - ./extra/statsd/endpoint/mongodb:/opt/datasource
 
 
   mongo_express:
@@ -314,15 +322,15 @@ services:
       - mongodb:mongo
 
   mongodb:
-    volumes: 
-      - ./mongodb:/data/db 
+    volumes:
+      - ./mongodb:/data/db
     image: mongo:3.4
 
   statsd:
     restart: always
     image: fd3-statsd-mysql-backend
     build: 
-      context: ./statsd/statsd
+      context: ./extra/statsd/statsd
     ports:
       - "8125:8125/udp"
     links:
@@ -331,16 +339,19 @@ services:
     volumes:
       - ./statsd/statsd/:/opt/config
       - ./statsd/backend/mongodb/mongodb.js:/opt/statsd/backends/mongodb.js
- 
+
   supervisord:
     restart: always
     image: fd3-supervisord
     build:
-      context: supervisord
+      context: ./extra/supervisord
     ports:
       - "9001:9001"
     privileged: true
-    volumes: 
+    links:
+      - mongodb:mongodb
+      - mysql:mysql
+    volumes:
       - ./supervisord/:/etc/supervisord/
       - ./supervisord/var/:/var/log/supervisor/
       - ./supervisord/sshd_config:/etc/ssh/sshd_config
@@ -348,20 +359,22 @@ services:
       - ./supervisord/bin/fiberlink:/usr/bin/fiberlink
     environment:
       TERM: "xterm"
- 
   geoserver:
     build:
-      context: extra/geoserver/
+      context: ./extra/geoserver/
     image: 'docker.infra.flowdat.com/fd3/geoserver:latest'
+    links:
+      - nginx-proxy:geoserver.fd3.flowdat.com
     volumes:
       - ./extra/geoserver/geoserver-data/styles:/opt/geoserver/data_dir/styles
       - ./geoserver/geoserver-shapes:/var/www/shapes
     ports:
       - 8082:8080
     restart: unless-stopped
+
   nginx-proxy:
         build:
-            context: extra/nginx/
+            context: ./extra/nginx/
         image: 'docker.infra.flowdat.com/fd3/nginx:latest'
         env_file:
             - host.env
@@ -387,4 +400,4 @@ services:
 #      - /var/run/docker.sock:/var/run/docker.sock:ro
 #      - ./nginx/certs:/etc/nginx/certs
 #      - ./nginx/vhost.d:/etc/nginx/vhost.d
-# 
+#

statsd/command/mongodelete.js

@@ -1,39 +0,0 @@
-#!/usr/bin/env node
-
-var cli = require('cli'), 
-    options = cli.parse({
-        leave: ['l', 'Period of time', 'string', '1d'],
-        name: ['n', 'MongoDb database name', 'string', 'statsd'],
-        host: ['h', 'MongoDb host', 'string', 'mongodb'],
-	port: ['p', 'MongoDb port', 'string', '27017']
-    })
-;
-
-var mongo = require('mongodb');
-
-var moment = require('moment');
-var n = parseInt(options.leave, 10);
-var from = moment().subtract(n, options.leave.replace(n, '')).format('X');
-var to = moment().format('X');
-
-mongo.connect("mongodb://" + options.host + ":" + options.port + "/" + options.name, function (err, db) {
-    if (err) {
-        db.close();
-        console.log(err);
-        throw err;
-    }
-    db.listCollections().toArray(function(err, collInfos) {
-        if (err) {
-            db.close();
-            console.log(err);
-            throw err;
-        }
-        for (var i = 0; i < collInfos.length; i++) {
-            console.log('db.collection('+collInfos[i].name+').remove({ time: { $lte: '+from+', $gte: '+to+' } })');
-            db.collection(""+collInfos[i].name).remove({ time: { $lte: from, $gte: to } });
-        }
-        db.close();
-    });
-});
-
-console.log('OK');

statsd/command/mysqldelete.js

@@ -1,46 +0,0 @@
-#!/usr/bin/env node
-
-var cli = require('cli'), 
-    options = cli.parse({
-        leave: ['l', 'Period of time', 'string', '1d'],
-        host: ['h', 'MySQL host', 'string', 'mysql'],
-        port: ['p', 'MySQL port', 'string', '3306'],
-	user: ['u', 'MySQL user', 'string', 'root'],
-	password: ['pw', 'MySQL password', 'string', '235r2342gtfsw'],
-	database: ['d', 'MySQL database', 'string', 'statsd_db']
-    })
-;
-
-var mysql = require('mysql');
-var connection = mysql.createConnection({
-    host: options.host,
-    port: options.port,
-    user: options.user,
-    password: options.password,
-    database: options.database,
-    multipleStatements: true
-});
-
-var moment = require('moment');
-var n = parseInt(options.leave, 10);
-var from = moment().subtract(n, options.leave.replace(n, '')).format('X');
-var to = moment().format('X');
-
-var mysql_tables = ['gauges_statistics', 'counters_statistics', 'timers_statistics', 'sets_statistics'];
-for (var i = 0; i < mysql_tables.length; i++) {
-    console.log('DELETE FROM '+mysql_tables[i]+' WHERE timestamp <= '+from+' OR timestamp >= '+to+';');
-    
-    connection.query('DELETE FROM '+mysql_tables[i]+' WHERE timestamp <= '+from+' OR timestamp >= '+to+';', function (err, rows, fields) {
-        if (err) {
-            connection.end();
-            console.log(err);
-            throw err;
-        }
-        for (var i = 0; i <= rows.length - 1; i++) {
-            console.log(rows[i]);
-        }
-    });
-}
-connection.end();
-
-console.log('OK');