Skip to content

Commit 6f6d066

Browse files
vkb1vkb1
authored
time-series,multimodal: Updated main branch (#1477)
This PR updates the main branch with changes from the release-2025.2 branch, focusing on documentation corrections, configuration improvements, and minor code cleanup. Key Changes: - Documentation updates including spelling corrections, formatting fixes, and updated links - Configuration improvements for nginx proxy settings and Docker Compose environment variables Signed-off-by: B, Vinod K <vinod.k.b@intel.com>
1 parent adef7ae commit 6f6d066

File tree

14 files changed

+61
-42
lines changed

14 files changed

+61
-42
lines changed

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ LOG_LEVEL=INFO
3333
TIME_SERIES_ANALYTICS_IMAGE=intel/ia-time-series-analytics-microservice:1.1.0
3434
WELD_SIMULATOR_IMAGE=intel/ia-weld-data-simulator:1.0.0
3535
FUSION_MODULE_IMAGE=intel/ia-multimodal-fusion-analytics:1.0.0
36-
DLSTREAMER_PIPELINE_SERVER_IMAGE=intel/dlstreamer-pipeline-server:2025.2-ubuntu24-rc2
36+
DLSTREAMER_PIPELINE_SERVER_IMAGE=intel/dlstreamer-pipeline-server:2025.2.0-ubuntu24
3737

3838
# Please provide the suffix for the image version you want to use like rc1, rc2, git hash id etc.
3939
IMAGE_SUFFIX=weekly

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/configs/nginx/nginx-cert-gen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SHA_ALGO="sha384"
1717
echo "Generating SSL certificates for Nginx..."
1818
if [ -d $SSL_DIR ]; then rm -rf $SSL_DIR/*; fi
1919

20-
envsubst '\$HOST_IP \$WHIP_SERVER_PORT\' < /tmp/default.conf.template > /etc/nginx/nginx.conf
20+
envsubst '\$MEDIAMTX_SERVER \$WHIP_SERVER_PORT\' < /tmp/default.conf.template > /etc/nginx/nginx.conf
2121

2222
openssl req -x509 -nodes -days ${DAYS} -${SHA_ALGO} -newkey rsa:${KEY_LENGTH} -keyout $SSL_DIR/key.pem -out $SSL_DIR/cert.pem -subj "/CN=localhost"
2323
chmod 640 $SSL_DIR/key.pem $SSL_DIR/cert.pem

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/configs/nginx/nginx.conf‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ http {
7171
# WHIP / WHEP exact routes
7272
# ------------------------------------------------
7373
location ~ ^/samplestream/(whip|whep)(/.*)?$ {
74-
proxy_pass http://${HOST_IP}:${WHIP_SERVER_PORT}$request_uri;
74+
proxy_pass http://${MEDIAMTX_SERVER}:${WHIP_SERVER_PORT}$request_uri;
7575

7676
proxy_http_version 1.1;
7777
proxy_set_header Upgrade $http_upgrade;
@@ -82,6 +82,14 @@ http {
8282
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
8383
proxy_set_header X-Forwarded-Proto $scheme;
8484

85+
proxy_connect_timeout 300s;
86+
proxy_send_timeout 300s;
87+
proxy_read_timeout 300s;
88+
send_timeout 300s;
89+
90+
proxy_buffering off;
91+
proxy_request_buffering off;
92+
8593
# CORS
8694
add_header Access-Control-Allow-Origin *;
8795
add_header Access-Control-Allow-Methods "GET, DELETE, POST, PATCH, OPTIONS";
@@ -97,7 +105,7 @@ http {
97105
# (but NOT whip/whep — regex above overrides it)
98106
# ------------------------------------------------
99107
location ^~ /samplestream/ {
100-
proxy_pass http://${HOST_IP}:${WHIP_SERVER_PORT};
108+
proxy_pass http://${MEDIAMTX_SERVER}:${WHIP_SERVER_PORT};
101109

102110
proxy_http_version 1.1;
103111
proxy_set_header Host $host;
@@ -108,7 +116,13 @@ http {
108116
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
109117
proxy_set_header X-Forwarded-Proto $scheme;
110118

119+
proxy_connect_timeout 300s;
120+
proxy_send_timeout 300s;
121+
proxy_read_timeout 300s;
122+
send_timeout 300s;
123+
111124
proxy_buffering off;
125+
proxy_request_buffering off;
112126
}
113127

114128

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/docker-compose.yml‎

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,8 @@ services:
226226
CONTINUOUS_SIMULATOR_INGESTION: ${CONTINUOUS_SIMULATOR_INGESTION}
227227
SIMULATION_TARGET_FPS: ${SIMULATION_TARGET_FPS}
228228
LOG_LEVEL: ${LOG_LEVEL}
229+
volumes:
230+
- ./weld-data-simulator/simulation-data:/simulation-data
229231
networks:
230232
- timeseries_network
231233

@@ -241,7 +243,7 @@ services:
241243
environment:
242244
no_proxy: "ia-grafana,ia-time-series-analytics-microservice,ia-mqtt-broker,coturn,mediamtx,${no_proxy},${HOST_IP}"
243245
NO_PROXY: "ia-grafana,ia-time-series-analytics-microservice,ia-mqtt-broker,coturn,mediamtx,${no_proxy},${HOST_IP}"
244-
HOST_IP: ${HOST_IP}
246+
MEDIAMTX_SERVER: mediamtx
245247
WHIP_SERVER_PORT: ${WHIP_SERVER_PORT}
246248
ports:
247249
- "${GRAFANA_PORT}:15443" # HTTPS for Grafana and TS MS Rest API
@@ -318,28 +320,28 @@ services:
318320
ENABLE_RTSP: true
319321
http_proxy: ${http_proxy}
320322
https_proxy: ${https_proxy}
321-
no_proxy: ${no_proxy},${HOST_IP},${RTSP_CAMERA_IP},otel-collector,mediamtx,model_registry,${MR_MINIO_HOSTNAME},ia-mqtt-broker
322-
NO_PROXY: ${no_proxy},${HOST_IP},${RTSP_CAMERA_IP},otel-collector,mediamtx,model_registry,${MR_MINIO_HOSTNAME},ia-mqtt-broker
323+
no_proxy: ${no_proxy},${HOST_IP},${RTSP_CAMERA_IP},otel-collector,mediamtx,model_registry,${MR_MINIO_HOSTNAME:-"minio-server"},ia-mqtt-broker
324+
NO_PROXY: ${no_proxy},${HOST_IP},${RTSP_CAMERA_IP},otel-collector,mediamtx,model_registry,${MR_MINIO_HOSTNAME:-"minio-server"},ia-mqtt-broker
323325
GST_DEBUG: "1"
324326
REST_SERVER_PORT: ${REST_SERVER_PORT}
325-
S3_STORAGE_HOST: ${MR_MINIO_HOSTNAME}
326-
S3_STORAGE_PORT: ${MR_MINIO_SERVER_PORT}
327-
S3_STORAGE_USER: ${MR_MINIO_ACCESS_KEY}
328-
S3_STORAGE_PASS: ${MR_MINIO_SECRET_KEY}
327+
S3_STORAGE_HOST: ${MR_MINIO_HOSTNAME:-"minio-server"}
328+
S3_STORAGE_PORT: ${MR_MINIO_SERVER_PORT:-9000}
329+
S3_STORAGE_USER: ${MR_MINIO_ACCESS_KEY:-""}
330+
S3_STORAGE_PASS: ${MR_MINIO_SECRET_KEY:-""}
329331
SERVICE_NAME: "dlstreamer-pipeline-server"
330332
ENABLE_OPEN_TELEMETRY: true
331333
OTEL_COLLECTOR_HOST: ${OTEL_COLLECTOR_HOST}
332334
OTEL_COLLECTOR_PORT: ${OTEL_COLLECTOR_PORT}
333335
OTEL_EXPORT_INTERVAL_MILLIS: ${OTEL_EXPORT_INTERVAL_MILLIS}
334-
OPCUA_SERVER_IP: ${OPCUA_SERVER_IP}
335-
OPCUA_SERVER_PORT: ${OPCUA_SERVER_PORT}
336-
OPCUA_SERVER_USERNAME: ${OPCUA_SERVER_USERNAME}
337-
OPCUA_SERVER_PASSWORD: ${OPCUA_SERVER_PASSWORD}
336+
OPCUA_SERVER_IP: ${OPCUA_SERVER_IP:-"ia-opcua-server"}
337+
OPCUA_SERVER_PORT: ${OPCUA_SERVER_PORT:-4840}
338+
OPCUA_SERVER_USERNAME: ${OPCUA_SERVER_USERNAME:-""}
339+
OPCUA_SERVER_PASSWORD: ${OPCUA_SERVER_PASSWORD:-""}
338340
# Model Registry Microservice
339-
MR_URL: ${MR_URL}
340-
MR_SAVED_MODELS_DIR: ${MR_SAVED_MODELS_DIR}
341-
MR_REQUEST_TIMEOUT: ${MR_REQUEST_TIMEOUT}
342-
MR_VERIFY_CERT: ${MR_VERIFY_CERT}
341+
MR_URL: ${MR_URL:-""}
342+
MR_SAVED_MODELS_DIR: ${MR_SAVED_MODELS_DIR:-""}
343+
MR_REQUEST_TIMEOUT: ${MR_REQUEST_TIMEOUT:-""}
344+
MR_VERIFY_CERT: ${MR_VERIFY_CERT:-""}
343345
MQTT_HOST: ia-mqtt-broker
344346
MQTT_PORT: 1883
345347
volumes:
@@ -386,11 +388,6 @@ services:
386388
security_opt:
387389
- no-new-privileges
388390
user: "${TIMESERIES_UID}:${TIMESERIES_UID}"
389-
ports:
390-
- ${WHIP_SERVER_PORT}:8889 # WebRTC
391-
- 9554:8554 # RTSP
392-
# - "8888:8888" # HTTP API / Web UI
393-
# - "8890:8890" # RTMP
394391
environment:
395392
- MTX_LOGLEVEL=info
396393
- MTX_RTSP=yes

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/third-party-programs.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ License-Identifier: BSD 3-Clause License (also known as the "New BSD License" or
4646

4747

4848
ia-time-series-analytics-microservice:
49-
====================================
49+
======================================
5050

5151
Info available at [third-party-programs.txt](https://github.com/open-edge-platform/edge-ai-libraries/blob/main/microservices/time-series-analytics/third-party-programs.txt)
5252

@@ -188,4 +188,4 @@ Link - https://huggingface.co/datasets/amr-lopezjos/Intel_Robotic_Welding_Multim
188188
License-Identifier: Apache License 2.0
189189

190190
---------------------------------------------------------------------------------------------------------------------------
191-
* Other names and brands may be claimed as the property of others.
191+
* Other names and brands may be claimed as the property of others.

‎manufacturing-ai-suite/industrial-edge-insights-multimodal/weld-data-simulator/Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ COPY requirements.txt /
5959
RUN pip install --upgrade pip
6060
RUN pip3 install --no-cache-dir -r requirements.txt
6161
COPY publisher.py /
62-
COPY simulation-data /simulation-data
6362

6463
USER ${TIMESERIES_USER_NAME}
6564

‎manufacturing-ai-suite/industrial-edge-insights-time-series/docker-compose-validation.override.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ version: '3.6'
77
services:
88
ia-grafana:
99
volumes:
10-
- ./grafana/system_metrics_dashboard/system_metrics.json:/etc/grafana/provisioning/dashboards/system_metrics.json
10+
- ./configs/grafana/system_metrics_dashboard/system_metrics.json:/etc/grafana/provisioning/dashboards/system_metrics.json
1111
ia-telegraf:
1212
user: root
1313
environment:

‎manufacturing-ai-suite/industrial-edge-insights-time-series/docs/user-guide/get-started.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,10 +167,10 @@ hide_directive-->
167167
### Running User Defined Function(UDF) inference on GPU
168168

169169
By default, UDF for both the sample apps is configured to run on `CPU`.
170-
The `Wind Turbine Anomaly Detection` sample app ML model can run on `iGPU` while
170+
The `Wind Turbine Anomaly Detection` sample app ML model can run on `GPU` while
171171
the `Weld Anomaly Detection` sample app ML model can only run on `CPU`.
172172

173-
To trigger the UDF inference on GPU in Time Series Analytics Microservice, run the following command:
173+
To trigger the UDF inference on `GPU` in Time Series Analytics Microservice, run the following command:
174174

175175
```sh
176176
curl -k -X 'POST' \
@@ -224,7 +224,7 @@ hide_directive-->
224224
> **Note**: Use link `https://<host_ip>:30001` to launch Grafana from browser (preferably, chrome browser) for the helm deployment
225225
226226
- Login to the Grafana with values set for `VISUALIZER_GRAFANA_USER` and `VISUALIZER_GRAFANA_PASSWORD`
227-
in `.env` file and select **Wind Turbine Dashboard**.
227+
in `.env` file.
228228
229229
![Grafana login](./_images/login_wt.png)
230230
@@ -279,7 +279,7 @@ hide_directive-->
279279
> **Note**: Use link `https://<host_ip>:30001` to launch Grafana from browser (preferably, chrome browser) for the helm deployment
280280
281281
- Login to the Grafana with values set for `VISUALIZER_GRAFANA_USER` and `VISUALIZER_GRAFANA_PASSWORD`
282-
in `.env` file
282+
in `.env` file.
283283
284284
![Grafana login](./_images/login_wt.png)
285285

‎manufacturing-ai-suite/industrial-edge-insights-time-series/docs/user-guide/how-to-guides/how-to-configure-alerts.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ data0
204204
```
205205

206206
<!--hide_directive
207-
:::{tab-set}
207+
:::
208208
:::{tab-item} hide_directive--> **Weld Anomaly Detection**
209209
<!--hide_directive
210210
:sync: tab2
@@ -270,7 +270,7 @@ curl -k -X 'POST' \
270270
```
271271

272272
<!--hide_directive
273-
:::{tab-set}
273+
:::
274274
:::{tab-item} hide_directive--> **Weld Anomaly Detection**
275275
<!--hide_directive
276276
:sync: tab2
@@ -373,7 +373,7 @@ To subscribe to MQTT topics in a Helm deployment, execute the following command:
373373
```
374374

375375
<!--hide_directive
376-
:::{tab-set}
376+
:::
377377
:::{tab-item} hide_directive--> **Weld Anomaly Detection**
378378
<!--hide_directive
379379
:sync: tab2

‎manufacturing-ai-suite/industrial-edge-insights-time-series/docs/user-guide/how-to-guides/how-to-deploy-with-helm.md‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ hide_directive-->
4141

4242
**Option B: Generate Helm charts**
4343

44-
`tar -xvzf wind-turbine-anomaly-detection-sample-app-1.1.0-weekly.tgz`
44+
1. Navigate to the source directory:
45+
```bash
46+
cd edge-ai-suites/manufacturing-ai-suite/industrial-edge-insights-time-series # path relative to git clone folder
47+
```
4548

4649
2. Generate the charts:
4750
```bash

0 commit comments

Comments
 (0)