Skip to content

ipgallery / devops

Go to a project
Commit 925937b1 by Amir Aharon
Options

update config and accounts

parent 463af0a1
Inline Side-by-side
Showing with 987 additions and 76 deletions
common/docs/Accounts.odt
No preview for this file type
common/docs/Java A Beginner's Guide Sixth Edition[A4].pdf deleted 100644 → 0
The file could not be displayed because it is too large.
common/docs/UsefulCommands.txt
......@@ -36,4 +36,7 @@ pass: g@ll3r&15
- rancher app key in digitalocean:
2eea41fb3801935540ba6ec42a1105360c1c1a4daa8306d7eee53dacdfd300bc
[bash]
replacing files names/extensions:
for f in *; do mv "$f" "`echo $f | sed s/Vehicle/Vehicle.jpg/`"; done
config/commetoo-cloud/grafana-dashboard.json 0 → 100644
{
"__inputs": [
{
"name": "DS_INFLUX-LOCAL",
"label": "influx-local",
"description": "",
"type": "datasource",
"pluginId": "influxdb",
"pluginName": "InfluxDB"
}
],
"__requires": [
{
"type": "grafana",
"id": "grafana",
"name": "Grafana",
"version": "4.6.1"
},
{
"type": "panel",
"id": "graph",
"name": "Graph",
"version": ""
},
{
"type": "datasource",
"id": "influxdb",
"name": "InfluxDB",
"version": "1.0.0"
}
],
"annotations": {
"list": [
{
"builtIn": 1,
"datasource": "-- Grafana --",
"enable": true,
"hide": true,
"iconColor": "rgba(0, 211, 255, 1)",
"name": "Annotations & Alerts",
"type": "dashboard"
}
]
},
"editable": true,
"gnetId": null,
"graphTooltip": 0,
"hideControls": false,
"id": null,
"links": [],
"refresh": "1m",
"rows": [
{
"collapse": false,
"height": 224,
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_INFLUX-LOCAL}",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"id": 2,
"legend": {
"avg": false,
"current": false,
"max": false,
"min": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 1,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 2,
"points": true,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"span": 3,
"stack": false,
"steppedLine": false,
"targets": [
{
"dsType": "influxdb",
"groupBy": [
{
"params": [
"auto"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(\"value\") FROM \"mcx_db\".\"autogen\".\"speed\" WHERE \"id\" = '$lanes' and $timeFilter GROUP BY time($interval) FILL(null)",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
},
{
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT HOLT_WINTERS(FIRST(\"value\"),20,5) FROM \"mcx_db\".\"autogen\".\"speed\" WHERE \"id\" = '$lanes' and $timeFilter GROUP BY time($interval)",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Speed and Predicted",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"transparent": false,
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_INFLUX-LOCAL}",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"id": 5,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 2,
"points": true,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"span": 3,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "speed(mph)",
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(value) FROM speed where \"id\" = '$lanes' and $timeFilter GROUP BY time($interval) ",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
},
{
"alias": "vehicleCount",
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(value) FROM vehicleCount where \"id\" = '$lanes' and $timeFilter GROUP BY time($interval) ",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Vehicels Speed & Count",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
},
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_INFLUX-LOCAL}",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"id": 8,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 2,
"points": true,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"span": 3,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "speed(mph)",
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(value) FROM speed where \"id\" = '$lanes' and $timeFilter GROUP BY time($interval) ",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "Vehicels Speed",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": false,
"title": "Row",
"titleSize": "h6"
},
{
"collapse": false,
"height": 286,
"panels": [
{
"aliasColors": {},
"bars": false,
"dashLength": 10,
"dashes": false,
"datasource": "${DS_INFLUX-LOCAL}",
"editable": true,
"error": false,
"fill": 1,
"grid": {},
"id": 7,
"legend": {
"alignAsTable": false,
"avg": false,
"current": false,
"max": false,
"min": false,
"rightSide": false,
"show": true,
"total": false,
"values": false
},
"lines": true,
"linewidth": 2,
"links": [],
"nullPointMode": "connected",
"percentage": false,
"pointradius": 2,
"points": true,
"renderer": "flot",
"seriesOverrides": [],
"spaceLength": 10,
"span": 6,
"stack": false,
"steppedLine": false,
"targets": [
{
"alias": "num of pedestrians",
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(value) FROM pedestrianCount where \"id\" = '$crosswalks' and $timeFilter GROUP BY time($interval) ",
"rawQuery": true,
"refId": "B",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
},
{
"alias": "speed(meters/hour)",
"dsType": "influxdb",
"groupBy": [
{
"params": [
"$interval"
],
"type": "time"
},
{
"params": [
"null"
],
"type": "fill"
}
],
"hide": false,
"orderByTime": "ASC",
"policy": "default",
"query": "SELECT first(value) FROM speed where \"id\" = '$crosswalks' and $timeFilter GROUP BY time($interval) ",
"rawQuery": true,
"refId": "A",
"resultFormat": "time_series",
"select": [
[
{
"params": [
"value"
],
"type": "field"
},
{
"params": [],
"type": "mean"
}
]
],
"tags": []
}
],
"thresholds": [],
"timeFrom": null,
"timeShift": null,
"title": "CrossWalk Speed & Count",
"tooltip": {
"msResolution": true,
"shared": true,
"sort": 0,
"value_type": "cumulative"
},
"type": "graph",
"xaxis": {
"buckets": null,
"mode": "time",
"name": null,
"show": true,
"values": []
},
"yaxes": [
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
},
{
"format": "short",
"label": null,
"logBase": 1,
"max": null,
"min": null,
"show": true
}
]
}
],
"repeat": null,
"repeatIteration": null,
"repeatRowId": null,
"showTitle": false,
"title": "Dashboard Row",
"titleSize": "h6"
}
],
"schemaVersion": 14,
"style": "dark",
"tags": [],
"templating": {
"list": [
{
"allValue": null,
"current": {},
"datasource": "${DS_INFLUX-LOCAL}",
"hide": 0,
"includeAll": false,
"label": "traffic-lane",
"multi": false,
"name": "lanes",
"options": [],
"query": "SHOW TAG VALUES WITH KEY = \"id\"",
"refresh": 1,
"regex": "/thing/traffic-lane*/",
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
},
{
"allValue": null,
"current": {},
"datasource": "${DS_INFLUX-LOCAL}",
"hide": 0,
"includeAll": false,
"label": "crosswalks",
"multi": false,
"name": "crosswalks",
"options": [],
"query": "SHOW TAG VALUES WITH KEY = \"id\"",
"refresh": 1,
"regex": "/thing/crossWalk*/",
"sort": 0,
"tagValuesQuery": "",
"tags": [],
"tagsQuery": "",
"type": "query",
"useTags": false
}
]
},
"time": {
"from": "now-6h",
"to": "now"
},
"timepicker": {
"refresh_intervals": [
"5s",
"10s",
"30s",
"1m",
"5m",
"15m",
"30m",
"1h",
"2h",
"1d"
],
"time_options": [
"5m",
"15m",
"1h",
"6h",
"12h",
"24h",
"2d",
"7d",
"30d"
]
},
"timezone": "browser",
"title": "test",
"version": 10
}
\ No newline at end of file
config/commetoo-cloud/lets-encrypt.yml 0 → 100644
version: '2'
services:
front-end:
environment:
PGID: "911"
PUID: "911"
ONLY_SUBDOMAINS: "false"
URL: "commetoo.com"
TZ: "America/New_York"
MAKE_CERT: "true"
image: linuxserver/letsencrypt
ports:
- "443:443"
volumes:
- "/opt/mcz/config-letsencrypt/:/config:rw"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
\ No newline at end of file
config/commetoo-cloud/mcx-backend.yml
......@@ -16,7 +16,9 @@ services:
# -Dds.sap.hana.url=35.156.55.64:8000#\
# -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/ds:21-837052
image: municipalitybank.com:5050/mcx/ds:39-7a42bd7
#image: municipalitybank.com:5050/mcx/ds:37-43b2b94
# image: 172.16.1.212:5050/mcx/ds:21-837052
ports:
- "8012:50050"
- "7443:8443"
......@@ -26,7 +28,7 @@ services:
###### transportation ###################
transportation:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim,san-jose#\
-Ddemo.changeRandomality=6#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
......@@ -37,23 +39,27 @@ services:
-Dtransportation.server.address=transportation:50035#\
-Dtransportation.mdeServer.address=mde:50040#\
-Dtransportation.mde2Server.address=mde2:50041#\
-Dtransportation.subscription.interval=60#\
-Dinfluxdb.hostport=influxdb:8086#\
-Duser.timezone=Asia/Jerusalem#\
-Dpubsub.host=mqtt#\
-Dpubsub.port=1883"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/transportation:10-e8cc26a
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
# image: municipalitybank.com:5050/mcx/transportation:12-b1b7268
# image: municipalitybank.com:5050/mcx/transportation:9-c254299
# image: municipalitybank.com:5050/mcx/transportation:4-e7b2bf7
# image: 172.16.1.212:5050/mcx/transportation:29-9207d8
networks:
- backend
# image: 172.16.1.212:5050/mcx/transportation:27-2bb5a9
ports:
- "8300:8000"
- "50035:50035"
####### parking ###################
parking:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim,busan,san-jose#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
-Dredis.host=redis#\
......@@ -64,17 +70,20 @@ services:
-Ddemo.changeRandomality=9#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/parking:6-e184f20
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
# image: 172.16.1.212:5050/mcx/parking:20-d72ebf
# ports:
ports:
# - "8015:8000"
# - "50055:50055"
- "50055:50055"
networks:
- backend
## PUBLIC SFAETY
public-safety:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim,pedestrian@san-diego#\
IPG_ENV_PARAMS: "-DdemoMode=pedestrian@san-diego,minneapolis,modiin,chicago,givatayim,san-jose#\
-DpublicSafety.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
......@@ -86,9 +95,15 @@ services:
-Dds.ip=ds:50050#\
-DpublicSafety.env.checkEventsInitialDelay=60#\
-DpublicSafety.env.checkEventsEveryPeriod=300#\
-DpublicSafety.mdeServer.address=mde:50040"
-Dinfluxdb.hostport=influxdb:8086#\
-DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety:18-de0e4df
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
# image: municipalitybank.com:5050/mcx/public-safety:19-3b62940
# image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb
ports:
- "8100:8000"
......@@ -105,7 +120,7 @@ services:
-Dds.ip=ds:50050#\
-Dsrg.sip.hostport=srg:5076#\
-Dmcweb.sip.ip=ui-api:5060#\
-Dmcweb.ip=commetoo.com:8011#\
-Dmcweb.ip=172.16.1.72:8011#\
-Dredis.host=redis#\
-Dredis.port=6379#\
-DconfigFile.location=/opt/mcx/config#\
......@@ -113,9 +128,9 @@ services:
-Dpush.server.url=push-server:50000#\
-Duse.schedular=true#\
-Dcity.reports=san-diego,chicago#\
-Dconfig.public.address=commetoo.com#\
-Dconfig.public.address=safeyme.com#\
-Drcs.send.message.url=http://srg/srg/chat/v1/standalone/sendmessage#\
-Dpubsub.url=wss://commetoo.com/mqtt#\
-Dpubsub.url=wss://safeyme.com/mqtt#\
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=9080"
image: municipalitybank.com:5050/mcx/ui:13-a788e7f
ports:
......@@ -133,7 +148,8 @@ services:
environment:
IPG_ENV_PARAMS: "-Dds.IpAddress=ds:50050#\
-Dredis.host=redis"
image: 172.16.1.212:5050/mcx/data-logic:4-b354b7
image: municipalitybank.com:5050/mcx/data-logic:7-e7171be
# image: 172.16.1.212:5050/mcx/data-logic:4-b354b7
ports:
- "8110:8000"
- "50045:50045"
......@@ -144,7 +160,8 @@ services:
environment:
IPG_ENV_PARAMS: "-Dredis.host=redis"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/push-server:7-5847b1
image: municipalitybank.com:5050/mcx/push-server:8-8d10c0
# image: 172.16.1.212:5050/mcx/push-server:7-5847b1
ports:
- "8120:8000"
- "50000:50000"
......@@ -156,13 +173,14 @@ services:
IPG_ENV_PARAMS: "-Dds.ip=ds:50050#\
-Dredis.host=redis#\
-Dsrg.sip.hostport=srg:5076#\
-Dexternal.host.port=commetoo.com:5076#\
-Dexternal.host.port=172.16.1.72:5076#\
-Drcs.send.message.url=http://srg:8060/srg/chat/v1/standalone/sendmessage#\
-Dpush.server.bulk=20#\
-Dpush.server.url=push-server:50000#\
-Dserver.worker.threads=1"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/comm-logic:16-16e2b7
image: municipalitybank.com:5050/mcx/comm-logic:16-9ac3c59
# image: 172.16.1.212:5050/mcx/comm-logic:16-16e2b7
ports:
- "8130:8000"
- "50030:50030"
......@@ -203,8 +221,10 @@ services:
-DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
image: municipalitybank.com:5050/mcx/public-safety/ic:29-9857b49
# image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
# image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
ports:
- "50004:50004"
networks:
......@@ -213,6 +233,7 @@ services:
comm-service:
image: municipalitybank.com:5050/mcx/comm-service:1-4-sync-cb
# image: municipalitybank.com:5050/mcx/comm-service:latest
restart: on-failure
environment:
PARGS: "-m server -p 50000 -s id#rest#http"
log4cpp.console: "yes"
......@@ -231,8 +252,9 @@ services:
-Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
-Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
USE_DEBUG: "yes"
image: 172.16.1.212:5050/mcx/mde:19-3ebc7c
# image: 172.16.1.212:5050/mcx/mde:15-f25d9f
image: municipalitybank.com:5050/mcx/mde:12-fd8faf7
# image: 172.16.1.212:5050/mcx/mde:19-3ebc7c
# image: 172.16.1.212:5050/mcx/mde:15-f25d9f
ports:
- "8200:8000"
- "50040:50040"
......@@ -246,7 +268,7 @@ services:
mde2:
environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler"
......@@ -255,21 +277,27 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060"
-Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://ws-event-simulator:8053/events"
DEBUG_httpAdapter: "yes"
ENV_PARAMS_apiService: "-DconfigFile.location=/opt/mcx/config/apiService/config.properties#\
-DconfigLocation=/opt/mcx/config/apiService/#\
-Dredis.host=redis#\
-Dmde.cisco.username=devoperator11@cdp.com#\
-Dmde.cisco.password=ejlFK0g9OSRK#\
-Dmde.cisco.clientId=a27b18484c3c4e08a7c193e42c639347#\
-Dmde.cisco.clientSecret=b863de8f453c4a05A88126F45B958CF1"
-DloginUserName=ipgallery#\
-DloginPassword=1PGall3ry#\
-Dsan-jose_loginUsername=operator22@cdp.com#\
-Dsan-jose_loginPassword=I1dIWjVwSEBo[BASE64]#\
-Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\
-Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:4-36b09f9
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
#image: municipalitybank.com:5050/mcx/mde2:5-ea91ef5
#image: municipalitybank.com:5050/mcx/mde2:4-36b09f9
#image: municipalitybank.com:5050/mcx/mde2:2-e9c7d03
ports:
- "8040:8140" # apiHandler debug port
......@@ -281,6 +309,18 @@ services:
- "50043:50043" # mde2(admin) listening port
networks:
- backend
predictions:
environment:
mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db"
callbackAddress: "https://safeyme.com/predictions"
providerUrl: "http://localhost:5000/forecast"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125
ports:
- "50065:50065"
networks:
- backend
networks:
backend:
driver: bridge
config/commetoo-cloud/mcx-external.yml
......@@ -9,7 +9,8 @@ services:
- "/ext/mongodb/:/data/db"
networks:
- backend
# command: mongod --replSet Server_29
command: mongod --smallfiles
# command: mongod --nojournal
##### Redis
redis:
image: redis
......@@ -38,19 +39,18 @@ services:
networks:
- backend
###Open Trip Planner
otp:
# image: opentripplanner/opentripplanner
image: municipalitybank.com:5050/mcx/devops/otp
ports:
- "8082:8080"
- "8083:8081"
volumes:
- /var/otp/graphs:/var/otp/graphs
environment:
JAVA_ARGS: "-Xms256m -Xmx512m"
command: --autoScan --server
networks:
- backend
# otp:
# image: municipalitybank.com:5050/mcx/devops/otp
# ports:
# - "8082:8080"
# - "8083:8081"
# volumes:
# - /var/otp/graphs:/var/otp/graphs
# environment:
# JAVA_ARGS: "-Xms256m -Xmx512m"
# command: --autoScan --server
# networks:
# - backend
mqtt:
image: eclipse-mosquitto
ports:
......@@ -63,6 +63,7 @@ services:
networks:
- backend
elk:
# image: sebp/elk:612
image: sebp/elk
ports:
- "5601:5601"
......@@ -90,6 +91,49 @@ services:
#curl -XPUT "http://localhost:9200/activityidx" -d'{ "mappings": { "activity": { "properties": { "metaData.loc": { "type": "geo_point" } } } } }'
# view
# curl: curl -XGET "http://localhost:9200/activityidx/activity" -d'{ "query": { "match_all": {} }}'
influxdb:
environment:
INFLUXDB_GRAPHITE_ENABLED: 'true'
INFLUXDB_DB: "mcx_db"
INFLUXDB_USER: "root"
INFLUXDB_USER_PASSWORD: "giptmgr"
image: influxdb
ports:
- "8084:8083"
- "8086:8086"
- "2003:2003"
volumes:
- /ext/influxdb:/var/lib/influxdb
- /tmp/influxdb:/tmp
networks:
- backend
grafana:
environment:
GF_INSTALL_PLUGINS: "grafana-piechart-panel,briangann-gauge-panel"
GF_AUTH_ANONYMOUS_ENABLED: 'true'
# GF_AUTH_ANONYMOUS_ORG_NAME: 'Main Org'
GF_AUTH_ANONYMOUS_ORG_ROLE: 'Anonymous'
GF_SERVER_DOMAIN: 'ipgallery-mcz.com'
GF_SERVER_ROOT_URL: '%(protocol)s://%(domain)s:/grafana'
HTTP_USER: "root"
HTTP_PASS: "giptmgrr"
INFLUXDB_PROTO: http
INFLUXDB_HOST: influxdb
INFLUXDB_PORT: 8086
INFLUXDB_NAME: "mcx_db"
INFLUXDB_USER: "root"
INFLUXDB_PASS: "giptmgrr"
image: grafana/grafana
ports:
- "3000:3000"
- "8048:80"
depends_on:
- influxdb
volumes:
- /ext/grafana:/var/lib/grafana
#user/pass = admin/admin
networks:
- backend
networks:
backend:
driver: bridge
config/commetoo-cloud/mcx-frontend.yml
......@@ -3,7 +3,7 @@ services:
### UI-WEB-CONTROL (NGINX + WEB)
ui-web-control:
environment:
OTP_SERVER: "otp:8081"
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
......@@ -14,8 +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:15-ac1b3bf
#image: municipalitybank.com:5050/mcx/ui-web:control-center-4-bcf87bc0003a3ed214fabb45e684bb837bb593ef
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
volumes:
- "/opt/mcx/config/repo/public-safety:/usr/share/nginx/html/repo/public-safety"
networks:
......@@ -26,7 +34,7 @@ services:
#image: municipalitybank.com:5050/mcx/ui-web:client-8-dea10d499084c4340ed08dd3bedc54a62e127965
# image: 172.16.1.212:5050/mcx/ui-web:client-25-fc74e8fe1b9cf7fbca90ad3b4da9fc3187bf4d1e
environment:
OTP_SERVER: "otp:8081"
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
......@@ -44,7 +52,7 @@ services:
# image: 172.16.1.212:5050/mcx/ui-web:driver-11-0a1f26cdf30b6734909f9c815a0b98c83b1a2c01
image: municipalitybank.com:5050/mcx/ui-web:driver-2-963a1f8b75479192f5de29eb797422e67102fdbb
environment:
OTP_SERVER: "otp:8081"
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
......@@ -60,7 +68,7 @@ services:
## FRONT END
front-end:
environment:
OTP_SERVER: "otp:8081"
OTP_SERVER: "ipgallery-mcz.com:8099"
KIBANA_SERVER: "elk:5601"
CAMERA_STREAM: "62.90.201.74:9081"
CAMERA_API: "62.90.201.74:9090"
......@@ -76,16 +84,25 @@ services:
PGID: "911"
PUID: "911"
ONLY_SUBDOMAINS: "false"
URL: "commetoo.com"
URL: "safeyme.com"
TZ: "Israel"
MAKE_CERT: "true"
# image: municipalitybank.com:5050/mcx/front-end/develop-new-letsencrypt
image: municipalitybank.com:5050/mcx/front-end:18-c45b301
VALIDATION: "http"
# DNSPLUGIN: "digitalocean"
# image: linuxserver/letsencrypt
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
ports:
- "443:443"
- "80:80"
volumes:
- "/opt/mcz/config-letsencrypt/:/config:rw"
- "/opt/mcz/config-letsencrypt/tmp:/var/tmp/nginx:rw"
# extra_hosts:
# - "grafana:172.16.1.244"
networks:
- backend
networks:
......
config/commetoo-cloud/ws-event-simulator.yml 0 → 100644
version: '2'
services:
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
networks:
backend:
driver: bridge
config/integration/mcx-backend.yml
......@@ -89,9 +89,9 @@ services:
## PUBLIC SFAETY
public-safety:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim#\
-DpublicSafety.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DpublicSafety.server.address=public-safety:50005#\
-Dredis.host=redis#\
......@@ -232,7 +232,8 @@ services:
-DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
image: municipalitybank.com:5050/mcx/public-safety/ic:29-9857b49
# image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
# image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
ports:
......@@ -288,12 +289,14 @@ 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.72:8053/events"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
# -Dwebsocket_url=ws://172.16.1.72: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#\
......
config/integration/mcx-frontend.yml
......@@ -14,7 +14,9 @@ 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:15-c1f1193
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
......
config/integration/ws-event-simulator.yml 0 → 100644
version: '2'
services:
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"
config/ipgallery-mcz/mcx-backend.yml
......@@ -16,7 +16,8 @@ services:
# -Dds.sap.hana.url=35.156.55.64:8000#\
# -Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/ds:37-43b2b94
image: municipalitybank.com:5050/mcx/ds:39-7a42bd7
#image: municipalitybank.com:5050/mcx/ds:37-43b2b94
# image: 172.16.1.212:5050/mcx/ds:21-837052
ports:
- "8012:50050"
......@@ -27,7 +28,7 @@ services:
###### transportation ###################
transportation:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,givatayim,san-jose#\
-Ddemo.changeRandomality=6#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
......@@ -44,7 +45,8 @@ services:
-Dpubsub.host=mqtt#\
-Dpubsub.port=1883"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/transportation:17-ec4f801
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
# image: municipalitybank.com:5050/mcx/transportation:12-b1b7268
......@@ -57,7 +59,7 @@ services:
####### parking ###################
parking:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,chicago,modiin,givatayim,busan,san-jose#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
-DconfigLocation=/opt/mcx/config/#\
-Dredis.host=redis#\
......@@ -68,7 +70,8 @@ services:
-Ddemo.changeRandomality=9#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/parking:9-6cec946
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
# image: 172.16.1.212:5050/mcx/parking:20-d72ebf
......@@ -80,7 +83,7 @@ services:
## PUBLIC SFAETY
public-safety:
environment:
IPG_ENV_PARAMS: "-DdemoMode=minneapolis,modiin,chicago,givatayim#\
IPG_ENV_PARAMS: "-DdemoMode=pedestrian@san-diego,minneapolis,modiin,chicago,givatayim,san-jose#\
-DpublicSafety.updateCrosswalkTimeout=300000#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000#\
-DconfigFile.location=/opt/mcx/config/config.properties#\
......@@ -96,7 +99,9 @@ services:
-DpublicSafety.mdeServer.address=mde:50040#\
-DpublicSafety.mde2Server.address=mde2:50041"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety:22-0f6abc1
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
# image: municipalitybank.com:5050/mcx/public-safety:19-3b62940
# image: 172.16.1.212:5050/mcx/public-safety:33-0a1fbb
......@@ -216,7 +221,8 @@ services:
-DconfigLocation=/opt/mcx/config/ICPublicSafety/
-Duse.iot.reporting=false"
USE_DEBUG: "yes"
image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
image: municipalitybank.com:5050/mcx/public-safety/ic:29-9857b49
# image: municipalitybank.com:5050/mcx/public-safety/ic:27-28613d2
# image: 172.16.1.212:5050/mcx/public-safety:ic-20-17603423ab703d89765f19636ba71dc98b81e616
# image: 172.16.1.212:5050/mcx/public-safety:ic-19-9fb286e80940947addfeb342169e44f20f7134ab
ports:
......@@ -262,7 +268,7 @@ services:
mde2:
environment:
ENV_PARAMS_COMMON: "-Dredis.host=redis#\
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=10000"
-Dhystrix.command.default.execution.isolation.thread.timeoutInMilliseconds=30000"
ENV_PARAMS_apiHandler: "-DconfigFile.location=/opt/mcx/config/apiHandler/config.properties#\
-DconfigLocation=/opt/mcx/config/apiHandler"
......@@ -271,7 +277,8 @@ services:
ENV_PARAMS_httpAdapter: "-DconfigFile.location=/opt/mcx/config/httpAdapter/config.properties#\
-DconfigLocation=/opt/mcx/config/httpAdapter#\
-Ddomain_comsrv=comm-service:50060"
-Ddomain_comsrv=comm-service:50060#\
-Dwebsocket_url=ws://172.16.1.33:8053/events"
DEBUG_httpAdapter: "yes"
......@@ -285,7 +292,8 @@ services:
-Dsan-jose_loginClientId=a27b18484c3c4e08a7c193e42c639347#\
-Dsan-jose_loginClientSecret=b863de8f453c4a05A88126F45B958CF1"
DEBUG_apiService: "yes"
image: municipalitybank.com:5050/mcx/mde2:8-50c28c6
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
#image: municipalitybank.com:5050/mcx/mde2:5-ea91ef5
......@@ -306,8 +314,9 @@ services:
mqtt: "mqtt:1883"
influxdb_hostport: "influxdb:8086"
influxdb_dbname: "mcx_db"
callbackAddress: "ipgallery-mcz.com/predictions"
image: municipalitybank.com:5050/mcx/predictions
callbackAddress: "https://ipgallery-mcz.com/predictions"
providerUrl: "http://localhost:5000/forecast"
image: municipalitybank.com:5050/mcx/predictions:10-e27f125
ports:
- "50065:50065"
networks:
......
config/ipgallery-mcz/mcx-external.yml
......@@ -9,7 +9,8 @@ services:
- "/ext/mongodb/:/data/db"
networks:
- backend
# command: mongod --replSet Server_29
command: mongod --smallfiles
# command: mongod --nojournal
##### Redis
redis:
image: redis
......@@ -70,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:
......
config/ipgallery-mcz/mcx-frontend.yml
......@@ -14,7 +14,9 @@ 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-verticals:13-4f061a9
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
......
config/ipgallery-mcz/ws-event-simulator.yml 0 → 100644
version: '2'
services:
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"
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