Skip to content

Commit ad0c2d2

Browse files
llin60llin60
authored
Merge branch 'main' into metro-2.0
2 parents 6f1f58b + 3baa4d1 commit ad0c2d2

File tree

51 files changed

+400
-3469
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+400
-3469
lines changed

‎.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SECURITY.md @xwu2intel
77
/metro-ai-suite/smart-parking/ @vagheshp @tjanczak @xwu2intel
88
/metro-ai-suite/smart-intersection/ @saratpoluri @dnoliver @rajpatel9498
99
/metro-ai-suite/loitering-detection/ @vagheshp @tjanczak @xwu2intel
10-
/metro-ai-suite/visual-search-question-and-answering/ @llin60 @guangli-zhang
10+
/metro-ai-suite/visual-search-question-and-answering/ @llin60 @guangli-zhang @Johere @zhangcong2019
1111
/manufacturing-ai-suite/pallet-defect-detection/ @ajagadi1 @sugnanprabhu @rrajore
1212
/manufacturing-ai-suite/weld-porosity/ @ajagadi1 @sugnanprabhu @rrajore
1313
/manufacturing-ai-suite/wind-turbine-anomaly-detection/ @vkb1 @sathyendranv @pooja-intel

‎.github/workflows/windturbine-sampleapp-pull-request.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,13 @@ jobs:
5151
cd ./timeseries/manufacturing-ai-suite/wind-turbine-anomaly-detection
5252
make down
5353
# Generate random values for sensitive environment variables
54-
INFLUXDB_USERNAME=$(openssl rand -hex 8)
55-
INFLUXDB_PASSWORD=$(openssl rand -hex 12)
56-
VISUALIZER_GRAFANA_USER=$(openssl rand -hex 6)
57-
VISUALIZER_GRAFANA_PASSWORD=$(openssl rand -hex 10)
58-
MR_PSQL_PASSWORD=$(openssl rand -hex 10)
59-
MR_MINIO_ACCESS_KEY=$(openssl rand -hex 8)
60-
MR_MINIO_SECRET_KEY=$(openssl rand -hex 16)
54+
INFLUXDB_USERNAME=$(openssl rand -hex 4)
55+
INFLUXDB_PASSWORD=$(openssl rand -hex 6)
56+
VISUALIZER_GRAFANA_USER=$(openssl rand -hex 4)
57+
VISUALIZER_GRAFANA_PASSWORD=$(openssl rand -hex 6)
58+
MR_PSQL_PASSWORD=$(openssl rand -hex 4)
59+
MR_MINIO_ACCESS_KEY=$(openssl rand -hex 4)
60+
MR_MINIO_SECRET_KEY=$(openssl rand -hex 4)
6161
6262
sed -i "s/INFLUXDB_USERNAME=.*/INFLUXDB_USERNAME=${INFLUXDB_USERNAME}/g" .env
6363
sed -i "s/INFLUXDB_PASSWORD=.*/INFLUXDB_PASSWORD=${INFLUXDB_PASSWORD}/g" .env

‎README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ These suites simplify the creation of custom AI solutions for specific industrie
1919

2020
[The Media & Entertainment AI Suite](media-and-entertainment-ai-suite) provides libraries and sample applications to accelerate solution development for high-performance, high-quality, live video production helping improve viewer experience.
2121

22-
[The Robotics AI Suite](robotics-ai-suite) provides ready to use samples leveraging AI to help solve common robotics problems such as perception, navigation, simulation, and planning.
23-
2422

2523
The Edge AI Suites project hosts a collection of sample applications organized as follows:
2624

