This PR tracks the implementation of ZMQ store in issue #104 DNM (#126)

This PR tracks the implementation of ZMQ store in issue #104

Author: Toshbrown

.gitignore

@@ -128,6 +128,6 @@ scripts/admin/config\.json
 
 core-store/
 
-\.resolv\.conf
-
 core-network/
+
+\.resolv\.conf

README.md

@@ -29,13 +29,26 @@ cd databox
 ```
 The above script pulls Databox pre-build images published on [Docker hub](<https://hub.docker.com/r/databoxsystems>) and run  Databox in your local machine.
 
-Once it's started, point a web browser at <https://127.0.0.1:8989> to access Databox UI.
+Once it's started, point a web browser at <http://127.0.0.1:8448> and follow the instructions to configure your HTTPS certificates to access Databox UI securely (using a web browser <http://127.0.0.1:8989>, or the IOS and android app).
 
 To stop databox and clean up,
 ```
 ./databox-stop
 ```
 
+# Upgrading from 0.2.0 to 0.3.0
+
+It is recommended to remove the ./certs directory before upgrading. Use the following commands in the root databox directory:
+
+```
+
+   ./databox-stop
+   rm -rf ./certs
+   git pull
+   ./databox-start
+
+```
+
 # Development
 
 ## Get Started with the Graphical SDK
@@ -78,7 +91,7 @@ To develop on the platform and core components run the data-box start script wit
 ```
 
 Unlike using the pre-build images, this will clone all the relevant source repositories locally, and build them into the
-required Docker images. 
+required Docker images.
 
 When you start in development mode only the `core-components` are built from source. If you wish to develop one of the available apps or drivers then you can add them to you local install using:
 

databox-components

@@ -3,5 +3,5 @@ core-export-service https://github.com/me-box/core-export-service.git master
 store-json https://github.com/me-box/store-json.git master
 core-store https://github.com/me-box/core-store.git master
 platform-app-server https://github.com/me-box/platform-app-server.git master
-core-container-manager https://github.com/ktg/core-container-manager master
+core-container-manager https://github.com/me-box/core-container-manager master
 core-network https://github.com/me-box/core-network.git master

databox-start

@@ -131,8 +131,7 @@ if [ ! -d "node_modules" ]; then
   _exec npm install -loglevel silent
 fi
 
-err "Starting the Databox swarm"
-docker swarm init --advertise-addr ${EXT_IP} > /dev/null
+
 mkdir -p ./certs
 
 err "Creating Certificates"
@@ -147,6 +146,9 @@ then
   assert_or_die $? 0 "Problem building core images"
 fi
 
+err "Starting the Databox swarm"
+docker swarm init --advertise-addr ${EXT_IP} > /dev/null
+
 err "Starting Databox"
 
 docker network create -d overlay --attachable databox-system-net
@@ -160,11 +162,12 @@ assert_or_die $? 0 "Problem with docker stack deploy"
 
 if [ "$DEV" == "1" ]
 then
-  #source ./databox-install-component driver-sensingkit
   err "Sleeping..."
   sleep 10
-  source ./databox-install-component driver-os-monitor
-  source ./databox-install-component app-os-monitor
+  ./databox-install-component driver-sensingkit &
+  ./databox-install-component driver-os-monitor &
+  ./databox-install-component app-os-monitor &
+  wait
 fi
 
 err "Databox started! Visit http://localhost:8448"

databox-test

@@ -1,9 +1,5 @@
 #!/bin/bash
 
