Skip to content

merge commits from release branch #1105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 19 commits into from
Nov 20, 2025
Merged

merge commits from release branch #1105

merged 19 commits into from
Nov 20, 2025

Conversation

@sathyendranv
Copy link
Contributor

@sathyendranv sathyendranv commented Nov 19, 2025

Description

merge commits from release branch

Fixes # (issue)

Any Newly Introduced Dependencies

No

How Has This Been Tested?

Yes

Checklist:

  • I agree to use the APACHE-2.0 license for my code changes.
  • I have not introduced any 3rd party components incompatible with APACHE-2.0.
  • I have not included any company confidential information, trade secret, password or security token.
  • I have performed a self-review of my code.

pooja-intel and others added 11 commits November 19, 2025 13:45
@pooja-intel @sathyendranv
time-series,multimodal: Added timeout session for grafana (#1000)
11e1386 
This PR adds configurable session timeout settings for Grafana across both the industrial-edge-insights-time-series
and industrial-edge-insights-multimodal modules.
The change allows administrators to control how long inactive users remain logged into Grafana before being 
automatically logged out.

Signed-off-by: Pooja Kumbharkar <[email protected]>
@vkb1 @sathyendranv
timeseries: Added rc1 tag refs for 2025.2.0 rel (#1003)
39d05d5 
Signed-off-by: B, Vinod K <[email protected]>
@pooja-intel @sathyendranv
time-series: Updated opcua vol mount (#1008)
1c8e259 
This PR updates the volume mount configuration in the OPC UA deployment template by replacing a dynamically-named volume mount with a static configuration. The change simplifies the volume mounting strategy by removing template variable interpolation and making the mount path more explicit.
Also, updated the helm docs to use rc1 tag instead of weekly.

Signed-off-by: Pooja Kumbharkar <[email protected]>
@sgolebiewski-intel @mpytlik-intel @sathyendranv
[DOCS] Time Series Docs Restructuring porting to release branch (#1022)
3e6c2ae 
Co-authored-by: Mikolaj Pytlik <[email protected]>
@pooja-intel @sathyendranv
industrial-edge-insights-time-series: Fixed the mqtt publisher loop (#…
1c66cdd 
…1098)

This PR fixes the MQTT publisher's continuous ingestion loop and updates documentation paths. The main change implements proper continuous looping through CSV files when continous_ingestion is set to true, along with documentation improvements and cleanup of the Helm chart generation process.

Key Changes:

- Fixed MQTT publisher to continuously loop through CSV files when continuous ingestion is enabled
- Updated Helm deployment documentation link to correct path
- Added cleanup step to remove existing simulation-data folder before copying during Helm chart generation

Signed-off-by: Pooja Kumbharkar <[email protected]>
@vkb1 @sathyendranv
timeseries: Added rc1 tag refs for 2025.2.0 rel (#1003)
6b9e107 
Signed-off-by: B, Vinod K <[email protected]>
@sgolebiewski-intel @sathyendranv
[DOCS] Update IEI Multimodal docs port to release 2025.2 (#1035)
78bbd2d
@sgolebiewski-intel @sathyendranv
[DOCS] Improve formatting of IEI Multimodal docs - port #1036 (#1037)
72c8f21
@sathyendranv
multimodal: weld-simulator: Updated comments (#1082)
508c190 
This PR updates logging levels and message formatting in the weld-data-simulator publisher module to improve log clarity and consistency. It also updates the MQTT client initialization to use the newer API version.

Key changes:

- Changed logging levels from info to debug or warning where appropriate for better log categorization
- Consolidated multiple log messages into single lines for improved readability
- Updated MQTT client initialization to explicitly specify API version

Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
@sathyendranv
multimodal: fixed webrtc issue secure mode publishing (#1089)
f29cdd1 
This PR fixes WebRTC publishing issues in secure mode by updating the nginx configuration to properly route WHIP/WHEP traffic and updating the Grafana dashboard to use HTTPS with the correct port.

Key Changes
- Restructured nginx location blocks to handle WHIP/WHEP routes separately with proper WebSocket support and CORS headers
- Updated Grafana iframe to use HTTPS protocol with explicit port handling instead of hardcoded HTTP

Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
@sathyendranv
multimodal: docs bug fixes (#1099)
e655eae 
This PR addresses documentation bugs across multimodal and time-series documentation files, including fixes for spelling errors, incorrect URLs, and content organization issues.

Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
vkb1
vkb1 reviewed Nov 19, 2025
View reviewed changes
@pooja-intel @sathyendranv
industrial-edge-insights-time-series: nmap port issue fix (#1104)
24d6684 
This PR addresses an nmap port security issue by changing the Kubernetes Service type from NodePort to ClusterIP for two services in the industrial-edge-insights-time-series component. This restricts external access to these services, making them only accessible within the cluster.

Key Changes:

- Changed Service type from NodePort to ClusterIP for the time-series-analytics-microservice
- Changed Service type from NodePort to ClusterIP for Grafana

Signed-off-by: Pooja Kumbharkar <[email protected]>
@vkb1 vkb1 added the 2025.2 Time Series Sample Apps All the time series sample apps and multimodal sample app related activities for 2025.2 release label Nov 20, 2025
@sathyendranv
timeseries, multimodal: Changed the reference from RC1 to weekly
cc4f636 
Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
@sathyendranv
Addressed review comments
7d9149f 
Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
@sathyendranv
Removed redundant arch image
64d068a 
Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
vkb1
vkb1 reviewed Nov 20, 2025
View reviewed changes
@sathyendranv
Addressed review comments
50d07b6 
Signed-off-by: Vellaisamy, Sathyendran <[email protected]>
@sathyendranv sathyendranv requested a review from vkb1 November 20, 2025 05:10
vkb1
vkb1 previously approved these changes Nov 20, 2025
View reviewed changes
pooja-intel
pooja-intel previously approved these changes Nov 20, 2025
View reviewed changes
@vkb1 vkb1 requested a review from Copilot November 20, 2025 08:51
Copilot AI reviewed Nov 20, 2025
View reviewed changes
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR merges commits from a release branch, bringing multiple improvements and fixes across the industrial edge insights codebase. The changes focus on configuration updates, bug fixes, documentation improvements, and version upgrades.

Key changes include:

  • Corrected spelling of "continuous" throughout the codebase and fixed related variable naming
  • Updated service types from NodePort to ClusterIP in Kubernetes configurations
  • Added Grafana session timeout configuration
  • Updated documentation paths and corrected typos

Reviewed Changes

Copilot reviewed 24 out of 24 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
publisher.py (mqtt-publisher) Fixed spelling of "continuous" variable and improved control flow with proper loop structure
values.yaml Added Grafana timeout configuration and updated OPC-UA server version
time-series-analytics-microservice.yaml Changed service type from NodePort to ClusterIP
opcua.yaml Updated volume mount configuration for simulation data
grafana.yaml Changed service type to ClusterIP and added session timeout environment variables
README.md (helm) Updated documentation link path
how-to-enable-system-metrics.md Corrected documentation link path
index.md (weld-anomaly-detection) Updated documentation describing data flow and model information
index.md (user-guide) Minor formatting improvement
how-to-deploy-with-helm.md Restructured deployment instructions and updated version references
how-to-build-from-source.md Removed hardcoded git checkout command
get-started.md Clarified GPU terminology and added dashboard selection instruction
docker-compose.yml (time-series) Added Grafana session timeout environment variables
Makefile Added cleanup step for simulation data directory
.env (time-series) Updated OPC-UA server version and added Grafana timeout configuration
publisher.py (multimodal) Changed logging levels, consolidated log messages, and updated MQTT client initialization
index.md (weld-defect-detection) Removed redundant OPC-UA alert configuration note
dec-2025.md Fixed spelling of "Vision"
how-to-update-config.md Updated API endpoint URL
how-to-build-from-source.md (multimodal) Removed hardcoded git checkout command
docker-compose.yml (multimodal) Added Grafana session timeout environment variables
nginx.conf Restructured proxy configuration for WHIP/WHEP routes
weld_defect_detection.json Updated iframe URL to use HTTPS with port
.env (multimodal) Added Grafana timeout configuration

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@sathyendranv
Update manufacturing-ai-suite/industrial-edge-insights-time-series/do…
ffbf344 
…cs/user-guide/weld-anomaly-detection/index.md

Co-authored-by: Copilot <[email protected]>
@sathyendranv sathyendranv dismissed stale reviews from pooja-intel and vkb1 via ffbf344 November 20, 2025 08:57
@sathyendranv sathyendranv requested a review from vkb1 November 20, 2025 09:03
@sathyendranv sathyendranv enabled auto-merge (squash) November 20, 2025 09:04
@vkb1 vkb1 disabled auto-merge November 20, 2025 09:13
@vkb1 vkb1 enabled auto-merge (squash) November 20, 2025 09:14
@vkb1 vkb1 merged commit c7f93ac into main Nov 20, 2025
30 of 32 checks passed
@sathyendranv sathyendranv deleted the feature/svellais/merge_release_branch branch November 24, 2025 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@vkb1 vkb1 vkb1 approved these changes

@pooja-intel pooja-intel pooja-intel approved these changes

@xwu2intel xwu2intel Awaiting requested review from xwu2intel xwu2intel is a code owner

@SudarshanaPanda SudarshanaPanda Awaiting requested review from SudarshanaPanda SudarshanaPanda is a code owner

@rashmihe rashmihe Awaiting requested review from rashmihe rashmihe is a code owner

@sugnanprabhu sugnanprabhu Awaiting requested review from sugnanprabhu sugnanprabhu is a code owner

Assignees

No one assigned

Labels

2025.2 Time Series Sample Apps All the time series sample apps and multimodal sample app related activities for 2025.2 release

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@sathyendranv @vkb1 @pooja-intel @sgolebiewski-intel