update config files

945a15fc · Amir Aharon · 6fc70183 · 945a15fc · 945a15fc · 945a15fc
Commit 945a15fc authored Aug 13, 2018 by Amir Aharon
Showing with 55 additions and 15 deletions
config/commetoo-cloud/mcx-backend.yml
config/commetoo-cloud/mcx-external.yml
config/commetoo-cloud/mcx-frontend.yml
config/ipgallery-mcz/mcx-backend.yml
--- a/config/commetoo-cloud/mcx-backend.yml
+++ b/config/commetoo-cloud/mcx-backend.yml
 version: '2'
 services:
+  # ACTIVITIES
+  activities:
+    environment:
+      IPG_ENV_PARAMS: "-Dmongodb.port=27027#\
+      -Dds.mongodb.host=mongodb#\
+      -Dredis.port=6379#\
+      -Dredis.host=redis#\
+      -DconfigFile.location=/opt/mcx/config#\
+      -Dmcz.files.location=/opt/mcx#\
+      -Dactivities.orientdb.url=remote:orientdb#\
+      -Ddao.use.cache=false#\
+      -Ddao.es.activity.url=activityidx/activity#\
+      -Ddao.es.activity.bulk.hostport=elk:9300#\
+      -Ddao.es.activity.hostport=elk:9200"
+  #   -Dactivities.activity.use.mongodb=true#\
+  #    -Dactivities.big.data.engine=mongodb#\
+  #    -Dactivities.analytics.engine=hanalytics#\
+  #    -Dds.sap.hana.url=35.156.55.64:8000#\
+  #    -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconactivities=10000#\
+      USE_DEBUG: "yes"
+    image: municipalitybank.com:5050/mcx/activities:26-c5521ab
+    #image: municipalitybank.com:5050/mcx/activities:23-808af6e
+    # image: municipalitybank.com:5050/mcx/activities
+    ports:
+      - "50070:50070"
+      - "50074:50072"
+      - "8180:8000"
+    networks:
+      - backend
  ### DS ###
  ds:
    environment:
@@ -45,7 +74,8 @@ services:
      -Dpubsub.host=mqtt#\
      -Dpubsub.port=1883"      
      USE_DEBUG: "yes"
-    image: municipalitybank.com:5050/mcx/transportation:18-2da1950
+    image: municipalitybank.com:5050/mcx/transportation:19-ecce348
+#    image: municipalitybank.com:5050/mcx/transportation:18-2da1950
 #    image: municipalitybank.com:5050/mcx/transportation:17-ec4f801
 #    image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08
 #    image: municipalitybank.com:5050/mcx/transportation:15-0efa750
@@ -59,7 +89,7 @@ services:
  ####### parking ###################
  parking:
    environment:
-      IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim,busan,san-jose#\
+      IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim,busan,san-jose,san-diego#\
      -DconfigFile.location=/opt/mcx/config/config.properties#\
      -DconfigLocation=/opt/mcx/config/#\
      -Dredis.host=redis#\
@@ -67,10 +97,15 @@ services:
      -Dds.IpAddress=ds:50050#\
      -Dds.ip=ds:50050#\
      -Dmde.IpAddress=mde2:50041#\
-      -Ddemo.changeRandomality=9#\
+      -Ddemo.changeRandomality=30#\
      -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
      USE_DEBUG: "yes"
-    image: municipalitybank.com:5050/mcx/parking:16-c3069b2
+    
+    image: municipalitybank.com:5050/mcx/parking:25-be99808
+#    image: municipalitybank.com:5050/mcx/parking:24-9c1969a
+#    image: municipalitybank.com:5050/mcx/parking:23-8f59918
+#    image: municipalitybank.com:5050/mcx/parking:22-14de052
+#    image: municipalitybank.com:5050/mcx/parking:16-c3069b2
 #    image: municipalitybank.com:5050/mcx/parking:9-6cec946
 #    image: municipalitybank.com:5050/mcx/parking:7-a8c7fc9
 #    image: municipalitybank.com:5050/mcx/parking:6-e184f20