@@ -37,8 +35,6 @@ The Edge AI Suites project hosts a collection of sample applications organized a
3735
| Manufacturing AI Suite | [Wind Turbine Anomaly Detection](manufacturing-ai-suite/wind-turbine-anomaly-detection/) | [Link](manufacturing-ai-suite/wind-turbine-anomaly-detection/docs/user-guide/get-started.md) | [Docker deployment](manufacturing-ai-suite/wind-turbine-anomaly-detection/docs/user-guide/get-started.md#deploy-with-docker-compose-single-node) and [Helm deployment](manufacturing-ai-suite/wind-turbine-anomaly-detection/docs/user-guide/how-to-deploy-with-helm.md) |
3836
| Retail AI Suite | [Automated Self Checkout](https://github.com/intel-retail/automated-self-checkout) | [Link](https://github.com/intel-retail/automated-self-checkout?tab=readme-ov-file#-quickstart) | [Advanced Guide](https://intel-retail.github.io/documentation/use-cases/automated-self-checkout/automated-self-checkout.html) |
3937
| Retail AI Suite | [Loss Prevention](https://github.com/intel-retail/loss-prevention) | [Link](https://github.com/intel-retail/loss-prevention?tab=readme-ov-file#quickstart) | [Advanced Guide](https://intel-retail.github.io/documentation/use-cases/loss-prevention/loss-prevention.html) |
40-
| Robotics AI Suite | [ACT Sample](robotics-ai-suite/act-sample) | [Link](robotics-ai-suite/act-sample) | [Tutorial](robotics-ai-suite/act-sample/README.md) |
41-
| Robotics AI Suite | [ORB-SLAM3 Sample](robotics-ai-suite/orb-slam3-sample) | [Link](robotics-ai-suite/orb-slam3-sample) | [Tutorial](robotics-ai-suite/orb-slam3-sample/README.md) |
4238

4339
Please visit each sample application sub-directory for respective **Getting Started**, **Customization** instructions.
4440

‎manufacturing-ai-suite/wind-turbine-anomaly-detection/.env

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ KAPACITOR_PORT=9092
2121
# Please provide full registry url with port trail by /
2222
# e.q. localhost:5000/
2323
DOCKER_REGISTRY=
24-
DOCKER_USERNAME=
25-
DOCKER_PASSWORD=
26-
# For proxy environment, please append IP addresses or Range IP addresses of each node of the cluster to no_proxy
27-
# e.q. timeseries_no_proxy=localhost,127.0.0.1,10.223.109.130,10.223.109.170
28-
timeseries_no_proxy=localhost,127.0.0.1
2924

3025
# The INFLUXDB_USERNAME and INFLUXDB_PASSWORD length must be a minimum of 5 and 10 characters respectively and should contain alphanumeric characters with at least one digit.
3126
# Do not set INFLUXDB_USERNAME to 'admin'.

‎manufacturing-ai-suite/wind-turbine-anomaly-detection/Makefile

Lines changed: 68 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -21,54 +21,102 @@ export $(shell sed 's/=.*//' $(ENV_FILE))
2121
# Build Docker containers
2222
.PHONY: build
2323
build:
24-
@echo "Building Docker containers...";
24+
@echo "Building Docker containers..."
2525
$(DOCKER_COMPOSE) build;
2626

2727
# Check if multiple particular variables in .env are assigned with values
2828
.PHONY: check_env_variables
2929
check_env_variables:
30-
@echo "Checking if username/password in .env are assigned..."
30+
@echo "Checking if username/password in .env are matching the rules set..."
3131
@variables="INFLUXDB_USERNAME INFLUXDB_PASSWORD VISUALIZER_GRAFANA_USER VISUALIZER_GRAFANA_PASSWORD MR_PSQL_PASSWORD MR_MINIO_ACCESS_KEY MR_MINIO_SECRET_KEY"; \
3232
for variable_name in $$variables; do \
3333
value=$$(grep -E "^$$variable_name=" $(ENV_FILE) | cut -d'=' -f2); \
3434
if [ -z "$$value" ]; then \
3535
echo "'$$variable_name' in $(ENV_FILE) is unassigned."; \
3636
exit 1; \
3737
fi; \
38-
done;
38+
case "$$variable_name" in \
39+
INFLUXDB_USERNAME) \
40+
if [ "$$value" = "admin" ]; then \
41+
echo "INFLUXDB_USERNAME must not be admin."; \
42+
exit 1; \
43+
fi; \
44+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{5,}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
45+
echo "INFLUXDB_USERNAME must be at least 5 alphanumeric chars and contain at least one digit."; \
46+
exit 1; \
47+
fi \
48+
;; \
49+
INFLUXDB_PASSWORD) \
50+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{10,}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
51+
echo "INFLUXDB_PASSWORD must be at least 10 alphanumeric chars and contain at least one digit."; \
52+
exit 1; \
53+
fi \
54+
;; \
55+
VISUALIZER_GRAFANA_USER) \
56+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{5,}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
57+
echo "VISUALIZER_GRAFANA_USER must be at least 5 alphanumeric chars and contain at least one digit."; \
58+
exit 1; \
59+
fi \
60+
;; \
61+
VISUALIZER_GRAFANA_PASSWORD) \
62+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{10,}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
63+
echo "VISUALIZER_GRAFANA_PASSWORD must be at least 10 alphanumeric chars and contain at least one digit."; \
64+
exit 1; \
65+
fi \
66+
;; \
67+
MR_PSQL_PASSWORD) \
68+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{5,10}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
69+
echo "MR_PSQL_PASSWORD must be 5-10 alphanumeric chars and contain at least one digit."; \
70+
exit 1; \
71+
fi \
72+
;; \
73+
MR_MINIO_ACCESS_KEY) \
74+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{5,10}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
75+
echo "MR_MINIO_ACCESS_KEY must be 5-10 alphanumeric chars and contain at least one digit."; \
76+
exit 1; \
77+
fi \
78+
;; \
79+
MR_MINIO_SECRET_KEY) \
80+
if ! echo "$$value" | grep -Eq "^[A-Za-z0-9]{8,16}$$" || ! echo "$$value" | grep -q "[0-9]"; then \
81+
echo "MR_MINIO_SECRET_KEY must be 8-16 alphanumeric chars and contain at least one digit."; \
82+
exit 1; \
83+
fi \
84+
;; \
85+
esac; \
86+
done
3987

