Skip to content

ipgallery / devops

Go to a project
Commit 2ab29b85 by Amir Aharon
Options

update configuration at cloud

parent 3b9136b1
Expand all
Inline Side-by-side
Showing with 75 additions and 18 deletions
config/commetoo-cloud/mcx-backend.yml
...@@ -13,14 +13,20 @@ services: ...@@ -13,14 +13,20 @@ services:
-Ddao.use.cache=false#\ -Ddao.use.cache=false#\
-Ddao.es.activity.url=activityidx/activity#\ -Ddao.es.activity.url=activityidx/activity#\
-Ddao.es.activity.bulk.hostport=elk:9300#\ -Ddao.es.activity.bulk.hostport=elk:9300#\
-Ddao.es.activity.hostport=elk:9200" -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.activity.use.mongodb=true#\
# -Dactivities.big.data.engine=mongodb#\ # -Dactivities.big.data.engine=mongodb#\
# -Dactivities.analytics.engine=hanalytics#\ # -Dactivities.analytics.engine=hanalytics#\
# -Dds.sap.hana.url=35.156.55.64:8000#\ # -Dds.sap.hana.url=35.156.55.64:8000#\
# -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconactivities=10000#\ # -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconactivities=10000#\
USE_DEBUG: "yes" USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/activities:26-c5521ab 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:23-808af6e
# image: municipalitybank.com:5050/mcx/activities # image: municipalitybank.com:5050/mcx/activities
ports: ports:
...@@ -74,7 +80,8 @@ services: ...@@ -74,7 +80,8 @@ services:
-Dpubsub.host=mqtt#\ -Dpubsub.host=mqtt#\
-Dpubsub.port=1883" -Dpubsub.port=1883"
USE_DEBUG: "yes" 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:18-2da1950
# image: municipalitybank.com:5050/mcx/transportation:17-ec4f801 # image: municipalitybank.com:5050/mcx/transportation:17-ec4f801
# image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08 # image: municipalitybank.com:5050/mcx/transportation:16-a1ecc08
...@@ -86,6 +93,8 @@ services: ...@@ -86,6 +93,8 @@ services:
ports: ports:
- "8300:8000" - "8300:8000"
- "50035:50035" - "50035:50035"
extra_hosts:
- "data.cityofchicago.org:172.16.1.244"
####### parking ################### ####### parking ###################
parking: parking:
environment: environment:
...@@ -134,7 +143,8 @@ services: ...@@ -134,7 +143,8 @@ services:
-DpublicSafety.mdeServer.address=mde:50040#\ -DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.mde2Server.address=mde2:50041" -DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes" 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:23-2f0a378
# image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1 # image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1
# image: municipalitybank.com:5050/mcx/public-safety:21-c14ead7 # image: municipalitybank.com:5050/mcx/public-safety:21-c14ead7
...@@ -163,9 +173,9 @@ services: ...@@ -163,9 +173,9 @@ services:
-Dpush.server.url=push-server:50000#\ -Dpush.server.url=push-server:50000#\
-Duse.schedular=true#\ -Duse.schedular=true#\
-Dcity.reports=san-diego,chicago#\ -Dcity.reports=san-diego,chicago#\
-Dconfig.public.address=safeyme.com#\ -Dconfig.public.address=ipgallery-mcz.com#\
-Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\ -Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\
-Dpubsub.url=wss://safeyme.com/mqtt#\ -Dpubsub.url=wss://ipgallery-mcz.com/mqtt#\
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080" -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
image: municipalitybank.com:5050/mcx/ui:13-a788e7f image: municipalitybank.com:5050/mcx/ui:13-a788e7f
ports: ports:
...@@ -303,7 +313,7 @@ services: ...@@ -303,7 +313,7 @@ services:
mde2: mde2:
environment: environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\ 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#\ ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler" -DconfigLocation=/opt/mcx/config/apiHandler"
...@@ -313,21 +323,25 @@ services: ...@@ -313,21 +323,25 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\ ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\ -DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060#\ -Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://ws-event-simulator:8053/events" -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dwebsocket_url=ws://172.16.1.80:8053/events"
DEBUG_httpAdapter: "yes" DEBUG_httpAdapter: "yes"
ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\ ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
-DconfigLocation=/opt/mcx/config/apiService/#\ -DconfigLocation=/opt/mcx/config/apiService/#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-Dredis.host=redis#\ -Dredis.host=redis#\
-DloginUserName=ipgallery#\ -DloginUserName=ipgallery#\
-DloginPassword=1PGall3ry#\ -DloginPassword=1PGall3ry#\
-Dsan-jose_loginUsername=operator22@cdp.com#\ -Dsan-jose_loginUsername=operator24@cdp.com#\
-Dsan-jose_loginPassword=I1dIWjVwSEBo[BASE64]#\ -Dsan-jose_loginPassword=IzhyTmdhc1R6[BASE64]#\
-Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\ -Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\
-Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1" -Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:18-7fd3ca4 DEBUG_apiService: "yes"
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:8-50c28c6
#image: municipalitybank.com:5050/mcx/mde2:7-2188c62 #image: municipalitybank.com:5050/mcx/mde2:7-2188c62
#image: municipalitybank.com:5050/mcx/mde2:6-1b865d2 #image: municipalitybank.com:5050/mcx/mde2:6-1b865d2
...@@ -349,11 +363,26 @@ services: ...@@ -349,11 +363,26 @@ services:
mqtt: "mqtt:1883" mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086" influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db" influxdb_dbname: "mcx_db"
callbackAddress: "https://safeyme.com/predictions" # callbackAddress: "https://ipgallery-mcz.com/predictions"
providerUrl: "http://localhost:5000/forecast" callbackAddress: "http://localhost:50065"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125 # providerUrl: "http://localhost:50068/forecast"
forecastUrl: "http://localhost:5002/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: 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
ports: ports:
- "50065:50065" - "50065:50065"
- "5000:5000"
- "50068:50068"
networks: networks:
- backend - backend
networks: networks:
......
config/commetoo-cloud/mcx-external.yml
...@@ -123,7 +123,7 @@ services: ...@@ -123,7 +123,7 @@ services:
INFLUXDB_NAME: "mcx_db" INFLUXDB_NAME: "mcx_db"
INFLUXDB_USER: "root" INFLUXDB_USER: "root"
INFLUXDB_PASS: "giptmgrr" INFLUXDB_PASS: "giptmgrr"
image: grafana/grafana image: grafana/grafana:4.6.0
ports: ports:
- "3000:3000" - "3000:3000"
- "8048:80" - "8048:80"
...@@ -134,6 +134,15 @@ services: ...@@ -134,6 +134,15 @@ services:
#user/pass = admin/admin #user/pass = admin/admin
networks: networks:
- backend - 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: networks:
backend: backend:
driver: bridge driver: bridge
config/commetoo-cloud/mcx-frontend.yml
...@@ -14,7 +14,8 @@ services: ...@@ -14,7 +14,8 @@ services:
UI_SERVER_HOSTPORT: "ui-api:8080" UI_SERVER_HOSTPORT: "ui-api:8080"
PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic" PUBLIC_SAFETY_IC_PORT_50004_TCP_ADDR: "public-safety-ic"
SRG_SERVER_HOSTPORT: "srg:7681" SRG_SERVER_HOSTPORT: "srg:7681"
image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:24-40a7492 image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:28-cc7ec12
# 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:23-9a34ec0
# image: municipalitybank.com:5050/mcx/ui-web/control-center-v2:21-0f94418 # 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:20-0347487
...@@ -53,8 +54,9 @@ services: ...@@ -53,8 +54,9 @@ services:
- backend - backend
### UI-WEB-DRIVER (NGINX + WEB) ### UI-WEB-DRIVER (NGINX + WEB)
ui-web-driver: 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: 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: environment:
OTP_SERVER: "ipgallery-mcz.com:8099" OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601" KIBANA_SERVER: "elk:5601"
......
config/commetoo-cloud/polling-simulator.yml 0 → 100644
version: '2'
services:
polling-simulator:
environment:
file: "/tmp/polling.json"
p: 80
image: municipalitybank.com:5050/mcx/devops/polling-simulator
command: node app.js -p 80
ports:
- "8054:80"
volumes:
- "/opt/mcx/config/polling-simulator/chicago-polling.json:/tmp/polling.json"
networks:
- backend
networks:
backend:
driver: bridge
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