Commit e6cb4fea by Amir Aharon

update files

parent 37da8470
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.big.data.engine=bighana#\
-Dactivities.search.engine=elasticsearch#\
-Dsap.jdbc.conn.url=jdbc:sap://172.16.1.160:39015/?databaseName=HXE#\
-Dsap.hana.user=DEVUSER#\
-Dsap.hana.password=Giptmgr1"
# -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/sap-hana:2-7d2b5df
#image: municipalitybank.com:5050/mcx/activities/sap-hana:1-edaa8f4
#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 +81,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 +96,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 +104,14 @@ 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:15-82a5b16
# image: municipalitybank.com:5050/mcx/parking:14-16d350e
# image: municipalitybank.com:5050/mcx/parking:13-c2643d1
......@@ -289,8 +330,8 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
# -Dwebsocket_url=ws://172.16.1.72:8053/events"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dwebsocket_url=ws://172.16.1.72:8053/events"
DEBUG_httpAdapter: "yes"
......@@ -334,12 +375,28 @@ services:
mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db"
callbackAddress: "https://ipgallery-mcz.com:8072/predictions"
providerUrl: "http://localhost:5000/forecast"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125
#callbackAddress: "https://ipgallery-mcz.com:8072/predictions"
callbackAddress: "http://localhost:50065"
#providerUrl: "http://localhost:5000/forecast"
providerUrl: "http://localhost:50068/forecast"
dbhostport: "172.16.1.160:39015"
databaseName: "HXE"
databaseUser: "DEVUSER"
databasePassword: "Giptmgr1"
forecast_neurons: 50
pypredict_num: 1
jspredict_num: 0
pyanomaly_num: 1
jssentiment_num: 1
image: municipalitybank.com:5050/mcx/predictions:17-9dea507
#image: municipalitybank.com:5050/mcx/predictions:15-8be7d0e
#image: municipalitybank.com:5050/mcx/predictions:10-e27f125
#image: municipalitybank.com:5050/mcx/predictions:13-ec95060
# image: municipalitybank.com:5050/mcx/predictions:14-c12d5c6
ports:
- "50065:50065"
- "5000:5000"
- "50068:50068"
networks:
- backend
networks:
......
......@@ -134,6 +134,15 @@ services:
#user/pass = admin/admin
networks:
- backend
ws-event-simulator:
environment:
file: "/tmp/events.json"
delay: 10
image: municipalitybank.com:5050/mcx/devops/ws-event-simulator
ports:
- "8053:8053"
volumes:
- "/opt/mcx/config/ws-event-simulator/events.json:/tmp/events.json"
networks:
backend:
driver: bridge
......@@ -14,19 +14,16 @@ 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:28-cc7ec12
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:25-016dd88
# 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:22-d2b859c
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:20-0347487
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:19-a9ad3b5
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:18-6af4e28
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:16-f910a61
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:15-c1f1193
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:14-1740888
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:12-f0a0cee
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:11-158b6c1
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:10-544ca4b
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:9-e1ac475
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:8-7bea113
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:5-a02469e
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:4-da44cda
#image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:3-64d3aa7
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:13-4f061a9
volumes:
- "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
networks:
......@@ -52,8 +49,9 @@ services:
- backend
### UI-WEB-DRIVER (NGINX + WEB)
ui-web-driver:
image: municipalitybank.com:5050/ipgallery.web/driver:2-8af1450
# image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01
image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
# image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
environment:
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
......@@ -90,7 +88,9 @@ services:
URL: "ipgallery-mcz.com"
TZ: "Israel"
MAKE_CERT: "false"
image: municipalitybank.com:5050/mcx/front-end:22-aea4c68
image: municipalitybank.com:5050/mcx/front-end:24-ebb7806
# image: municipalitybank.com:5050/mcx/front-end:23-aea4c68
#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
......
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.search.engine=elasticsearch#\
-Dsap.jdbc.conn.url=jdbc:sap://172.16.1.160:39015/?databaseName=HXE#\
-Dsap.hana.user=DEVUSER#\
-Dsap.hana.password=Giptmgr1"
# -Dactivities.big.data.engine=bighana#\
# -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/sap-hana:2-7d2b5df
# 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 +80,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 +95,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 +103,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
......@@ -99,7 +140,8 @@ services:
-DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety:35-bb9469d
image: municipalitybank.com:5050/mcx/public-safety:38-4b8fd57
# image: municipalitybank.com:5050/mcx/public-safety:35-bb9469d
# image: municipalitybank.com:5050/mcx/public-safety:23-2f0a378
# image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1
# image: municipalitybank.com:5050/mcx/public-safety:21-c14ead7
......@@ -268,7 +310,7 @@ services:
mde2:
environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler"
......@@ -278,21 +320,25 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://172.16.1.33:8053/events"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dwebsocket_url=ws://172.16.1.80:8053/events"
DEBUG_httpAdapter: "yes"
ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
-DconfigLocation=/opt/mcx/config/apiService/#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dredis.host=redis#\
-DloginUserName=ipgallery#\
-DloginPassword=1PGall3ry#\
-Dsan-jose_loginUsername=operator22@cdp.com#\
-Dsan-jose_loginPassword=I1dIWjVwSEBo[BASE64]#\
-Dsan-jose_loginUsername=operator24@cdp.com#\
-Dsan-jose_loginPassword=IzhyTmdhc1R6[BASE64]#\
-Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\
-Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:18-7fd3ca4
image: municipalitybank.com:5050/mcx/mde2:20-7571266
#image: municipalitybank.com:5050/mcx/mde2:18-7fd3ca4
#image: municipalitybank.com:5050/mcx/mde2:8-50c28c6
#image: municipalitybank.com:5050/mcx/mde2:7-2188c62
#image: municipalitybank.com:5050/mcx/mde2:6-1b865d2
......@@ -314,11 +360,25 @@ services:
mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db"
callbackAddress: "https://ipgallery-mcz.com/predictions"
providerUrl: "http://localhost:5000/forecast"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125
# callbackAddress: "https://ipgallery-mcz.com/predictions"
callbackAddress: "http://localhost:50065"
providerUrl: "http://localhost:50068/forecast"
forecast_neurons: 50
dbhostport: "172.16.1.160:39015"
databaseName: "HXE"
databaseUser: "DEVUSER"
databasePassword: "Giptmgr1"
pypredict_num: 1
jspredict_num: 0
pyanomaly_num: 1
jssentiment_num: 1
image: municipalitybank.com:5050/mcx/predictions:17-9dea507
# image: municipalitybank.com:5050/mcx/predictions:15-8be7d0e
#image: municipalitybank.com:5050/mcx/predictions:10-e27f125
ports:
- "50065:50065"
- "5000:5000"
- "50068:50068"
networks:
- backend
networks:
......
......@@ -123,7 +123,7 @@ services:
INFLUXDB_NAME: "mcx_db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "giptmgrr"
image: grafana/grafana
image: grafana/grafana:4.6.0
ports:
- "3000:3000"
- "8048:80"
......@@ -134,6 +134,15 @@ services:
#user/pass = admin/admin
networks:
- backend
ws-event-simulator:
environment:
file: "/tmp/events.json"
delay: 10
image: municipalitybank.com:5050/mcx/devops/ws-event-simulator
ports:
- "8053:8053"
volumes:
- "/opt/mcx/config/ws-event-simulator/events.json:/tmp/events.json"
networks:
backend:
driver: bridge
......@@ -14,16 +14,11 @@ 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-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
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:8-e5ef395
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:7-0a04ab2
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:6-97035d7
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:5-cd322bb
#image: municipalitybank.com:5050/mcx/ui-web/control-center-verticals:4-891383a
image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:28-cc7ec12
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:28-cc7ec12
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:27-1af2844
ports:
- 8090:80
volumes:
- "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
networks:
......@@ -49,8 +44,8 @@ services:
- backend
### UI-WEB-DRIVER (NGINX + WEB)
ui-web-driver:
# image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01
image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
image: municipalitybank.com:5050/ipgallery.web/driver:2-8af1450
# image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
environment:
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
......@@ -87,10 +82,9 @@ services:
URL: "ipgallery-mcz.com"
TZ: "Israel"
MAKE_CERT: "true"
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
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
ports:
- "443:443"
volumes:
......
# See https://help.github.com/ignore-files/ for more about ignoring files.
# dependencies
/node_modules
# testing
/coverage
# production
/build
# misc
.DS_Store
.env.local
.env.development.local
.env.test.local
.env.production.local
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment