added visualizer, fixed some errs

Author: bstaijen

database/Dockerfile

@@ -1,2 +1,3 @@
 FROM bstaijen/mariadb-galera-cluster:0.3
-ADD setup.sql /docker-entrypoint-initdb.d/
+ADD setup.sql /docker-entrypoint-initdb.d/
+ADD mariadb.png /docker-entrypoint-initdb.d/mariadb.png

database/mariadb.png

@@ -14,7 +14,7 @@ CREATE TABLE IF NOT EXISTS CommentService.comments (id INT NOT NULL AUTO_INCREME
 CREATE USER 'authentication_service'@'%' IDENTIFIED BY 'password';
 GRANT ALL ON ProfileService.* TO 'authentication_service'@'%';
 
-CREATE USER 'profile_service'@'%' IDENTIFIED BY 'password';
+CREATE USER 'profile_service'@'%' IDENTIFIED BY 'password'; 
 GRANT ALL ON ProfileService.* TO 'profile_service'@'%';
 
 CREATE USER 'comment_service'@'%' IDENTIFIED BY 'password';
@@ -24,4 +24,8 @@ CREATE USER 'photo_service'@'%' IDENTIFIED BY 'password';
 GRANT ALL ON PhotoService.* TO 'photo_service'@'%';
 
 CREATE USER 'vote_service'@'%' IDENTIFIED BY 'password';
-GRANT ALL ON VoteService.* TO 'vote_service'@'%';
+GRANT ALL ON VoteService.* TO 'vote_service'@'%';
+
+INSERT INTO ProfileService.users(`username`, `email`, `password`) VALUES ('bstaijen','bjorge.staijen@mariadb.com','$2a$10$1CSYrh6MYJdBoAnJMcQ22.sZ2QBfWL7VlfpQayOt8otdOa1Myjt7O');
+
+INSERT INTO PhotoService.photos(`title`, `user_id`, `filename`, `contentType`, `photo`) VALUES ('The MariaDB seal',1,'94049535630251382.png','image/png',  LOAD_FILE('/docker-entrypoint-initdb.d/mariadb.png'));

database/setup.sql

@@ -2,7 +2,7 @@ version: '2'
 
 services:
     webserver:
-        image: "webserver"
+        image: bstaijen/mariadb-microservice-webserver:demo
         depends_on:
             - authentication
             - photo
@@ -23,7 +23,7 @@ services:
         labels:
         - "com.mariadb.host=webserver"
     authentication:
-        image: "authenticationsvc"
+        image: bstaijen/mariadb-microservice-authenticationsvc:demo
         depends_on: 
             - registrator
         ports:
@@ -41,7 +41,7 @@ services:
         labels:
         - "com.mariadb.host=authenticationsvc"
     photo:
-        image: "photosvc"
+        image: bstaijen/mariadb-microservice-photosvc:demo
         depends_on: 
             - registrator
         ports:
@@ -62,7 +62,7 @@ services:
         labels:
         - "com.mariadb.host=photosvc"
     vote:
-        image: "votesvc"
+        image: bstaijen/mariadb-microservice-votesvc:demo
         depends_on: 
             - registrator
         ports:
@@ -81,7 +81,7 @@ services:
         labels:
         - "com.mariadb.host=votesvc"
     comment:
-        image: "commentsvc"
+        image: bstaijen/mariadb-microservice-commentsvc:demo3
         depends_on: 
             - registrator
         ports:
@@ -90,16 +90,19 @@ services:
         environment:
         - "PORT=5004"
         - "PROFILE_SERVICE_URL=http://profile:5000/"
+        - "PHOTO_SERVICE_URL=http://photo:5002/"
+        - "VOTE_SERVICE_URL=http://vote:5003/"
         - "DB_USERNAME=comment_service"
         - "DB_PASSWORD=password"
         - "DB_HOST=db"
         - "DB_PORT=3306"
         - "DB=CommentService"
+        - "SECRET_KEY=ABCDEFGHIJKLMNOPQRSTUVWXYZ"
         - "affinity:com.mariadb.host!=commentsvc"
         labels:
         - "com.mariadb.host=commentsvc"
     profile:
-        image: "profilesvc"
+        image: bstaijen/mariadb-microservice-profilesvc:demo
         depends_on: 
             - registrator
         ports:
@@ -117,7 +120,7 @@ services:
         labels:
         - "com.mariadb.host=profilesvc"
     db:
-        image: bstaijen/mariadb-microservice-database:0.3
+        image: bstaijen/mariadb-microservice-database:demo
         depends_on: 
             - registrator
         restart: always
@@ -155,4 +158,15 @@ services:
         - "8500:8500"
         - "8600:53/udp"
         command: "-server -bootstrap -ui-dir /ui"
+        restart: always
+    vizualizer:
+        image: bstaijen/mariadb-microservice-vizualizersvc:demo
+        ports:
+        - 3000:3000
+        environment:
+        - SWARM_HOST
+        - SWARM_CA
+        - SWARM_KEY
+        - SWARM_CERT
+        - "constraint:node==master"
         restart: always

docker-compose.yml

@@ -0,0 +1,2 @@
+FROM node:onbuild
+EXPOSE 3000

vizualizer/Dockerfile

@@ -0,0 +1,20 @@
+# Docker Swarm Visualization
+
+## Running - new stack version
+
+```
+docker stack deploy viz -c docker-compose.stack.yml
+```
+
+## Running - old compose version
+
+This assumes you have created your Swarm with Machine and the master is called `swarm-0`.
+
+```
+source scripts/setup.sh
+scripts/up.sh swarm-0
+```
+
+Browse to http://localhost:3000 to see the console. Add url parameter multiply=true to multiply the number of ocntainers and hosts for testing. http://localhost:3000/?multiply=true. When you use multuply, use cmd-- to reduce size of display, uses 2000 pix for svg viewport width. I tested it with 100 hosts and 12000 containers.
+
+<img src="../static/viz-demo.png"></img>

vizualizer/README.md

@@ -0,0 +1,11 @@
+viz:
+  build: .
+  ports:
+   - 3000:3000
+  environment:
+   - SWARM_HOST
+   - SWARM_CA
+   - SWARM_KEY
+   - SWARM_CERT
+   - "constraint:node==master"
+  restart: always

vizualizer/docker-compose.yml

@@ -0,0 +1,14 @@
+{
+  "name": "viz",
+  "version": "0.0.1",
+  "description": "visualize docker containers on a swarm master",
+  "scripts": {
+    "start": "node viz"
+  },
+  "dependencies": {
+    "async": "^1.2.1",
+    "dockerode": "latest",
+    "express": "latest",
+    "socket.io": "^1.3.5"
+  }
+}