fix: topology not showing alert count and a few more (#4524)

Author: talboren

keep-ui/app/(keep)/topology/model/models.ts

@@ -29,6 +29,7 @@ export interface TopologyService {
   // Added on client to optimize rendering
   applications: TopologyApplicationMinimal[];
   incidents?: number;
+  alerts?: number;
   is_manual: boolean;
 }
 
@@ -38,7 +39,10 @@ export interface TopologyServiceWithMutator extends TopologyService {
 
 // We need to convert interface to type because only types are allowed in @xyflow/react
 // https://github.com/xyflow/web/issues/486
-export type ServiceNodeType = Node<InterfaceToType<TopologyServiceWithMutator>, string>;
+export type ServiceNodeType = Node<
+  InterfaceToType<TopologyServiceWithMutator>,
+  string
+>;
 
 export type TopologyNode = ServiceNodeType | Node;
 

keep-ui/app/(keep)/topology/ui/map/getNodesAndEdgesFromTopologyData.ts

@@ -13,11 +13,13 @@ import {
 } from "@/app/(keep)/topology/ui/map/styles";
 import { IncidentDto } from "@/entities/incidents/model";
 import { KeyedMutator } from "swr";
+import { AlertDto } from "@/entities/alerts/model";
 
 export function getNodesAndEdgesFromTopologyData(
   topologyData: TopologyService[],
   applicationsMap: Map<string, TopologyApplication>,
   allIncidents: IncidentDto[],
+  allAlerts: AlertDto[],
   topologyMutator: KeyedMutator<TopologyService[]>
 ) {
   const nodeMap = new Map<string, TopologyNode>();
@@ -36,6 +38,8 @@ export function getNodesAndEdgesFromTopologyData(
       data: {
         ...service,
         incidents: numIncidentsToService.length,
+        alerts: allAlerts.filter((alert) => alert.service === service.service)
+          .length,
         topologyMutator,
       },
       position: { x: 0, y: 0 }, // Dagre will handle the actual positioning

keep-ui/app/(keep)/topology/ui/map/service-node.tsx

@@ -99,11 +99,17 @@ export function ServiceNode({ data, selected }: NodeProps<ServiceNodeType>) {
     setIsTooltipReady(true);
   }, [showDetails]);
 
-  const handleClick = () => {
+  const handleIncidentClick = () => {
     router.push(`/incidents?services=${encodeURIComponent(data.display_name)}`);
   };
 
+  const handleAlertClick = () => {
+    const cel = `service=="${data.display_name}"`;
+    router.push(`/alerts/feed?cel=${encodeURIComponent(cel)}`);
+  };
+
   const incidentsCount = data.incidents ?? 0;
+  const alertsCount = data.alerts ?? 0;
   const badgeColor =
     incidentsCount < THRESHOLD ? "bg-orange-500" : "bg-red-500";
 
@@ -130,13 +136,22 @@ export function ServiceNode({ data, selected }: NodeProps<ServiceNodeType>) {
           </div>
         )}
         <strong className="text-lg">{data.display_name || data.service}</strong>
-        {incidentsCount > 0 && (
+        {incidentsCount > 0 ? (
+          <span
+            className={`absolute top-[-17px] right-[-20px] mt-2 mr-2 px-2 py-1 text-white text-[7px] leading-[7px] font-bold rounded-full ${badgeColor} hover:cursor-pointer`}
+            onClick={handleIncidentClick}
+          >
+            {incidentsCount} {incidentsCount === 1 ? "incident" : "incidents"}
+          </span>
+        ) : alertsCount > 0 ? (
           <span
-            className={`absolute top-[-20px] right-[-20px] mt-2 mr-2 px-2 py-1 text-white text-xs font-bold rounded-full ${badgeColor} hover:cursor-pointer`}
-            onClick={handleClick}
+            className={`absolute top-[-17px] right-[-20px] mt-2 mr-2 px-2 py-1 text-white text-[7px] leading-[7px] font-bold rounded-full ${badgeColor} hover:cursor-pointer`}
+            onClick={handleAlertClick}
           >
-            {incidentsCount}
+            {alertsCount} {alertsCount === 1 ? "alert" : "alerts"}
           </span>
+        ) : (
+          <></>
         )}
         <div className="flex flex-wrap gap-1">
           {data?.applications?.map((app) => {

keep-ui/app/(keep)/topology/ui/map/topology-map.tsx

@@ -72,6 +72,7 @@ import {
 import { downloadFileFromString } from "@/shared/lib/downloadFileFromString";
 import { PlusIcon } from "@heroicons/react/20/solid";
 import { TbTopologyRing } from "react-icons/tb";
+import { useAlerts } from "@/entities/alerts/model";
 
 const defaultFitViewOptions: FitViewOptions = {
   padding: 0.1,
@@ -451,7 +452,10 @@ export function TopologyMap({
 
   const previousNodesIds = useRef<Set<string>>(new Set());
 
-  const { data: allIncidents } = useIncidents();
+  const { useLastAlerts } = useAlerts();
+
+  const { data: allIncidents } = useIncidents(false, false);
+  const { data: allAlerts } = useLastAlerts(undefined);
 
   useEffect(
     function createAndSetLayoutedNodesAndEdges() {
@@ -463,6 +467,7 @@ export function TopologyMap({
         topologyData,
         applicationMap,
         allIncidents?.items ?? [],
+        allAlerts ?? [],
         mutateTopologyData
       );
 

keep-ui/entities/alerts/model/types.ts

@@ -101,7 +101,6 @@ export const AlertKnownKeys = [
   "ack_status",
   "deleted",
   "assignee",
-  "providerId",
   "checkbox",
   "alertMenu",
   "group",

keep-ui/entities/workflows/model/schema.ts

@@ -34,6 +34,7 @@ export const V2StepAlertTriggerSchema = z.object({
     alert: AlertTriggerValueSchema,
     source: z.string().optional(),
   }),
+  only_on_change: z.array(z.string()).optional(),
 });
 
 export const IncidentEventEnum = z.enum(["created", "updated", "deleted"]);

keep-ui/widgets/alerts-table/lib/alert-table-utils.tsx

@@ -50,6 +50,7 @@ import {
   ColumnRenameMapping,
   getColumnDisplayName,
 } from "@/widgets/alerts-table/ui/alert-table-column-rename";
+import { useProviders } from "@/utils/hooks/useProviders";
 
 export const DEFAULT_COLS = [
   "severity",
@@ -221,6 +222,7 @@ export const useAlertTableCols = (
     {}
   );
   const { data: incidents } = useIncidents();
+  const { data: providersData } = useProviders();
   const { isRowExpanded } = useExpandedRows(presetName);
   const [columnListFormats, setColumnListFormats] = useLocalStorage<
     Record<string, ListFormatOption>
@@ -311,7 +313,12 @@ export const useAlertTableCols = (
               </span>
             );
           }
-
+          if (context.column.id === "providerId") {
+            const provider = providersData?.installed_providers?.find(
+              (provider) => provider.id === value
+            );
+            return provider?.details?.name || value;
+          }
           if (context.column.id === "incident") {
             const incidentString = String(value || "");
             const incidentSplit = incidentString.split(",");

keep-ui/widgets/alerts-table/ui/ColumnSelection.tsx

@@ -40,10 +40,6 @@ export default function ColumnSelection({
     .filter((col) => col.getIsPinned() === false)
     .map((col) => col.id);
 
-  const selectedColumns = tableColumns
-    .filter((col) => col.getIsVisible() && col.getIsPinned() === false)
-    .map((col) => col.id);
-
   const filteredColumns = columnsOptions.filter((column) =>
     column.toLowerCase().includes(searchTerm.toLowerCase())
   );

keep-ui/widgets/alerts-table/ui/SettingsSelection.tsx

@@ -39,7 +39,7 @@ export default function SettingsSelection({
   });
 
   return (
-    <Popover>
+    <Popover as="div" className="flex items-center">
       {({ close }) => (
         <>
           <Popover.Button

keep-ui/widgets/alerts-table/ui/TitleAndFilters.tsx

@@ -112,9 +112,8 @@ export const TitleAndFilters = ({
           hasZoomOut={false}
           enableYearNavigation
         />
-        <div className="flex items-center">
-          <SettingsSelection table={table} presetName={presetName} />
-        </div>
+
+        <SettingsSelection table={table} presetName={presetName} />
       </div>
     </div>
   );

keep/api/models/incident.py

@@ -123,7 +123,14 @@ def alerts(self) -> List:
         from keep.api.core.db import get_incident_alerts_by_incident_id
         from keep.api.utils.enrichment_helpers import convert_db_alerts_to_dto_alerts
 
-        if not self._tenant_id:
+        try:
+            if not self._tenant_id:
+                return []
+        except Exception:
+            logging.getLogger(__name__).error(
+                "Tenant ID is not set in incident",
+                extra={"incident_id": self.id},
+            )
             return []
         alerts, _ = get_incident_alerts_by_incident_id(self._tenant_id, str(self.id))
         return convert_db_alerts_to_dto_alerts(alerts)
@@ -135,7 +142,7 @@ def set_default_values(cls, values: Dict[str, Any]) -> Dict[str, Any]:
         try:
             values["status"] = IncidentStatus(status)
         except ValueError:
-            logging.warning(
+            logging.getLogger(__name__).warning(
                 f"Invalid status value: {status}, setting default.",
                 extra={"event": values},
             )

keep/api/tasks/process_incident_task.py

@@ -119,6 +119,16 @@ def process_incident(
                                 "No alerts to add to incident, probably deduplicated",
                                 extra=extra,
                             )
+                    else:
+                        logger.info(
+                            "No alerts to add to incident",
+                            extra={
+                                **extra,
+                                "incident_id": incident_from_db.id,
+                                "incident_name": incident_from_db.name,
+                                "fingerprint": incident.fingerprint,
+                            },
+                        )
                 except Exception:
                     logger.exception("Error adding incident alerts", extra=extra)
                 logger.info("Processed incident", extra=extra)

keep/providers/pagerduty_provider/pagerduty_provider.py

@@ -849,7 +849,11 @@ def _get_specific_incident(self, incident_id: str):
 
     def __get_all_incidents_or_alerts(self, incident_id: str = None):
         self.logger.info(
-            "Getting incidents or alerts", extra={"incident_id": incident_id}
+            "Getting incidents or alerts",
+            extra={
+                "incident_id": incident_id,
+                "tenant_id": self.context_manager.tenant_id,
+            },
         )
         paginated_response = []
         offset = 0
@@ -879,7 +883,13 @@ def __get_all_incidents_or_alerts(self, incident_id: str = None):
                 response.raise_for_status()
                 response = response.json()
             except Exception:
-                self.logger.exception("Failed to get incidents or alerts")
+                self.logger.exception(
+                    "Failed to get incidents or alerts",
+                    extra={
+                        "incident_id": incident_id,
+                        "tenant_id": self.context_manager.tenant_id,
+                    },
+                )
                 raise
             offset = response.get("offset", 0)
             paginated_response.extend(response.get(resource, []))
@@ -903,6 +913,7 @@ def __get_all_incidents_or_alerts(self, incident_id: str = None):
             "Fetched all incidents or alerts",
             extra={
                 "count": len(paginated_response),
+                "incident_id": incident_id,
                 "tenant_id": self.context_manager.tenant_id,
             },
         )