4088
.PHONY: up_mqtt_ingestion
41-
up_mqtt_ingestion: down check_env_variables
42-
docker compose pull --ignore-pull-failures;
89+
up_mqtt_ingestion: check_env_variables down
90+
docker compose pull --ignore-pull-failures 2>&1 | grep -v 'WARNING:'
4391
@export TELEGRAF_INPUT_PLUGIN=$$(if [ $(INCLUDE) = 'validation' ]; then echo "mqtt_consumer:net:cpu:disk:docker:diskio:kernel:mem:processes:swap:system"; else echo "mqtt_consumer"; fi); \
4492
echo "Starting Docker containers..."; \
4593
if [ $(INCLUDE) = 'validation' ]; then \
46-
$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) -f $(DOCKER_COMPOSE_VALIDATION_FILE) up --scale ia-opcua-server=0 -d ;\
94+
$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) -f $(DOCKER_COMPOSE_VALIDATION_FILE) up --scale ia-opcua-server=0 -d; \
4795
else \
48-
$(DOCKER_COMPOSE) up --scale ia-opcua-server=0 -d ;\
96+
$(DOCKER_COMPOSE) up --scale ia-opcua-server=0 -d; \
4997
fi;
5098

5199
# Run Docker containers
52100
.PHONY: up_opcua_ingestion
53-
up_opcua_ingestion: down check_env_variables
54-
docker compose pull --ignore-pull-failures;
101+
up_opcua_ingestion: check_env_variables down
102+
docker compose pull --ignore-pull-failures 2>&1 | grep -v 'WARNING:'
55103
@export TELEGRAF_INPUT_PLUGIN=$$(if [ $(INCLUDE) = 'validation' ]; then echo "opcua:net:cpu:disk:docker:diskio:kernel:mem:processes:swap:system"; else echo "opcua"; fi); \
56104
echo "Starting Docker containers..."; \
57105
if [ $(INCLUDE) = 'validation' ]; then \
58106
$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) -f $(DOCKER_COMPOSE_VALIDATION_FILE) up --scale ia-mqtt-publisher=0 -d ;\
59107
else \
60-
$(DOCKER_COMPOSE) up --scale ia-mqtt-publisher=0 -d ;\
108+
$(DOCKER_COMPOSE) up --scale ia-mqtt-publisher=0 -d; \
61109
fi;
62110

63111

64112
# Status of the deployed containers
65113
.PHONY: status
66114
status:
67115
@echo "Status of the deployed containers..."; \
68-
docker ps -a --filter "name=^ia-" --format "table {{.ID}}\t{{.Names}}\t{{.Status}}\t{{.Ports}}"; \
116+
docker ps -a --filter "name=^ia-" --filter "name=mr_" --filter "name=model_" --filter "name=wind-turbine" --format "table {{.ID}}\t{{.Names}}\t{{.Status}}\t{{.Ports}}"; \
69117
echo "Parsing the logs of all containers to catch any error messages..."; \
70-
sleep 10; \
71-
containers=$$(docker ps -a --filter "name=^ia-" --format "{{.Names}}"); \
118+
sleep 20; \
119+
containers=$$(docker ps -a --filter "name=^ia-" --filter "name=mr_" --filter "name=model_" --filter "name=wind-turbine" --format "{{.Names}}"); \
72120
failure_cont_flag=0; \
73121
for container in $$containers; do \
74122
errors=$$(docker logs --tail 5 $$container 2>&1 | grep -i "error"); \
@@ -95,19 +143,17 @@ status:
95143
echo ""; \
96144
fi;
97145

98-
# Stop Docker containers
146+
# Removes docker compose containers and volumes
99147
.PHONY: down
100148
down:
101149
@echo "Stopping Docker containers...";
102-
$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) down -v
150+
$(DOCKER_COMPOSE) -f $(DOCKER_COMPOSE_FILE) down -v --remove-orphans
103151

104-
# Remove all stopped containers and unused images
105-
.PHONY: clean
106-
clean:
107-
@echo "Cleaning up unused Docker resources..."
108-
docker system prune -f
109-
110-
# Push the docker images to docker registry
152+
# Push the docker images to docker registry, ensure to configure DOCKER_REGISTRY in .env
153+
# and have logged into that. Applies mainly when one is dealing with internal docker registry.
154+
# If you are using docker hub, ensure to have logged in with `docker login` command
155+
# before running this command.
156+
.PHONY: push_images
111157
push_images: build
112158
@echo "Pushing the images to docker registry"
113159
docker compose -f $(DOCKER_COMPOSE_FILE) push

‎manufacturing-ai-suite/wind-turbine-anomaly-detection/deployment-package/timeseries-wind-turbine-values.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
---
77
namespace: apps
88
DOCKER_REGISTRY: ''
9+
imagePullPolicy: Always
910
env:
1011
# The INFLUXDB_USERNAME and INFLUXDB_PASSWORD length must be a minimum of 5 and 10 characters respectively and
1112
# should contain alphanumeric characters with atleast one digit.
@@ -17,9 +18,14 @@ env:
1718
# and should contain alphanumeric characters with atleast one digit
1819
VISUALIZER_GRAFANA_USER:
1920
VISUALIZER_GRAFANA_PASSWORD:
20-
# The POSTGRES_USER length must be a minimum of 5 and 10 characters respectively
21+
# The POSTGRES_PASSWORD length must be a minimum of 5 and 10 characters respectively and should contain alphanumeric characters with at least one digit
2122
POSTGRES_PASSWORD:
23+
# MinIO Access Key length must be a minimum of 8 and 16 characters respectively and should contain alphanumeric characters with at least one digit
24+
MINIO_ACCESS_KEY:
2225
# MinIO Secret Key length must be a minimum of 8 and 16 characters respectively and should contain alphanumeric characters with at least one digit
2326
MINIO_SECRET_KEY:
2427
HTTP_PROXY:
25-
HTTPS_PROXY:
28+
HTTPS_PROXY:
29+
images:
30+
# Please provide the suffix for the image version you want to use like rc1, rc2, git hash id etc.
31+
image_suffix: ""

‎manufacturing-ai-suite/wind-turbine-anomaly-detection/docker-compose.yml

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ services:
2020
test: ["CMD-SHELL", "exit", "0"]
2121
interval: 5m
2222
environment:
23-
no_proxy: "ia-influxdb,ia-mqtt-broker,ia-opcua-server,ia-time-series-analytics-microservice"
24-
NO_PROXY: "ia-influxdb,ia-mqtt-broker,ia-opcua-server,ia-time-series-analytics-microservice"
23+
no_proxy: "ia-influxdb,ia-mqtt-broker,ia-opcua-server,ia-time-series-analytics-microservice,${no_proxy}"
24+
NO_PROXY: "ia-influxdb,ia-mqtt-broker,ia-opcua-server,ia-time-series-analytics-microservice,${no_proxy}"
2525
MQTT_BROKER_HOST: "ia-mqtt-broker"
2626
INFLUX_SERVER: "ia-influxdb"
2727
INFLUXDB_PORT: 8086
@@ -31,7 +31,7 @@ services:
3131
TELEGRAF_CONFIG_PATH: /etc/telegraf/Telegraf_devmode.conf
3232
OPCUA_SERVER: opc.tcp://ia-opcua-server:4840/freeopcua/server/
3333
LOG_LEVEL: ${LOG_LEVEL}
34-
TELEGRAF_INPUT_PLUGIN: ${TELEGRAF_INPUT_PLUGIN}
34+
TELEGRAF_INPUT_PLUGIN: ${TELEGRAF_INPUT_PLUGIN:-opcua}
3535
# The Telegraf metric_batch_size specifies the number of metrics or data points
3636
# that are grouped together and sent in a single batch to the InfluxDB.
3737
TELEGRAF_METRIC_BATCH_SIZE: 100
@@ -67,8 +67,8 @@ services:
6767
# The InfluxDB retention policy durations can be configured using a combination
6868
# of time units such as hours(h), minutes(m), and seconds(s), eg., 1h0m0s for 1 hour.
6969
RETENTION_DURATION: 1h0m0s
70-
no_proxy: ${timeseries_no_proxy}, ia-time-series-analytics-microservice
71-
NO_PROXY: ${timeseries_no_proxy}, ia-time-series-analytics-microservice
70+
no_proxy: "ia-time-series-analytics-microservice,${no_proxy}"
71+
NO_PROXY: "ia-time-series-analytics-microservice,${no_proxy}"
7272
INFLUXDB_CONFIG_PATH: "/etc/influxdb/influxdb_devmode.conf"
7373
INFLUXDB_LOGGING_LEVEL: ${LOG_LEVEL}
7474
INFLUXDB_TLS_CIPHERS: TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
@@ -90,13 +90,13 @@ services:
9090
- no-new-privileges
9191
read_only: true
9292
healthcheck:
93-
test: ["CMD-SHELL", "if [ \"$SECURE_MODE\" = \"true\" ]; then curl -f https://localhost:9092/kapacitor/v1/ping; else curl -f http://localhost:9092/kapacitor/v1/ping; fi"]
93+
test: ["CMD-SHELL", "curl -f http://localhost:9092/kapacitor/v1/ping || exit 1"]
9494
interval: 10s
9595
timeout: 5s
9696
retries: 20
9797
environment:
98-
no_proxy: "ia-time-series-analytics-microservice,ia-influxdb,ia-mqtt-broker,ia-opcua-server,localhost,model-registry"
99-
NO_PROXY: "ia-time-series-analytics-microservice,ia-influxdb,ia-mqtt-broker,ia-opcua-server,localhost,model-registry"
98+
no_proxy: "ia-time-series-analytics-microservice,ia-influxdb,ia-mqtt-broker,ia-opcua-server,localhost,model-registry,${no_proxy}"
99+
NO_PROXY: "ia-time-series-analytics-microservice,ia-influxdb,ia-mqtt-broker,ia-opcua-server,localhost,model-registry,${no_proxy}"
100100
KAPACITOR_PORT: ${KAPACITOR_PORT}
101101
INFLUX_SERVER: "ia-influxdb"
102102
KAPACITOR_INFLUXDB_0_USERNAME: ${INFLUXDB_USERNAME}
@@ -113,6 +113,8 @@ services:
113113
MODEL_REGISTRY_URL: http://model-registry:8111
114114
networks:
115115
- timeseries_network
116+
ports:
117+
- 5000:5000
116118
volumes:
117119
- "vol_temp_time_series_analytics_microservice:/tmp/"
118120
- ./time_series_analytics_microservice/udfs/:/tmp/windturbine_anomaly_detector/udfs/
@@ -135,8 +137,8 @@ services:
135137
test: ["CMD-SHELL", "exit", "0"]
136138
interval: 5m
137139
environment:
138-
no_proxy: ia-influxdb
139-
NO_PROXY: ia-influxdb
140+
no_proxy: "ia-influxdb,${no_proxy}"
141+
NO_PROXY: "ia-influxdb,${no_proxy}"
140142
INFLUX_SERVER: "ia-influxdb"
141143
GRAFANA_SERVER: '0.0.0.0'
142144
INFLUXDB_USERNAME: ${INFLUXDB_USERNAME}
@@ -187,13 +189,16 @@ services:
187189
args:
188190
TIMESERIES_USER_NAME: ${TIMESERIES_USER_NAME}
189191
TIMESERIES_UID: ${TIMESERIES_UID}
192+
http_proxy:
193+
https_proxy:
194+
no_proxy:
190195
hostname: ia-opcua-server
191196
read_only: true
192197
image: ${DOCKER_REGISTRY}${OPC_UA_SERVER_IMAGE}${IMAGE_SUFFIX:+-${IMAGE_SUFFIX}}
193198
environment:
194199
LOG_LEVEL: ${LOG_LEVEL}
195-
no_proxy: "ia-time-series-analytics-microservice"
196-
NO_PROXY: "ia-time-series-analytics-microservice"
200+
no_proxy: "ia-time-series-analytics-microservice,${no_proxy}"
201+
NO_PROXY: "ia-time-series-analytics-microservice,${no_proxy}"
197202
TS_MS_SERVER: "ia-time-series-analytics-microservice"
198203
TS_MS_PORT: ${KAPACITOR_PORT}
199204
restart: unless-stopped
@@ -214,6 +219,9 @@ services:
214219
args:
215220
TIMESERIES_USER_NAME: ${TIMESERIES_USER_NAME}
216221
TIMESERIES_UID: ${TIMESERIES_UID}
222+
http_proxy:
223+
https_proxy:
224+
no_proxy:
217225
container_name: ia-mqtt-publisher
218226
hostname: ia-mqtt-publisher
219227
read_only: true
@@ -227,8 +235,8 @@ services:
227235
environment:
228236
AppName: "mqtt-publisher"
229237
HOST_IP: ia-mqtt-broker
230-
no_proxy: "ia-mqtt-broker,ia-time-series-analytics-microservice"
231-
NO_PROXY: "ia-mqtt-broker,ia-time-series-analytics-microservice"
238+
no_proxy: "ia-mqtt-broker,ia-time-series-analytics-microservice,${no_proxy}"
239+
NO_PROXY: "ia-mqtt-broker,ia-time-series-analytics-microservice,${no_proxy}"
232240
TS_MS_SERVER: "ia-time-series-analytics-microservice"
233241
TS_MS_PORT: ${KAPACITOR_PORT}
234242
networks:
@@ -255,14 +263,14 @@ services:
255263
environment:
256264
AppName: "ModelRegistry"
257265
MIN_LOG_LEVEL: ${LOG_LEVEL}
258-
ENABLE_DEV_MODE: ${ENABLE_DEV_MODE}
266+
ENABLE_DEV_MODE: ${ENABLE_DEV_MODE:-false}
259267
ENABLE_HTTPS_MODE: false
260-
GETI_HOST: ${GETI_HOST}
261-
GETI_TOKEN: ${GETI_TOKEN}
262-
GETI_SERVER_API_VERSION: ${GETI_SERVER_API_VERSION}
263-
GETI_ORGANIZATION_ID: ${GETI_ORGANIZATION_ID}
264-
GETI_WORKSPACE_ID: ${GETI_WORKSPACE_ID}
265-
GETI_SERVER_SSL_VERIFY: ${GETI_SERVER_SSL_VERIFY}
268+
GETI_HOST: ${GETI_HOST:-""}
269+
GETI_TOKEN: ${GETI_TOKEN:-""}
270+
GETI_SERVER_API_VERSION: ${GETI_SERVER_API_VERSION:-""}
271+
GETI_ORGANIZATION_ID: ${GETI_ORGANIZATION_ID:-""}
272+
GETI_WORKSPACE_ID: ${GETI_WORKSPACE_ID:-""}
273+
GETI_SERVER_SSL_VERIFY: ${GETI_SERVER_SSL_VERIFY:-False}
266274
MLFLOW_TRACKING_URI: postgresql+psycopg2://${MR_USER_NAME}:${MR_PSQL_PASSWORD}@mr_postgres:5432/model_registry_db
267275
MLFLOW_S3_ENDPOINT_URL: ${MR_MLFLOW_S3_ENDPOINT_URL}
268276
MINIO_HOSTNAME: mr_minio
@@ -275,8 +283,8 @@ services:
275283
SERVER_CERT: /run/secrets/ModelRegistry_Server/public.crt
276284
CA_CERT: /run/secrets/ModelRegistry_Server/server-ca.crt
277285
SERVER_PRIVATE_KEY: /run/secrets/ModelRegistry_Server/private.key
278-
no_proxy: mr_postgres,mr_minio
279-
NO_PROXY: mr_postgres,mr_minio
286+
no_proxy: "mr_postgres,mr_minio,${no_proxy}"
287+
NO_PROXY: "mr_postgres,mr_minio,${no_proxy}"
280288
http_proxy: ${http_proxy}
281289
https_proxy: ${https_proxy}
282290
extra_hosts:
@@ -352,4 +360,4 @@ volumes:
352360
driver: local
353361
driver_opts:
354362
type: tmpfs
355-
device: tmpfs
363+
device: tmpfs

0 commit comments

Comments
 (0)