Skip to content

MPT-6785 Sync upstream/2025041101-public -> main 2025-04-14 #107

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.

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

Merged
merged 56 commits into from
Apr 22, 2025

Conversation

github-actions[bot]
Copy link

This PR syncs the latest changes from upstream.

nk-hystax and others added 30 commits March 25, 2025 13:17
…ancers recommendation

- Updated ResourceMetrics component to include new metrics: bytes sent and packets sent.
- Improved loading state handling in ResourceMetrics
- Added support for the "Abandoned Load Balancers" recommendation
- Introduced AbandonedLoadBalancers modal and associated components for managing load balancer thresholds.
- Added new constants and chart properties for bytes and packets sent metrics.
- Updated translations for new features and metrics.
618b721 OSN-750. Live demo with abandoned LB
83e8c33 OSN-723. Enhance ResourceMetrics and add support for
AbandonedLoadBalancers recommendation
28b23d9 OSN-714. Abandoned Load Balancers recommendation support
…urce page (#1466)

## Description

The "Add Data Source" page description added.
…Comparison page (#1464)

## Description

Cloud cost comparison page description added.
ee93391 OSN-669. [OptScale][Community documentation] Add tips for Cloud Cost Comparison page
2ba0855 OSN-668. [OptScale][Community documentation] Add tips for Add Data Source page
99e72f9 OSN-733. Update jspdf to version 3.0.1
284d370 OSN-706. Update axios dependency to version 1.8.3
6aba699 OSN-717. Ability to deactivate organization
1b62cd9 OSN-718. Add organization disabled status and enhance action restrictions
…olidated "Disk I/O" metrics

- Added new metrics for Disk I/O usage and consolidated Disk I/O in ResourceMetrics component.
- Updated chart properties and constants to support new metrics.
df327c4 OSN-749. Enhance ResourceMetrics to include Disk I/O usage and
consolidated Disk I/O metrics
bc65775 OS-2418. More metrics for Alibaba RDS
…. (#1467)

## Description

The 'Events' page description added to community doc.
403c027 OSN-719. Fix rounding for totalCostWithoutHrsAggregated in RiSpExpensesBarChart component
7557fff OSN-694. Fixed getting gcp flavors
9917429 OSN-595. Add full-page loading state for initial and first-time organization data loading
ac54e6c OSN-715. Update dependencies
## Description

configure_custom_email_templates.md file added.
- Introduced a new field for maximum runset runners in the MlRunsetTemplate component.
- Updated related components and forms to handle the new maximum runset runners parameter.
- Updated translations to include the new label for maximum runset runners.
stanfra and others added 26 commits April 2, 2025 08:04
41e253e OSN-769. Fixed not cleaning filebeat indices in cleanelkdb
4ec352e OSN-756. Update vite related dependencies
6660c5e OSN-751. Fix request parameters to retrieve a run on the Add Artifact page
0aceba6 OSN-720. Transpose ComparisonTable
e36fa4a OSN-670. [OptScale][Community Documentation] Add tips for Events page.
8ba09ef OSN-704. Updated custom email templates link
440fa82 OSN-751. Fix request parameters to retrieve a run on the Edit run artifact page
8d15527 OSN-658. Support max runner number in runset template
fa9d696 OSN-771. Add maximum runset runners feature to MlRunsetTemplate
e64df14 OSN-704. Add Custom email templates instruction
## Description

 Instructions update.
2598786 OSN-744. [Developer Docs] Dev docs improvements
427a887 OSN-722. Do not exclude inactive resources from power schedule
d7af07f OSN-659: Fix mobile support for table with custom action items
d8a4810 OSN-741. Add activity status to power schedule instances
- Changed 'startFrom' to 'offset' in action creators, service types, and container to standardize pagination parameters.
…n theme settings. (#1484)

## Description

OSN-721. theme_settings.md page added.
…ndations page

- Updated the disabled state condition for the force check button to ensure it is only enabled when force check is available.
Refactor the form structure by displaying only cloud types in the cards. Subtypes are moved inside the form instead of being displayed on the main page.
* Added new fields to Azure subscription configuration, including export_name, container, directory, and support for billing export.
* Updated forms and GraphQL schemas to accommodate these changes
c2bc558 OSN-778. Fix the Force check button disabled state logic on Recommendations page
92d1e42 OSN-721. [OptScale][Developer Docs] Add instruction about organization theme settings.
a4720c5 OSN-743. Update API parameter naming for pagination
67f5f2f OSN-742. Rename start_from to offset
653c33c OSN-782. Changed table param for QueryUserOmsDataRequest
d99a772 OSN-768. Add support for Azure billing exports
3076402 OSN-623. Refactor data source connection form structure
9599390 OS-7759. Export Azure expense scheme
5c6d0c0 OSN-729. Support AWS LB in abandoned_load_balancers
ee29a73 OSN-783. Support Load Balancers recommendation for AWS cloud
- Modified links in email templates to append organization ID as a query parameter.
- Updated the HeraldExecutorWorker to pass the organization ID when generating constraint links.
## Checklist

* [ ] The pull request title is a good summary of the changes
* [ ] Unit tests for the changes exist
* [ ] New and existing unit tests pass locally
0d95aa2 OSN-XX. Fix test
03a644f OSN-773. Update email templates to include organization ID in
links
f2d5ba2 OSN-695. Fix 500 on updating schedule for task if schedule
deleted
d2defdd OSN-758. Use regions map to get regions names for AWS instead
of hardcoded
Copy link

@github-advanced-security github-advanced-security bot left a comment

Choose a reason for hiding this comment

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

Bandit found more than 20 potential problems in the proposed changes. Check the Files changed tab for more details.

@staticmethod
def _detect_billing_period(report_path):
billing_period = report_path.split('/')[-2]
LOG.info('detected billing period: %s', billing_period)

Check failure

Code scanning / CodeQL

Clear-text logging of sensitive information High

This expression logs
sensitive data (private)
as clear text.

Copilot Autofix

AI 3 months ago

To fix the issue, we should avoid logging the billing_period directly. Instead, we can log a generic or sanitized message that does not expose sensitive details. If logging the billing_period is necessary for debugging or operational purposes, we should ensure it is sanitized or masked before logging. Alternatively, we can remove the log statement entirely if it is not critical.


Suggested changeset 1
diworker/diworker/importers/azure_export.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/diworker/diworker/importers/azure_export.py b/diworker/diworker/importers/azure_export.py
--- a/diworker/diworker/importers/azure_export.py
+++ b/diworker/diworker/importers/azure_export.py
@@ -121,3 +121,4 @@
         billing_period = report_path.split('/')[-2]
-        LOG.info('detected billing period: %s', billing_period)
+        sanitized_billing_period = "[REDACTED]"  # Mask sensitive data
+        LOG.info('detected billing period: %s', sanitized_billing_period)
 
EOF
@@ -121,3 +121,4 @@
billing_period = report_path.split('/')[-2]
LOG.info('detected billing period: %s', billing_period)
sanitized_billing_period = "[REDACTED]" # Mask sensitive data
LOG.info('detected billing period: %s', sanitized_billing_period)

Copilot is powered by AI and may make mistakes. Always verify output.
else:
billing_info = self._retry(self._get_billing_info)
LOG.info('Billing info for subscription %s: %s',
self._subscription_id, billing_info)

Check failure

Code scanning / CodeQL

Clear-text logging of sensitive information High

This expression logs
sensitive data (private)
as clear text.
This expression logs
sensitive data (private)
as clear text.

Copilot Autofix

AI 3 months ago

To fix the issue, we will sanitize the billing_info dictionary before logging it. Specifically, we will redact or exclude sensitive fields such as billing_currency from the log output. This ensures that no sensitive information is exposed in the logs while still allowing non-sensitive data to be logged for debugging or informational purposes.

Steps to implement the fix:

  1. Identify the sensitive fields in the billing_info dictionary (e.g., billing_currency).
  2. Create a sanitized version of the dictionary by redacting or removing sensitive fields.
  3. Log the sanitized dictionary instead of the original billing_info.

Suggested changeset 1
tools/cloud_adapter/clouds/azure.py

Autofix patch

Autofix patch
Run the following command in your local git repository to apply this patch
cat << 'EOF' | git apply
diff --git a/tools/cloud_adapter/clouds/azure.py b/tools/cloud_adapter/clouds/azure.py
--- a/tools/cloud_adapter/clouds/azure.py
+++ b/tools/cloud_adapter/clouds/azure.py
@@ -607,4 +607,6 @@
             billing_info = self._retry(self._get_billing_info)
+            sanitized_billing_info = {k: (v if k != 'currency' else 'REDACTED') 
+                                      for k, v in billing_info.items()}
             LOG.info('Billing info for subscription %s: %s',
-                     self._subscription_id, billing_info)
+                     self._subscription_id, sanitized_billing_info)
 
EOF
@@ -607,4 +607,6 @@
billing_info = self._retry(self._get_billing_info)
sanitized_billing_info = {k: (v if k != 'currency' else 'REDACTED')
for k, v in billing_info.items()}
LOG.info('Billing info for subscription %s: %s',
self._subscription_id, billing_info)
self._subscription_id, sanitized_billing_info)

Copilot is powered by AI and may make mistakes. Always verify output.
@ffaraone ffaraone merged commit 44b1387 into main Apr 22, 2025
33 of 34 checks passed
@ffaraone ffaraone deleted the sync-2025041101-public branch May 13, 2025 15:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants