Release 1.0.9

PredixDev · Oct 26, 2018 · e3cac7c · e3cac7c
1 parent eadc1dc
commit e3cac7c
Show file tree

Hide file tree

Showing 10 changed files with 79 additions and 53 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ FROM node:alpine
 LABEL maintainer="Predix Builder Relations"
 LABEL hub="https://hub.docker.com"
 LABEL org="https://hub.docker.com/u/predixadoption"
-LABEL version="1.0.7"
+LABEL version="1.0.9"
 LABEL support="https://forum.predix.io"
 LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md"
 

diff --git a/config/config-opcua.json b/config/config-opcua.json
@@ -3,29 +3,37 @@
       "opcua": {
         "type": "opcuasubflat",
         "config": {
-            "transport_addr": "opc-tcp://3.39.89.86:49310",
+            "transport_addr": "opc-tcp://opcua-simulator:4334/UA/PredixEdge",
             "log_level": "debug",
             "data_map": [
-                {
-                  "alias": "Compressor-2018.CompressionRatio",
-                  "id": "ns=2;s=Simulator.Device1.FLOAT1"
-                },
-                {
-                  "alias": "Compressor-2018.DischargePressure",
-                  "id": "ns=2;s=Simulator.Device1.FLOAT2"
-                },
-                {
-                  "alias": "Compressor-2018.SuctionPressure",
-                  "id": "ns=2;s=Simulator.Device1.FLOAT3"
-                },
-                {
-                  "alias": "Compressor-2018.Velocity",
-                  "id": "ns=2;s=Simulator.Device1.FLOAT4"
-                },
-                {
-                  "alias": "Compressor-2018.Temperature",
-                  "id": "ns=2;s=Simulator.Device1.FLOAT5"
-                }
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-compressionratio",
+                "id": "ns=1;s=Simulator.Device1.FLOAT1"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-dischargepressure",
+                "id": "ns=1;s=Simulator.Device1.FLOAT2"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-suctionpressure",
+                "id": "ns=1;s=Simulator.Device1.FLOAT3"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-maximumpressure",
+                "id": "ns=1;s=Simulator.Device1.FLOAT4"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-minimumpressure",
+                "id": "ns=1;s=Simulator.Device1.FLOAT5"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-temperature",
+                "id": "ns=1;s=Simulator.Device1.FLOAT6"
+              },
+              {
+                "alias": "Compressor-CMMS-Compressor-2018.crank-frame-velocity",
+                "id": "ns=1;s=Simulator.Device1.FLOAT7"
+              }
             ]
         }
       },

diff --git a/docker-compose-edge-broker.yml b/docker-compose-edge-broker.yml
@@ -5,7 +5,7 @@ version: '3'
 
 services:
   predix-edge-broker:
-    image: "dtr.predix.io/predix-edge/predix-edge-mosquitto-amd64:latest"
+    image: "dtr.predix.io/predix-edge/predix-edge-broker:amd64-1.0.2"
     hostname: 127.0.0.1
     networks:
       - net

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -1,8 +1,15 @@
 version: "3.0"
 #This file combines all the edge services and our services so that it can be deployed as a unit
 services:
+  opcua-simulator:
+    image: "predixadoption/predix-edge-opcua-simulator:latest"
+    hostname: "opcua-simulator"
+    networks:
+      - predix-edge-broker_net
+    ports:
+      - 4334:4334
   opcua:
-    image: "dtr.predix.io/predix-edge/protocol-adapter-opcua-amd64:latest"
+    image: "dtr.predix.io/predix-edge/protocol-adapter-opcua:amd64-1.1.0"
     environment:
       config: "/config/config-opcua.json"
     volumes:
@@ -11,7 +18,7 @@ services:
     networks:
       - predix-edge-broker_net
   cloud_gateway_timeseries:
-    image: "dtr.predix.io/predix-edge/cloud-gateway-timeseries-amd64:latest"
+    image: "dtr.predix.io/predix-edge/cloud-gateway-timeseries-amd64:1.0.8"
     environment:
       config: "/config/config-cloud-gateway.json"
       http_proxy: ""
@@ -24,7 +31,7 @@ services:
       - ./data:/edge-agent
     networks:
       - predix-edge-broker_net
-  edge-node-red:
+  predix-edge-node-red:
     image: "predixadoption/predix-edge-node-red:latest"
     volumes:
       - ./config:/config
@@ -33,7 +40,7 @@ services:
       - predix-edge-broker_net
     ports:
       - 1880:1880
-  edge-ref-app:
+  predix-edge-ref-app:
     image: "predixadoption/predix-edge-ref-app:latest"
     networks:
       - predix-edge-broker_net

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,14 +1,20 @@
 version: "3.0"
 #This file combines all the edge services and our services so that it can be deployed as a unit
 services:
+  opcua-simulator:
+    image: "predixadoption/predix-edge-opcua-simulator:latest"
+    networks:
+      - predix-edge-broker_net
+    ports:
+      - 4334:4334
   opcua:
-    image: "dtr.predix.io/predix-edge/protocol-adapter-opcua-amd64:latest"
+    image: "dtr.predix.io/predix-edge/protocol-adapter-opcua-amd64:1.1.0"
     environment:
       config: "/config/config-opcua.json"
     networks:
       - predix-edge-broker_net
   cloud_gateway_timeseries:
-    image: "dtr.predix.io/predix-edge/cloud-gateway-timeseries-amd64:latest"
+    image: "dtr.predix.io/predix-edge/cloud-gateway-timeseries-amd64:1.0.8"
     environment:
       config: "/config/config-cloud-gateway.json"
       http_proxy: ""
@@ -17,13 +23,13 @@ services:
       HTTPS_PROXY: "$http_proxy"
     networks:
       - predix-edge-broker_net
-  edge-node-red:
+  predix-edge-node-red:
     image: "predixadoption/predix-edge-node-red:latest"
     networks:
       - predix-edge-broker_net
     ports:
       - 1880:1880
-  edge-ref-app:
+  predix-edge-ref-app:
     image: "predixadoption/predix-edge-ref-app:latest"
     networks:
       - predix-edge-broker_net

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-ref-app",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "Predix Edge Reference app with node-red",
   "main": "server/app.js",
   "directories": {

diff --git a/scripts/quickstart-edge-ref-app-edgeos.sh b/scripts/quickstart-edge-ref-app-edgeos.sh
@@ -6,6 +6,8 @@ trap "trap_ctrlc" 2
 
 ROOT_DIR=$(pwd)
 SKIP_BROWSER="0"
+SKIP_PREDIX_SERVICES=false
+LOGIN=1
 function local_read_args() {
   while (( "$#" )); do
   opt="$1"
@@ -29,6 +31,7 @@ function local_read_args() {
     ;;
     -skip-predix-services|--skip-predix-services)
       SKIP_PREDIX_SERVICES="true"
+      LOGIN=0
     ;;
     *)
       QUICKSTART_ARGS+=" $1"
@@ -133,19 +136,14 @@ fi
 
 getPredixScripts
 #clone the repo itself if running from oneclick script
-pwd
-ls -lrt
-#if [[ ! -d "$PREDIX_SCRIPTS/$REPO_NAME" ]]; then
-#  echo "repo not present"
 getCurrentRepo
-#fi
-echo "pwd after copy -> $(pwd)"
-ls -lrt
 
 echo "quickstart_args=$QUICKSTART_ARGS"
 source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS 
 
+echo "sleep 20 seconds"
 sleep 20
+echo "Open in Browser at http://$IP_ADDRESS:5000"
 # Automagically open the application in browser, based on OS
 if [[ $SKIP_BROWSER == 0 ]]; then
   app_url="http://$IP_ADDRESS:5000"

diff --git a/scripts/quickstart-edge-ref-app-local.sh b/scripts/quickstart-edge-ref-app-local.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 HOME_DIR=$(pwd)
 
-#set -x
+set -e
 
 RUN_QUICKSTART=1
 SKIP_PREDIX_SERVICES=false
@@ -54,7 +54,7 @@ BRANCH="master"
 PRINT_USAGE=0
 SKIP_SETUP=false
 
-IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.1.0/izon2.sh"
+IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/master/izon2.sh"
 #ASSET_MODEL="-amrmd predix-ui-seed/server/sample-data/predix-asset/asset-model-metadata.json predix-ui-seed/server/sample-data/predix-asset/asset-model.json"
 #SCRIPT="-script build-basic-app.sh -script-readargs build-basic-app-readargs.sh"
 SCRIPT="-script edge-starter-deploy.sh -script-readargs edge-starter-deploy-readargs.sh"
@@ -65,8 +65,10 @@ SCRIPT_NAME="quickstart-edge-ref-app-local.sh"
 GITHUB_RAW="https://raw.githubusercontent.com/PredixDev"
 APP_DIR="edge-ref-app-local"
 APP_NAME="Predix Front End Basic App - Node.js Express with UAA, Asset, Time Series"
-TOOLS="Cloud Foundry CLI, Git, Node.js, Predix CLI"
-TOOLS_SWITCHES="--cf --git --nodejs --predixcli"
+
+TOOLS="Cloud Foundry CLI, Docker, Git, jq, yq, Node.js, Predix CLI"
+TOOLS_SWITCHES="--cf --docker --git --jq --yq --nodejs --predixcli"
+
 TIMESERIES_CHART_ONLY="true"
 
 # Process switches
@@ -77,7 +79,7 @@ SCRIPT_LOC="$GITHUB_RAW/$REPO_NAME/$BRANCH/scripts/$SCRIPT_NAME"
 VERSION_JSON_URL="$GITHUB_RAW/$REPO_NAME/$BRANCH/version.json"
 
 if [[ "$SKIP_PREDIX_SERVICES" == "false" ]]; then
-  QUICKSTART_ARGS="$QUICKSTART_ARGS -uaa -ts -pst -app-name $REPO_NAME --run-edge-app -p $SCRIPT"
+  QUICKSTART_ARGS="$QUICKSTART_ARGS -uaa -ts -psts -app-name $REPO_NAME --run-edge-app -p $SCRIPT"
 else
   QUICKSTART_ARGS="$QUICKSTART_ARGS -app-name $REPO_NAME --run-edge-app -p $SCRIPT"
 fi
@@ -146,13 +148,12 @@ if [[ "$BUILD_APP" == "true" ]]; then
   cd ../..
 fi
 echo "quickstart_args=$QUICKSTART_ARGS"
-source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS 
-
-docker images
+source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS
 
 docker stack ls
 docker stack services $REPO_NAME
 docker ps
+
 # Automagically open the application in browser, based on OS
 echo "SKIP_BROWSER : $SKIP_BROWSER"
 if [[ $SKIP_BROWSER == 0 ]]; then
@@ -176,6 +177,9 @@ if [[ $SKIP_BROWSER == 0 ]]; then
   esac
 fi
 cat $SUMMARY_TEXTFILE
+if [[ $SKIP_PREDIX_SERVICES == false ]]; then
+  __append_new_line_log "To see the data in the cloud, using a browser, open the Front-end App URL shown above" "$quickstartLogDir"
+fi
 __append_new_line_log "" "$logDir"
 __append_new_line_log "Successfully completed Edge Ref App installation!" "$quickstartLogDir"
 __append_new_line_log "" "$logDir"
diff --git a/version.json b/version.json
@@ -1,12 +1,15 @@
 {
   "name": "Edge Ref App",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "private": true,
   "dependencies": {
-    "local-setup": "https://github.com/PredixDev/local-setup#1.0.101",
-    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.177",
-    "predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.53",
-    "predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.7"
+    "local-setup": "https://github.com/PredixDev/local-setup#1.0.102",
+    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.188",
+    "predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.54",
+    "predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.9",
+    "predix-edge-broker": "https://artifactory.predix.io/artifactory/PREDIX-EXT/predix-edge/2_1_0/os/predix-edge-broker-amd64-20180917-1.0.2.tar.gz#",
+    "opcua": "https://artifactory.predix.io/artifactory/PREDIX-EXT/predix-edge/2_1_0/apps/adapters/predix-edge-opc-ua-adapter-amd64-20181002-1.1.0.tar.gz#",
+    "cloud_gateway_timeseries": "https://artifactory.predix.io/artifactory/PREDIX-EDGE/2.0.1/predix-edge-cloud-gateway-timeseries-1.0.8.signed.tar.gz#"
   },
   "author": "gedesigntech"
 }