Merge branch 'main' into feature/permissions-improve

keephq · Nov 12, 2024 · 870eef5 · 870eef5
2 parents 4449583 + 689cacf
commit 870eef5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/keep-ui/app/providers/provider-form.tsx b/keep-ui/app/providers/provider-form.tsx
@@ -489,7 +489,7 @@ const ProviderForm = ({
             );
           } else if (updatedFormErrors.includes("Failed to fetch")) {
             setFormErrors(
-              "Failed to connect to API: Check your internet connection"
+              "Failed to connect to API: Check provider settings and your internet connection"
             );
           } else {
             setFormErrors(updatedFormErrors);

diff --git a/keep-ui/app/rules/CorrelationSidebar/CorrelationSidebarHeader.tsx b/keep-ui/app/rules/CorrelationSidebar/CorrelationSidebarHeader.tsx
@@ -20,7 +20,7 @@ export const CorrelationSidebarHeader = ({
           {isRuleBeingEdited ? "Edit" : "Create"} Correlation
         </Dialog.Title>
         <Dialog.Description as={Subtitle}>
-          Group multiple alerts into single alert
+          Group multiple alerts into a single incident
         </Dialog.Description>
       </div>
       <div>

diff --git a/keep-ui/utils/hooks/useAlerts.ts b/keep-ui/utils/hooks/useAlerts.ts
@@ -28,7 +28,7 @@ export const useAlerts = () => {
         selectedAlert && session
           ? `${apiUrl}/alerts/${
               selectedAlert.fingerprint
-            }/history/?provider_id=${selectedAlert.providerId}&provider_type=${
+            }/history?provider_id=${selectedAlert.providerId}&provider_type=${
               selectedAlert.source ? selectedAlert.source[0] : ""
             }`
           : null,

diff --git a/keep/providers/pagerduty_provider/pagerduty_provider.py b/keep/providers/pagerduty_provider/pagerduty_provider.py
@@ -507,7 +507,7 @@ def _format_alert(
         # If somebody connected the provider before we refactored it
         old_format_event = event.get("event", {})
         if old_format_event is not None and isinstance(old_format_event, dict):
-            return PagerdutyProvider._format_alert_old(old_format_event)
+            return PagerdutyProvider._format_alert_old(event)
 
         status = PagerdutyProvider.ALERT_STATUS_MAP.get(event.get("status", "firing"))
         severity = PagerdutyProvider.ALERT_SEVERITIES_MAP.get(