-#include helper functions
-source ./scripts/utils.sh
-
-
 function fail {
     echo -e "[$( red FAILED )] ${1} \nERROR: ${2}"
     #output debug information
@@ -25,6 +21,15 @@ function success {
     echo -e "[$( green OK )] $1"
 }
 
+function test_assert {
+  if [ "$1" != "$2" ]
+  then
+    fail "$3" "$1"
+  else
+    success "$3"
+  fi
+}
+
 #Start databox
 export DATABOX_TESTING=1
 source ./databox-start dev
@@ -47,13 +52,13 @@ RES=$(curl -sL  --insecure "https://127.0.0.1:8989/arbiter/cat")
 test_assert "$RES" "$EXPECTED" "Is the arbiter cat endpoint is ok?"
 
 #can we install the OS monitor driver
-PAYLOAD='{"manifest-version":1,"name":"driver-os-monitor","version":"0.1.0","description":"A Databox driver to monitor the local os","author":"Anthony Brown <[email protected]> ()","license":"MIT","databox-type":"driver","tags":["monitor","os"],"homepage":"https://github.com/me-box/driver-os-monitor","repository":{"type":"git","url":"git+https://github.com/me-box/driver-os-monitor.git"},"resource-requirements":{"store":"store-json"}}'
+PAYLOAD='{"manifest-version": 1,"name": "driver-os-monitor","version": "0.3.0","description": "A Databox driver to monitor the local os","author": "Anthony Brown <[email protected]> ()","license": "MIT","databox-type":"driver","tags": ["monitor","os"],"homepage": "https://github.com/me-box/driver-os-monitor","repository": {"type": "git","url": "git+https://github.com/me-box/driver-os-monitor.git"},"resource-requirements": {    "store":"core-store"}}'
 RES=$(curl -s  --insecure -H 'Content-Type: application/json' -X POST -d "${PAYLOAD}" -L 'https://127.0.0.1:8989/api/install')
 EXPECTED='{"status":200,"msg":"Success"}'
 test_assert "$RES" "$EXPECTED" "Can we install the driver-os-monitor?"
 
 #can we install the OS monitor app
-PAYLOAD='{"manifest-version":1,"name":"app-os-monitor","databox-type":"app","version":"0.1.0","description":"An app in golang to plot the output of the os monitor driver.","author":"Tosh Brown <[email protected]>","license":"MIT","tags":["template","app","nodejs"],"homepage":"https://github.com/me-box/app-os-monitor","repository":{"type":"git","url":"git+https://github.com/me-box/app-os-monitor"},"packages":[{"name":"OS monitor Plotter","purpose":"To visualize your databox load and free memory","install":"required","risks":"None.","benefits":"You can see the data!","datastores":["loadavg1","loadavg5","loadavg15","freemem"],"enabled":true}],"allowed-combinations":[],"datasources":[{"type":"loadavg1","required":true,"name":"loadavg1","clientid":"loadavg1","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average 1 minuet"},{"rel":"urn:X-hypercat:rels:isContentType","val":"text/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg1"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg1"},{"rel":"urn:X-databox:rels:hasStoreType","val":"store-json"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"https://driver-os-monitor-store-json:8080/loadavg1"}},{"type":"loadavg5","required":true,"name":"loadavg5","clientid":"loadavg5","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average 5 minuets"},{"rel":"urn:X-hypercat:rels:isContentType","val":"text/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg5"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg5"},{"rel":"urn:X-databox:rels:hasStoreType","val":"store-json"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"https://driver-os-monitor-store-json:8080/loadavg5"}},{"type":"loadavg15","required":true,"name":"loadavg15","clientid":"loadavg15","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average 15 minuets"},{"rel":"urn:X-hypercat:rels:isContentType","val":"text/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg15"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg15"},{"rel":"urn:X-databox:rels:hasStoreType","val":"store-json"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"https://driver-os-monitor-store-json:8080/loadavg15"}},{"type":"freemem","required":true,"name":"freemem","clientid":"freemem","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Free memory in bytes"},{"rel":"urn:X-hypercat:rels:isContentType","val":"text/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"freemem"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"freemem"},{"rel":"urn:X-databox:rels:hasStoreType","val":"store-json"},{"rel":"urn:X-databox:rels:hasUnit","val":"bytes"}],"href":"https://driver-os-monitor-store-json:8080/freemem"}}],"export-whitelist":[{"url":"https://export.amar.io/","description":"Exports the calculated sentiment to amar.io"}],"resource-requirements":{}}'
+PAYLOAD='{"manifest-version":1,"name":"app-os-monitor","databox-type":"app","version":"0.3.0","description":"An app in golang to plot the output of the os monitor driver.","author":"Tosh Brown <[email protected]>","license":"MIT","tags":["template","app","nodejs"],"homepage":"https://github.com/me-box/app-os-monitor","repository":{"type":"git","url":"git https://github.com/me-box/app-os-monitor"},"packages":[{"name":"OS monitor Plotter","purpose":"To visualize your databox load and free memory","install":"required","risks":"None.","benefits":"You can see the data!","datastores":["loadavg1","loadavg5","loadavg15","freemem"],"enabled":true}],"allowed-combinations":[],"datasources":[{"type":"loadavg1","required":true,"name":"loadavg1","clientid":"loadavg1","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average 1 minute"},{"rel":"urn:X-hypercat:rels:isContentType","val":"application/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg1"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg1"},{"rel":"urn:X-databox:rels:hasStoreType","val":"ts"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"tcp://driver-os-monitor-core-store:5555/ts/loadavg1"}},{"type":"loadavg5","required":true,"name":"loadavg5","clientid":"loadavg5","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average over 5 minutes"},{"rel":"urn:X-hypercat:rels:isContentType","val":"application/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg5"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg5"},{"rel":"urn:X-databox:rels:hasStoreType","val":"ts"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"tcp://driver-os-monitor-core-store:5555/ts/loadavg5"}},{"type":"loadavg15","required":true,"name":"loadavg15","clientid":"loadavg15","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox load average over 15 minutes"},{"rel":"urn:X-hypercat:rels:isContentType","val":"application/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"loadavg15"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"loadavg15"},{"rel":"urn:X-databox:rels:hasStoreType","val":"ts"},{"rel":"urn:X-databox:rels:hasUnit","val":"%"}],"href":"tcp://driver-os-monitor-core-store:5555/ts/loadavg15"}},{"type":"freemem","required":true,"name":"freemem","clientid":"freemem","granularities":[],"hypercat":{"item-metadata":[{"rel":"urn:X-hypercat:rels:hasDescription:en","val":"Databox free memory in bytes"},{"rel":"urn:X-hypercat:rels:isContentType","val":"application/json"},{"rel":"urn:X-databox:rels:hasVendor","val":"Databox Inc."},{"rel":"urn:X-databox:rels:hasType","val":"freemem"},{"rel":"urn:X-databox:rels:hasDatasourceid","val":"freemem"},{"rel":"urn:X-databox:rels:hasStoreType","val":"ts"},{"rel":"urn:X-databox:rels:hasUnit","val":"bytes"}],"href":"tcp://driver-os-monitor-core-store:5555/ts/freemem"}}],"export-whitelist":[{"url":"https://export.amar.io/","description":"Exports the data to amar.io"}],"resource-requirements":{},"displayName":"os monitor","storeUrl":"http://localhost:8181/app/get/?name=app-os-monitor"}'
 RES=$(curl -s  --insecure -H 'Content-Type: application/json' -X POST -d "${PAYLOAD}" -L 'https://127.0.0.1:8989/api/install')
 EXPECTED='{"status":200,"msg":"Success"}'
 test_assert "$RES" "$EXPECTED" "Can we install the app-os-monitor?"

docker-core-network.yaml

@@ -2,7 +2,7 @@ version: '3.2'
 
 services:
   databox-network:
-    image: ${DOCKER_REPO}core-network
+    image: ${DOCKER_REPO}core-network:${DATABOX_CORE_IMAGE_VERSION}
     networks:
       databox-system-net:
         aliases:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "container-manager",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Databox OS container manager and dashboard server",
   "scripts": {
     "test": "./node_modules/mocha/bin/mocha",