--- a/config/commetoo-cloud/mcx-external.yml
+++ b/config/commetoo-cloud/mcx-external.yml
@@ -63,7 +63,6 @@ services:
    networks:
      - backend
  elk:
-#    image: sebp/elk:612
    image: sebp/elk
    ports:
      - "5601:5601"
@@ -72,6 +71,7 @@ services:
      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
    volumes:
      - "/ext/elasticsearch:/var/lib/elasticsearch"
+      - "/opt/mcx/config/kibana/kibana.yml:/opt/kibana/config/kibana.yml"
    networks:
      - backend
  fluentd-es:

--- a/config/commetoo-cloud/mcx-frontend.yml
+++ b/config/commetoo-cloud/mcx-frontend.yml
@@ -14,8 +14,12 @@ services:
      UI_SERVER_HOSTPORT: "ui-api:8080"
      PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
      SRG_SERVER_HOSTPORT: "srg:7681"
-    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
-    #image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
+    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:24-40a7492
+#    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:23-9a34ec0
+#    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:21-0f94418
+#    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:20-0347487
+#    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
+#    image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
    #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:13-4f061a9
    #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:11-685384e
    #image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:9-5b70c6a
@@ -87,17 +91,14 @@ services:
      URL: "safeyme.com"
      TZ: "Israel"
      MAKE_CERT: "true"
-      VALIDATION: "http"
-#      DNSPLUGIN: "digitalocean"
-#    image: linuxserver/letsencrypt
-    image: municipalitybank.com:5050/mcx/front-end:23-aea4c68
+    image: municipalitybank.com:5050/mcx/front-end:25-4c6b60a
+#    image: municipalitybank.com:5050/mcx/front-end:24-ebb7806
 #    image: municipalitybank.com:5050/mcx/front-end:22-aea4c68
 #    image: municipalitybank.com:5050/mcx/front-end:21-9c64e69
 #    image: municipalitybank.com:5050/mcx/front-end:20-c0d5a5d
 #    image: municipalitybank.com:5050/mcx/front-end:19-d2f0bbb
    ports:
      - "443:443"  
-      - "80:80"
    volumes:
      - "/opt/mcz/config-letsencrypt/:/config:rw"
      - "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"

--- a/config/ipgallery-mcz/mcx-backend.yml
+++ b/config/ipgallery-mcz/mcx-backend.yml
@@ -80,7 +80,8 @@ services:
      -Dpubsub.host=mqtt#\
      -Dpubsub.port=1883"      
      USE_DEBUG: "yes"
-    image: municipalitybank.com:5050/mcx/transportation:19-ecce348
+    image: municipalitybank.com:5050/mcx/transportation:20-1a4580b
+#    image: municipalitybank.com:5050/mcx/transportation:19-ecce348
 #    image: municipalitybank.com:5050/mcx/transportation:18-2da1950
 #    image: municipalitybank.com:5050/mcx/transportation:17-ec4f801
 #    image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08
@@ -92,6 +93,8 @@ services:
    ports:
      - "8300:8000"
      - "50035:50035"
+    extra_hosts:
+      - "data.cityofchicago.org:172.16.1.244"
  ####### parking ###################
  parking:
    environment:
@@ -362,7 +365,8 @@ services:
      influxdb_dbname: "mcx_db"
 #      callbackAddress: "https://ipgallery-mcz.com/predictions"
      callbackAddress: "http://localhost:50065"
-      providerUrl: "http://localhost:50068/forecast"
+#      providerUrl: "http://localhost:50068/forecast"
+      forecastUrl: "http://localhost:5002/forecast"
      forecast_neurons: 50
      dbhostport: "172.16.1.160:39015"
      databaseName: "HXE"
@@ -371,7 +375,7 @@ services:
      pypredict_num: 1
      jspredict_num: 0
      pyanomaly_num: 1
-      jssentiment_num: 1
+      jssentiment_num: 0
    image: municipalitybank.com:5050/mcx/predictions:17-9dea507
 #    image: municipalitybank.com:5050/mcx/predictions:15-8be7d0e
    #image: municipalitybank.com:5050/mcx/predictions:10-e27f125