Final cosmetic changes

eBayClassifiedsGroup · May 18, 2016 · 04a3e49 · 04a3e49
1 parent 05b6028
commit 04a3e49
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/eBayClassifiedsGroup/PanteraS.svg?branch=master)](https://travis-ci.org/eBayClassifiedsGroup/PanteraS)
 [![Docker Hub](https://img.shields.io/badge/docker-ready-blue.svg)](https://hub.docker.com/r/panteras/paas-in-a-box/)
-[![Current Release](http://img.shields.io/badge/release-0.2.2-blue.svg)](https://github.com/eBayClassifiedsGroup/PanteraS/releases/tag/v0.2.2)
+[![Current Release](http://img.shields.io/badge/release-0.2.3-blue.svg)](https://github.com/eBayClassifiedsGroup/PanteraS/releases/tag/v0.2.3)
 
 # PanteraS <br> _entire_ Platform as a Service, in a box
 _"One container to rule them all"_
@@ -59,6 +59,10 @@ Depending on `MASTER` and `SLAVE` you can define role of the container
     Mesos Slave | x | - | x |
      Registrator| x | - | x |
          dnsmasq| x | x | x |
+    Fabio       | - | - | - |
+    Netdata     | - | - | - |
+
+(Last two require manual override `START_FABIO=true` )
 
 
 ## Requirements:
@@ -123,7 +127,7 @@ slavehost-n# docker-compose up -d
 You can reach the PaaS components
 on the following ports:
 
-- HAproxy: http://hostname:81
+- HAproxy / Fabio: http://hostname:81
 - Consul: http://hostname:8500
 - Chronos: http://hostname:4400
 - Marathon: http://hostname:8080

diff --git a/docker-compose.yml.tpl b/docker-compose.yml.tpl
@@ -8,6 +8,7 @@ panteras:
      ${MARATHON_PORTS}
      ${MESOS_PORTS}
      ${CHRONOS_PORTS}
+     ${NETDATA_PORTS}
 
   environment:
     CONSUL_IP:               "${CONSUL_IP}"
@@ -17,21 +18,25 @@ panteras:
     GOMAXPROCS:              "${GOMAXPROCS}"
 
     SERVICE_8500_NAME: consul-ui
-    SERVICE_8500_TAGS: haproxy
+    SERVICE_8500_TAGS: haproxy,urlprefix-consul-ui.service.consul/
     SERVICE_8500_CHECK_HTTP: /v1/status/leader
 
     SERVICE_8080_NAME: marathon
-    SERVICE_8080_TAGS: haproxy
+    SERVICE_8080_TAGS: haproxy,urlprefix-marathon.service.consul/
     SERVICE_8080_CHECK_HTTP: /v2/leader
 
     SERVICE_5050_NAME: mesos
-    SERVICE_5050_TAGS: haproxy
+    SERVICE_5050_TAGS: haproxy,urlprefix-mesos.service.consul/
     SERVICE_5050_CHECK_HTTP: /master/health
 
     SERVICE_4400_NAME: chronos
-    SERVICE_4400_TAGS: haproxy
+    SERVICE_4400_TAGS: haproxy,urlprefix-chronos.service.consul/
     SERVICE_4400_CHECK_HTTP: /ping
 
+    SERVICE_19999_NAME: netdata
+    SERVICE_19999_TAGS: haproxy,urlprefix-netdata.service.consul/
+    SERVICE_19999_CHECK_HTTP: /version.txt
+
     START_CONSUL:            "${START_CONSUL}"
     START_CONSUL_TEMPLATE:   "${START_CONSUL_TEMPLATE}"
     START_DNSMASQ:           "${START_DNSMASQ}"

diff --git a/generate_yml.sh b/generate_yml.sh
@@ -88,11 +88,12 @@ DNSMASQ_ADDRESS=${DNSMASQ_ADDRESS:-"--address=/consul/${CONSUL_IP}"}
     KEEPALIVED_CONSUL_TEMPLATE="-template=./keepalived.conf.ctmpl:/etc/keepalived/keepalived.conf:./keepalived_reload.sh"
 
 # Expose ports depends on which service has been mark to start
-[ "${START_CONSUL_TEMPLATE}" == "true" ] && {
+[ "${START_CONSUL_TEMPLATE}" == "true" ] || [ "${START_FABIO}" == "true" ] && {
   [ "${START_CONSUL}"        == "true" ] && PORTS="ports:" && CONSUL_UI_PORTS='- "8500:8500"'
   [ "${START_MARATHON}"      == "true" ] && PORTS="ports:" && MARATHON_PORTS='- "8080:8080"'
   [ "${START_MESOS_MASTER}"  == "true" ] && PORTS="ports:" && MESOS_PORTS='- "5050:5050"'
   [ "${START_CHRONOS}"       == "true" ] && PORTS="ports:" && CHRONOS_PORTS='- "4400:4400"'
+  [ "${START_NETDATA}"       == "true" ] && PORTS="ports:" && NETDATA_PORTS='- "19999:19999"'
 }
 
 # Override docker with local binary

diff --git a/infrastructure/panteras.http b/infrastructure/panteras.http
@@ -67,6 +67,9 @@ Content-Type: text/html
                 <div id="consul" class="col-md-6 hidden">
                     <a href="/" title="Service discovery"><img id="consul_p" width="32" height="32"/>Consul</a>
                 </div>
+                <div id="netdata" class="col-md-6 hidden">
+                    <a href="/" title="Netdata monitoring"><img id="netdata_p" width="32" height="32"/>Netdata</a>
+                </div>
                 <div id="supervisord" class="col-md-6 hidden">
                     <a href="/" title="Processes status"><span class="glyphicon glyphicon-play" aria-hidden="true"></span>Supervisor</a>
                 </div>
@@ -136,6 +139,10 @@ Content-Type: text/html
                     id: 'mesos-master',
                     port: 5050
                 },
+                {
+                    id: 'netdata',
+                    port: 19999
+                },
             ];
 
             links.forEach(function (link) {
@@ -148,8 +155,9 @@ Content-Type: text/html
             });
 
             document.getElementById('marathon_p').src = window.location.origin + ':8080/ui/img/marathon-favicon.ico';
-            document.getElementById('consul_p').src = window.location.origin + ':8500/ui/static/favicon.png';
-			document.getElementById('chronos_p').src = window.location.origin + ':4400/favicon.ico';
+            document.getElementById('consul_p').src   = window.location.origin + ':8500/ui/static/favicon.png';
+            document.getElementById('chronos_p').src  = window.location.origin + ':4400/favicon.ico';
+            document.getElementById('netdata_p').src  = window.location.origin + ':19999/favicon.ico';
 
         </script>
     </body>

diff --git a/infrastructure/version b/infrastructure/version
@@ -1 +1 @@
-version 0.2.2
+version 0.2.3