-
-
-
-## Step 3: Configure domain and certificate (TLS)
-
-### Background
-
-Keep has three ingresses that allow external access to its various components:
-
-
-
-
-#### Validate ingress host
-
-```bash
-kubectl -n keep get ingress
-
-# You should see now the HOST underyour ingress, now with port 443:
-NAME CLASS HOSTS ADDRESS PORTS AGE
-keep-backend +Follow these steps to set it up. +
unEnrichAlert(key)}>
-
-
unEnrichAlert(key)}
+ >
+
+
{objectToJSONLine({[key]: json[key]})}{isLast(index) ? null : ","}
+ return ( ++ {objectToJSONLine({ [key]: json[key] })} + {isLast(index) ? null : ","} +
+ ); } } - }) - } + }); + }; const handleCopy = async () => { if (alert) { @@ -94,23 +110,31 @@ export const ViewAlertModal: React.FCAlert Details
- {/* Adjust gap as needed */}
+
diff --git a/keep-ui/app/alerts/alert-associate-incident-modal.tsx b/keep-ui/app/alerts/alert-associate-incident-modal.tsx
index d0124e824..622e8c893 100644
--- a/keep-ui/app/alerts/alert-associate-incident-modal.tsx
+++ b/keep-ui/app/alerts/alert-associate-incident-modal.tsx
@@ -6,7 +6,7 @@ import { useSession } from "next-auth/react";
import { useRouter } from "next/navigation";
import { FormEvent, useCallback, useEffect, useState } from "react";
import { toast } from "react-toastify";
-import { getApiURL } from "../../utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { useIncidents, usePollIncidents } from "../../utils/hooks/useIncidents";
import Loading from "../loading";
import { AlertDto } from "./models";
@@ -34,10 +34,10 @@ const AlertAssociateIncidentModal = ({
>();
// get the token
const { data: session } = useSession();
+ const apiUrl = useApiUrl();
const router = useRouter();
const associateAlertsHandler = async (incidentId: string) => {
- const apiUrl = getApiURL();
const response = await fetch(`${apiUrl}/incidents/${incidentId}/alerts`, {
method: "POST",
headers: {
diff --git a/keep-ui/app/alerts/alert-change-status-modal.tsx b/keep-ui/app/alerts/alert-change-status-modal.tsx
index 6dcb5bcf6..d090599dc 100644
--- a/keep-ui/app/alerts/alert-change-status-modal.tsx
+++ b/keep-ui/app/alerts/alert-change-status-modal.tsx
@@ -8,7 +8,7 @@ import Select, {
} from "react-select";
import { useState } from "react";
import { AlertDto, Status } from "./models";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { useSession } from "next-auth/react";
import { toast } from "react-toastify";
import {
@@ -79,6 +79,7 @@ export default function AlertChangeStatusModal({
const { useAllPresets } = usePresets();
const { mutate: presetsMutator } = useAllPresets();
const { useAllAlerts } = useAlerts();
+ const apiUrl = useApiUrl();
const { mutate: alertsMutator } = useAllAlerts(presetName, {
revalidateOnMount: false,
});
@@ -109,23 +110,26 @@ export default function AlertChangeStatusModal({
}
try {
- const response = await fetch(`${getApiURL()}/alerts/enrich?dispose_on_new_alert=true`, {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- Authorization: `Bearer ${session?.accessToken}`,
- },
- body: JSON.stringify({
- enrichments: {
- status: selectedStatus,
- ...(selectedStatus !== Status.Suppressed && {
- dismissed: false,
- dismissUntil: "",
- }),
+ const response = await fetch(
+ `${apiUrl}/alerts/enrich?dispose_on_new_alert=true`,
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ Authorization: `Bearer ${session?.accessToken}`,
},
- fingerprint: alert.fingerprint,
- }),
- });
+ body: JSON.stringify({
+ enrichments: {
+ status: selectedStatus,
+ ...(selectedStatus !== Status.Suppressed && {
+ dismissed: false,
+ dismissUntil: "",
+ }),
+ },
+ fingerprint: alert.fingerprint,
+ }),
+ }
+ );
if (response.ok) {
toast.success("Alert status changed successfully!");
diff --git a/keep-ui/app/alerts/alert-dismiss-modal.tsx b/keep-ui/app/alerts/alert-dismiss-modal.tsx
index 33b4b9968..11bf3d63f 100644
--- a/keep-ui/app/alerts/alert-dismiss-modal.tsx
+++ b/keep-ui/app/alerts/alert-dismiss-modal.tsx
@@ -1,12 +1,22 @@
import { useState, useEffect } from "react";
-import { Button, Title, Subtitle, Card, Tab, TabGroup, TabList, TabPanel, TabPanels } from "@tremor/react";
+import {
+ Button,
+ Title,
+ Subtitle,
+ Card,
+ Tab,
+ TabGroup,
+ TabList,
+ TabPanel,
+ TabPanels,
+} from "@tremor/react";
import Modal from "@/components/ui/Modal";
import DatePicker from "react-datepicker";
import "react-datepicker/dist/react-datepicker.css";
import "react-quill/dist/quill.snow.css";
import { AlertDto } from "./models";
import { format, set, isSameDay, isAfter, addMinutes } from "date-fns";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { useSession } from "next-auth/react";
import { usePresets } from "utils/hooks/usePresets";
import { useAlerts } from "utils/hooks/useAlerts";
@@ -34,15 +44,21 @@ export default function AlertDismissModal({
const { useAllPresets } = usePresets();
const { mutate: presetsMutator } = useAllPresets();
const { usePresetAlerts } = useAlerts();
- const { mutate: alertsMutator } = usePresetAlerts(presetName, { revalidateOnMount: false });
+ const { mutate: alertsMutator } = usePresetAlerts(presetName, {
+ revalidateOnMount: false,
+ });
const { data: session } = useSession();
-
+ const apiUrl = useApiUrl();
// Ensuring that the useEffect hook is called consistently
useEffect(() => {
const now = new Date();
const roundedMinutes = Math.ceil(now.getMinutes() / 15) * 15;
- const defaultTime = set(now, { minutes: roundedMinutes, seconds: 0, milliseconds: 0 });
+ const defaultTime = set(now, {
+ minutes: roundedMinutes,
+ seconds: 0,
+ milliseconds: 0,
+ });
setSelectedDateTime(defaultTime);
}, []);
@@ -69,7 +85,8 @@ export default function AlertDismissModal({
return;
}
- const dismissUntil = selectedTab === 0 ? null : selectedDateTime?.toISOString();
+ const dismissUntil =
+ selectedTab === 0 ? null : selectedDateTime?.toISOString();
const requests = alerts.map((alert: AlertDto) => {
const requestData = {
enrichments: {
@@ -80,7 +97,7 @@ export default function AlertDismissModal({
},
fingerprint: alert.fingerprint,
};
- return fetch(`${getApiURL()}/alerts/enrich`, {
+ return fetch(`${apiUrl}/alerts/enrich`, {
method: "POST",
headers: {
"Content-Type": "application/json",
@@ -181,9 +198,12 @@ export default function AlertDismissModal({
filterTime={filterPassedTime}
inline
calendarClassName="custom-datepicker"
-
/>
- {showError &&
+ {" "}
+ {/* Adjust gap as needed */}
setShowHighlightedOnly(!showHighlightedOnly)}
- />
-
-
diff --git a/keep-ui/app/alerts/alert-actions.tsx b/keep-ui/app/alerts/alert-actions.tsx
index 87a7be34c..5a4366944 100644
--- a/keep-ui/app/alerts/alert-actions.tsx
+++ b/keep-ui/app/alerts/alert-actions.tsx
@@ -1,7 +1,7 @@
import { useState } from "react";
import { Button } from "@tremor/react";
import { getSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { AlertDto } from "./models";
import { PlusIcon } from "@radix-ui/react-icons";
import { toast } from "react-toastify";
@@ -23,14 +23,16 @@ export default function AlertActions({
alerts,
clearRowSelection,
setDismissModalAlert,
- mutateAlerts
+ mutateAlerts,
}: Props) {
const router = useRouter();
const { useAllPresets } = usePresets();
+ const apiUrl = useApiUrl();
const { mutate: presetsMutator } = useAllPresets({
revalidateOnFocus: false,
});
- const [isIncidentSelectorOpen, setIsIncidentSelectorOpen] = useState(false);
+ const [isIncidentSelectorOpen, setIsIncidentSelectorOpen] =
+ useState(false);
const selectedAlerts = alerts.filter((_alert, index) =>
selectedRowIds.includes(index.toString())
@@ -54,7 +56,6 @@ export default function AlertActions({
);
const options = [{ value: formattedCel, label: "CEL" }];
const session = await getSession();
- const apiUrl = getApiURL();
const response = await fetch(`${apiUrl}/preset`, {
method: "POST",
headers: {
@@ -82,10 +83,10 @@ export default function AlertActions({
const showIncidentSelector = () => {
setIsIncidentSelectorOpen(true);
- }
+ };
const hideIncidentSelector = () => {
setIsIncidentSelectorOpen(false);
- }
+ };
const handleSuccessfulAlertsAssociation = () => {
hideIncidentSelector();
@@ -93,7 +94,7 @@ export default function AlertActions({
if (mutateAlerts) {
mutateAlerts();
}
- }
+ };
return (
();
// get the token
const { data: session } = useSession();
+ const apiUrl = useApiUrl();
// if this modal should not be open, do nothing
if (!alert) return null;
@@ -61,7 +62,7 @@ const AlertAssignTicketModal = ({
fingerprint: alert.fingerprint,
};
- const response = await fetch(`${getApiURL()}/alerts/enrich`, {
+ const response = await fetch(`${apiUrl}/alerts/enrich`, {
method: "POST",
headers: {
"Content-Type": "application/json",
@@ -225,18 +226,14 @@ const AlertAssignTicketModal = ({
@@ -130,10 +131,11 @@ export default function AlertActions({
Associate with incident
+ isOpen={isIncidentSelectorOpen}
+ alerts={selectedAlerts}
+ handleSuccess={handleSuccessfulAlertsAssociation}
+ handleClose={hideIncidentSelector}
+ />
);
}
diff --git a/keep-ui/app/alerts/alert-assign-ticket-modal.tsx b/keep-ui/app/alerts/alert-assign-ticket-modal.tsx
index 4b6c99cfc..f3920c764 100644
--- a/keep-ui/app/alerts/alert-assign-ticket-modal.tsx
+++ b/keep-ui/app/alerts/alert-assign-ticket-modal.tsx
@@ -5,7 +5,7 @@ import { PlusIcon } from "@heroicons/react/20/solid";
import { useForm, Controller, SubmitHandler } from "react-hook-form";
import { Providers } from "./../providers/providers";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { AlertDto } from "./models";
import Modal from "@/components/ui/Modal";
@@ -45,6 +45,7 @@ const AlertAssignTicketModal = ({
} = useFormMust choose a date
}
+ {showError && (
+
+ Must choose a date
+
+ )}
-
- {presetName ? "Update preset" : "Enter new preset name"} -
+{presetName ? "Update preset" : "Enter new preset name"}
diff --git a/keep-ui/app/alerts/alert-push-alert-to-server-modal.tsx b/keep-ui/app/alerts/alert-push-alert-to-server-modal.tsx
index 6362abc54..a842a0641 100644
--- a/keep-ui/app/alerts/alert-push-alert-to-server-modal.tsx
+++ b/keep-ui/app/alerts/alert-push-alert-to-server-modal.tsx
@@ -9,7 +9,7 @@ import {
} from "@tremor/react";
import Modal from "@/components/ui/Modal";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { useProviders } from "utils/hooks/useProviders";
import ImageWithFallback from "@/components/ImageWithFallback";
import { useAlerts } from "utils/hooks/useAlerts";
@@ -45,6 +45,7 @@ const PushAlertToServerModal = ({
const { data: session } = useSession();
const { data: providersData } = useProviders();
+ const apiUrl = useApiUrl();
const providers = providersData?.providers || [];
useEffect(() => {
@@ -82,7 +83,7 @@ const PushAlertToServerModal = ({
try {
const response = await fetch(
- `${getApiURL()}/alerts/event/${selectedSource.type}`,
+ `${apiUrl}/alerts/event/${selectedSource.type}`,
{
method: "POST",
headers: {
diff --git a/keep-ui/app/alerts/alert-run-workflow-modal.tsx b/keep-ui/app/alerts/alert-run-workflow-modal.tsx
new file mode 100644
index 000000000..3ade1e15a
--- /dev/null
+++ b/keep-ui/app/alerts/alert-run-workflow-modal.tsx
@@ -0,0 +1,88 @@
+import { Button, Select, SelectItem } from "@tremor/react";
+import { AlertDto } from "./models";
+import Modal from "@/components/ui/Modal";
+import { useWorkflows } from "utils/hooks/useWorkflows";
+import { useState } from "react";
+import { useSession } from "next-auth/react";
+import { useApiUrl } from "utils/hooks/useConfig";
+import { toast } from "react-toastify";
+import { useRouter } from "next/navigation";
+
+interface Props {
+ alert: AlertDto | null | undefined;
+ handleClose: () => void;
+}
+
+export default function AlertRunWorkflowModal({ alert, handleClose }: Props) {
+ /**
+ *
+ */
+ const [selectedWorkflowId, setSelectedWorkflowId] = useState<
+ string | undefined
+ >(undefined);
+ const { data: workflows } = useWorkflows({});
+ const { data: session } = useSession();
+ const router = useRouter();
+ const apiUrl = useApiUrl();
+
+ const isOpen = !!alert;
+
+ const clearAndClose = () => {
+ setSelectedWorkflowId(undefined);
+ handleClose();
+ };
+
+ const handleRun = async () => {
+ const response = await fetch(
+ `${apiUrl}/workflows/${selectedWorkflowId}/run`,
+ {
+ method: "POST",
+ headers: {
+ Authorization: `Bearer ${session?.accessToken}`,
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify(alert),
+ }
+ );
+
+ if (response.ok) {
+ // Workflow started successfully
+ toast.success("Workflow started successfully", { position: "top-left" });
+ const responseData = await response.json();
+ const { workflow_execution_id } = responseData;
+ router.push(
+ `/workflows/${selectedWorkflowId}/runs/${workflow_execution_id}`
+ );
+ } else {
+ toast.error("Failed to start workflow", { position: "top-left" });
+ }
+ clearAndClose();
+ };
+
+ return (
+
+ {workflows && (
+
+ )}
+
+
+ );
+}
diff --git a/keep-ui/app/alerts/alert-tab-modal.tsx b/keep-ui/app/alerts/alert-tab-modal.tsx
index dd72657c4..d5a99e7d6 100644
--- a/keep-ui/app/alerts/alert-tab-modal.tsx
+++ b/keep-ui/app/alerts/alert-tab-modal.tsx
@@ -3,23 +3,27 @@ import Modal from "@/components/ui/Modal";
import { Button, TextInput } from "@tremor/react";
import { AlertsRulesBuilder } from "app/alerts/alerts-rules-builder";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
interface AlertTabModalProps {
presetId: string;
isOpen: boolean;
onClose: () => void;
onAddTab: (name: string, filter: string) => void;
-
}
-const AlertTabModal = ({ presetId, isOpen, onClose, onAddTab }: AlertTabModalProps) => {
+const AlertTabModal = ({
+ presetId,
+ isOpen,
+ onClose,
+ onAddTab,
+}: AlertTabModalProps) => {
const [newTabName, setNewTabName] = useState("");
const [newTabFilter, setNewTabFilter] = useState("");
const [errors, setErrors] = useState({ name: false, filter: false });
const [backendError, setBackendError] = useState(null);
const { data: session } = useSession();
-
+ const apiUrl = useApiUrl();
const handleAddTab = async () => {
if (!newTabName || !newTabFilter) {
setErrors({
@@ -31,18 +35,22 @@ const AlertTabModal = ({ presetId, isOpen, onClose, onAddTab }: AlertTabModalPro
try {
// Send the new tab data to the backend
- const apiUrl = getApiURL();
const response = await fetch(`${apiUrl}/preset/${presetId}/tab`, {
- method: 'POST',
+ method: "POST",
headers: {
- 'Content-Type': 'application/json',
+ "Content-Type": "application/json",
Authorization: `Bearer ${session?.accessToken}`,
},
body: JSON.stringify({ name: newTabName, filter: newTabFilter }),
});
if (!response.ok) {
- throw new Error('Failed to add the new tab: ' + response.status + ' ' + response.statusText);
+ throw new Error(
+ "Failed to add the new tab: " +
+ response.status +
+ " " +
+ response.statusText
+ );
}
onAddTab(newTabName, newTabFilter);
@@ -51,10 +59,9 @@ const AlertTabModal = ({ presetId, isOpen, onClose, onAddTab }: AlertTabModalPro
setBackendError(null); // Clear any previous backend errors
onClose();
} catch (error) {
- if(error instanceof Error) {
+ if (error instanceof Error) {
setBackendError(error.message);
- }
- else{
+ } else {
setBackendError("An error occurred while adding the tab");
}
}
@@ -97,17 +104,21 @@ const AlertTabModal = ({ presetId, isOpen, onClose, onAddTab }: AlertTabModalPro
{errors.filter && (
diff --git a/keep-ui/app/alerts/alert-tabs.tsx b/keep-ui/app/alerts/alert-tabs.tsx
index 6c60fe9a2..37e93a0c7 100644
--- a/keep-ui/app/alerts/alert-tabs.tsx
+++ b/keep-ui/app/alerts/alert-tabs.tsx
@@ -1,10 +1,18 @@
import { FormEventHandler, useState } from "react";
-import { Button, TextInput, Tab, TabGroup, TabList, TabPanel, TabPanels } from "@tremor/react";
+import {
+ Button,
+ TextInput,
+ Tab,
+ TabGroup,
+ TabList,
+ TabPanel,
+ TabPanels,
+} from "@tremor/react";
import { AlertDto } from "./models";
import AlertTabModal from "./alert-tab-modal";
import { evalWithContext } from "./alerts-rules-builder";
import { XMarkIcon } from "@heroicons/react/24/outline";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { useSession } from "next-auth/react";
interface Tab {
id?: string;
@@ -20,16 +28,26 @@ interface Props {
setSelectedTab: (index: number) => void;
}
-const AlertTabs = ({ presetId, tabs, setTabs, selectedTab, setSelectedTab }: Props) => {
+const AlertTabs = ({
+ presetId,
+ tabs,
+ setTabs,
+ selectedTab,
+ setSelectedTab,
+}: Props) => {
const [isModalOpen, setIsModalOpen] = useState(false);
const { data: session } = useSession();
+ const apiUrl = useApiUrl();
const handleTabChange = (index: any) => {
setSelectedTab(index);
};
const addNewTab = (name: string, filter: string) => {
- const newTab = { name: name, filter: (alert: AlertDto) => evalWithContext(alert, filter) };
+ const newTab = {
+ name: name,
+ filter: (alert: AlertDto) => evalWithContext(alert, filter),
+ };
const updatedTabs = [...tabs];
updatedTabs.splice(tabs.length - 1, 0, newTab); // Insert the new tab before the last tab
@@ -38,20 +56,21 @@ const AlertTabs = ({ presetId, tabs, setTabs, selectedTab, setSelectedTab }: Pro
setSelectedTab(0); // Set the selected tab to first tab
};
-
const deleteTab = async (index: number) => {
const tabToDelete = tabs[index];
// if the tab has id, means it already in the database
try {
- const apiUrl = getApiURL();
- const response = await fetch(`${apiUrl}/preset/${presetId}/tab/${tabToDelete.id}`, {
- method: "DELETE",
- headers: {
- "Content-Type": "application/json",
- Authorization: `Bearer ${session?.accessToken}`,
- },
- });
+ const response = await fetch(
+ `${apiUrl}/preset/${presetId}/tab/${tabToDelete.id}`,
+ {
+ method: "DELETE",
+ headers: {
+ "Content-Type": "application/json",
+ Authorization: `Bearer ${session?.accessToken}`,
+ },
+ }
+ );
if (!response.ok) {
throw new Error("Failed to delete the tab");
@@ -72,38 +91,39 @@ const AlertTabs = ({ presetId, tabs, setTabs, selectedTab, setSelectedTab }: Pro
Filter is required
)} - {backendError && ( -{backendError}
- )} + {backendError &&{backendError}
}
- {tab.name.toLowerCase()}
- {index !== 0 && (
-
- )}
-
+
+ {tab.name.toLowerCase()}
+ {index !== 0 && (
+
+ )}
+
))}
-
-
-
-
-
+
+
+
+
+
+
+
+
+
)}
{provider.supports_webhook && (
-
- {webhookMarkdown}
-
-
- )}
+ descriptionLines.map((line, index) => (
+
+ {webhookMarkdown}
+
+ )}
+
+
{error.message}
+
- {error &&
);
};
diff --git a/keep-ui/app/workflows/manual-run-workflow-modal.tsx b/keep-ui/app/workflows/manual-run-workflow-modal.tsx
index 753dd0baf..bc1494f33 100644
--- a/keep-ui/app/workflows/manual-run-workflow-modal.tsx
+++ b/keep-ui/app/workflows/manual-run-workflow-modal.tsx
@@ -1,10 +1,10 @@
-import {Button, Select, SelectItem, Title} from "@tremor/react";
+import { Button, Select, SelectItem, Title } from "@tremor/react";
import Modal from "@/components/ui/Modal";
import { useWorkflows } from "utils/hooks/useWorkflows";
import { useState } from "react";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { toast } from "react-toastify";
import { useRouter } from "next/navigation";
import { IncidentDto } from "@/app/incidents/models";
@@ -16,7 +16,11 @@ interface Props {
handleClose: () => void;
}
-export default function ManualRunWorkflowModal({ alert, incident, handleClose }: Props) {
+export default function ManualRunWorkflowModal({
+ alert,
+ incident,
+ handleClose,
+}: Props) {
/**
*
*/
@@ -26,7 +30,7 @@ export default function ManualRunWorkflowModal({ alert, incident, handleClose }:
const { data: workflows } = useWorkflows({});
const { data: session } = useSession();
const router = useRouter();
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const isOpen = !!alert || !!incident;
@@ -44,7 +48,10 @@ export default function ManualRunWorkflowModal({ alert, incident, handleClose }:
Authorization: `Bearer ${session?.accessToken}`,
"Content-Type": "application/json",
},
- body: JSON.stringify({"type": alert ? "alert" : "incident", "body": alert ? alert : incident}),
+ body: JSON.stringify({
+ type: alert ? "alert" : "incident",
+ body: alert ? alert : incident,
+ }),
}
);
diff --git a/keep-ui/app/workflows/mockworkflows.tsx b/keep-ui/app/workflows/mockworkflows.tsx
index 0ea737931..9e0f0f653 100644
--- a/keep-ui/app/workflows/mockworkflows.tsx
+++ b/keep-ui/app/workflows/mockworkflows.tsx
@@ -1,6 +1,5 @@
import React, { useState } from "react";
import { MockAction, MockStep, MockWorkflow, Workflow } from "./models";
-import { getApiURL } from "../../utils/apiUrl";
import Loading from "../loading";
import { Button, Card, Tab, TabGroup, TabList } from "@tremor/react";
import Modal from "@/components/ui/Modal";
@@ -18,13 +17,16 @@ export function WorkflowSteps({ workflow }: { workflow: MockWorkflow }) {
Failed to upload the file: {error}
Please try again with another file.
+ Failed to upload the file: {error}
+
Please try again with another file.
+
{workflow?.steps?.map((step: any, index: number) => {
const provider = step?.provider;
- if (['threshold', 'assert', 'foreach'].includes(provider?.type)) {
+ if (["threshold", "assert", "foreach"].includes(provider?.type)) {
return null;
}
return (
<>
{provider && (
-
+
{index > 0 && (
+
{(index > 0 || isStepPresent) && (
(null);
+ const [loadingId, setLoadingId] = useState(null);
const getNameFromId = (id: string) => {
if (!id) {
@@ -147,7 +152,7 @@ export default function MockWorkflowCardSection({
)}
- {mockError && (
+ {mockError && (
(null);
diff --git a/keep-ui/components/navbar/CustomPresetAlertLinks.tsx b/keep-ui/components/navbar/CustomPresetAlertLinks.tsx
index 460d65fe7..f6465a5ef 100644
--- a/keep-ui/components/navbar/CustomPresetAlertLinks.tsx
+++ b/keep-ui/components/navbar/CustomPresetAlertLinks.tsx
@@ -1,7 +1,7 @@
import { CSSProperties, useEffect, useState } from "react";
import { Session } from "next-auth";
import { toast } from "react-toastify";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { usePresets } from "utils/hooks/usePresets";
import { AiOutlineSwap } from "react-icons/ai";
import { usePathname, useRouter } from "next/navigation";
@@ -22,7 +22,7 @@ import { CSS } from "@dnd-kit/utilities";
import { Preset } from "app/alerts/models";
import { AiOutlineSound } from "react-icons/ai";
// Using dynamic import to avoid hydration issues with react-player
-import dynamic from 'next/dynamic'
+import dynamic from "next/dynamic";
const ReactPlayer = dynamic(() => import("react-player"), { ssr: false });
// import css
import "./CustomPresetAlertLink.css";
@@ -60,12 +60,7 @@ const PresetAlert = ({ preset, pathname, deletePreset }: PresetAlertProps) => {
};
return (
-
+
{
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
- const { useAllPresets, presetsOrderFromLS, setPresetsOrderFromLS } = usePresets();
+ const { useAllPresets, presetsOrderFromLS, setPresetsOrderFromLS } =
+ usePresets();
const { data: presets = [], mutate: presetsMutator } = useAllPresets({
revalidateIfStale: false,
revalidateOnFocus: false,
@@ -126,16 +122,26 @@ export const CustomPresetAlertLinks = ({
useEffect(() => {
const filteredLS = presetsOrderFromLS.filter(
- (preset) => !["feed", "deleted", "dismissed", "without-incident", "groups"].includes(preset.name)
+ (preset) =>
+ ![
+ "feed",
+ "deleted",
+ "dismissed",
+ "without-incident",
+ "groups",
+ ].includes(preset.name)
);
// Combine live presets and local storage order
- const combinedOrder = presets.reduce((acc, preset: Preset) => {
- if (!acc.find((p) => p.id === preset.id)) {
- acc.push(preset);
- }
- return acc.filter((preset) => checkValidPreset(preset));
- }, [...filteredLS]);
+ const combinedOrder = presets.reduce(
+ (acc, preset: Preset) => {
+ if (!acc.find((p) => p.id === preset.id)) {
+ acc.push(preset);
+ }
+ return acc.filter((preset) => checkValidPreset(preset));
+ },
+ [...filteredLS]
+ );
// Only update state if there's an actual change to prevent infinite loops
if (JSON.stringify(presetsOrder) !== JSON.stringify(combinedOrder)) {
@@ -143,11 +149,12 @@ export const CustomPresetAlertLinks = ({
}
}, [presets, presetsOrderFromLS]);
// Filter presets based on tags, or return all if no tags are selected
- const filteredOrderedPresets = selectedTags.length === 0
- ? presetsOrder
- : presetsOrder.filter((preset) =>
- preset.tags.some((tag) => selectedTags.includes(tag.name))
- );
+ const filteredOrderedPresets =
+ selectedTags.length === 0
+ ? presetsOrder
+ : presetsOrder.filter((preset) =>
+ preset.tags.some((tag) => selectedTags.includes(tag.name))
+ );
const sensors = useSensors(
useSensor(PointerSensor, {
activationConstraint: {
diff --git a/keep-ui/components/navbar/DashboardLinks.tsx b/keep-ui/components/navbar/DashboardLinks.tsx
index 948be30ad..cf0cab3d4 100644
--- a/keep-ui/components/navbar/DashboardLinks.tsx
+++ b/keep-ui/components/navbar/DashboardLinks.tsx
@@ -15,7 +15,7 @@ import { Disclosure } from "@headlessui/react";
import { IoChevronUp } from "react-icons/io5";
import classNames from "classnames";
import { useDashboards } from "utils/hooks/useDashboards";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "utils/hooks/useConfig";
import { Session } from "next-auth";
import { PlusIcon } from "@radix-ui/react-icons";
@@ -28,6 +28,7 @@ export const DashboardLinks = ({ session }: DashboardProps) => {
const { dashboards = [], isLoading, error, mutate } = useDashboards();
const pathname = usePathname();
const router = useRouter();
+ const apiUrl = useApiUrl();
const sensors = useSensors(useSensor(PointerSensor), useSensor(TouchSensor));
@@ -51,7 +52,6 @@ export const DashboardLinks = ({ session }: DashboardProps) => {
);
if (isDeleteConfirmed) {
try {
- const apiUrl = getApiURL();
await fetch(`${apiUrl}/dashboard/${id}`, {
method: "DELETE",
headers: {
diff --git a/keep-ui/middleware.tsx b/keep-ui/middleware.tsx
index 9c405978d..4f3390cfd 100644
--- a/keep-ui/middleware.tsx
+++ b/keep-ui/middleware.tsx
@@ -5,6 +5,8 @@ import { getApiURL } from "utils/apiUrl";
export default withAuth(
function middleware(req) {
const { pathname, searchParams } = new URL(req.url);
+ // Shahar: This is just for backward compatibility
+ // **should be removed**
// Redirect /backend/ to the API
if (pathname.startsWith("/backend/")) {
let apiUrl = getApiURL();
diff --git a/keep-ui/pages/api/config.tsx b/keep-ui/pages/api/config.tsx
index 07ef9a2a6..e052a7022 100644
--- a/keep-ui/pages/api/config.tsx
+++ b/keep-ui/pages/api/config.tsx
@@ -1,5 +1,10 @@
import type { NextApiRequest, NextApiResponse } from "next";
-import { AuthenticationType, MULTI_TENANT, SINGLE_TENANT, NO_AUTH } from "utils/authenticationType";
+import {
+ AuthenticationType,
+ MULTI_TENANT,
+ SINGLE_TENANT,
+ NO_AUTH,
+} from "utils/authenticationType";
export default async function handler(
req: NextApiRequest,
@@ -19,13 +24,20 @@ export default async function handler(
res.status(200).json({
AUTH_TYPE: authType,
PUSHER_DISABLED: process.env.PUSHER_DISABLED === "true",
+ // could be relative (for ingress) or absolute (e.g. Pusher)
PUSHER_HOST: process.env.PUSHER_HOST,
PUSHER_PORT: process.env.PUSHER_HOST
? parseInt(process.env.PUSHER_PORT!)
: undefined,
PUSHER_APP_KEY: process.env.PUSHER_APP_KEY,
PUSHER_CLUSTER: process.env.PUSHER_CLUSTER,
+ // The API URL is used by the server to make requests to the API
+ // note that we need two different URLs for the client and the server
+ // because in some environments, e.g. docker-compose, the server can get keep-backend
+ // whereas the client (browser) can get only localhost
API_URL: process.env.API_URL,
+ // could be relative (e.g. for ingress) or absolute (e.g. for cloud run)
+ API_URL_CLIENT: process.env.API_URL_CLIENT,
POSTHOG_KEY: process.env.POSTHOG_KEY,
POSTHOG_DISABLED: process.env.POSTHOG_DISABLED,
POSTHOG_HOST: process.env.POSTHOG_HOST,
diff --git a/keep-ui/types/internal-config.ts b/keep-ui/types/internal-config.ts
index 522e3da87..e8a368cd0 100644
--- a/keep-ui/types/internal-config.ts
+++ b/keep-ui/types/internal-config.ts
@@ -5,7 +5,13 @@ export interface InternalConfig {
PUSHER_PORT?: number;
PUSHER_APP_KEY: string;
PUSHER_CLUSTER?: string;
+ PUSHER_INGRESS: boolean; // e.g. for kubernetes/helmchart where the websocket endpoint is through the ingress
POSTHOG_KEY: string;
POSTHOG_HOST: string;
POSTHOG_DISABLED: string;
+ // the API URL is used by the server to make requests to the API
+ API_URL: string;
+ // the API URL for the client (browser)
+ // optional, defaults to /backend (relative)
+ API_URL_CLIENT?: string;
}
diff --git a/keep-ui/utils/apiUrl.ts b/keep-ui/utils/apiUrl.ts
index 22478957f..10e8c7878 100644
--- a/keep-ui/utils/apiUrl.ts
+++ b/keep-ui/utils/apiUrl.ts
@@ -1,21 +1,6 @@
+// server only!
export function getApiURL(): string {
- // https://github.com/vercel/next.js/issues/5354#issuecomment-520305040
- // https://stackoverflow.com/questions/49411796/how-do-i-detect-whether-i-am-on-server-on-client-in-next-js
-
- // Some background on this:
- // On docker-compose, the browser can't access the "http://keep-backend" url
- // since its the name of the container (and not accesible from the host)
- // so we need to use the "http://localhost:3000" url instead.
- const componentType = typeof window === "undefined" ? "server" : "client";
-
- // if its client, use the same url as the browser but with the "/backend" prefix so that middleware.ts can proxy the request to the backend
- if (componentType === "client") {
- return "/backend";
- }
-
- // SERVER ONLY FROM HERE ON
-
- // else, its the server, and we need to check if we are on vercel or not
+ // we need to check if we are on vercel or not
const gitBranchName = process.env.VERCEL_GIT_COMMIT_REF || "notvercel";
// main branch or not vercel - use the normal url
if (gitBranchName === "main" || gitBranchName === "notvercel") {
diff --git a/keep-ui/utils/helpers.ts b/keep-ui/utils/helpers.ts
index a54434487..1fd58bd4d 100644
--- a/keep-ui/utils/helpers.ts
+++ b/keep-ui/utils/helpers.ts
@@ -1,5 +1,4 @@
import { toast } from "react-toastify";
-import { getApiURL } from "./apiUrl";
import { Provider } from "../app/providers/providers";
import moment from "moment";
import { twMerge } from "tailwind-merge";
@@ -39,12 +38,14 @@ export function toDateObjectWithFallback(date: string | Date) {
return new Date();
}
-export async function installWebhook(provider: Provider, accessToken: string) {
+export async function installWebhook(
+ provider: Provider,
+ accessToken: string,
+ apiUrl: string
+) {
return toast.promise(
fetch(
- `${getApiURL()}/providers/install/webhook/${provider.type}/${
- provider.id
- }`,
+ `${apiUrl}/providers/install/webhook/${provider.type}/${provider.id}`,
{
method: "POST",
headers: {
diff --git a/keep-ui/utils/hooks/useAI.ts b/keep-ui/utils/hooks/useAI.ts
index 57af67d73..329830b32 100644
--- a/keep-ui/utils/hooks/useAI.ts
+++ b/keep-ui/utils/hooks/useAI.ts
@@ -1,19 +1,18 @@
import { AILogs, AIStats } from "app/ai/model";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { useWebsocket } from "./usePusher";
import { useCallback, useEffect } from "react";
-
export const useAIStats = (
options: SWRConfiguration = {
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
@@ -38,4 +37,4 @@ export const usePollAILogs = (mutateAILogs: (logs: AILogs) => void) => {
unbind("ai-logs-change", handleIncoming);
};
}, [bind, unbind, handleIncoming]);
-};
\ No newline at end of file
+};
diff --git a/keep-ui/utils/hooks/useAlerts.ts b/keep-ui/utils/hooks/useAlerts.ts
index 8b0686b62..27ce9555e 100644
--- a/keep-ui/utils/hooks/useAlerts.ts
+++ b/keep-ui/utils/hooks/useAlerts.ts
@@ -2,7 +2,7 @@ import { useState, useEffect } from "react";
import { AlertDto } from "app/alerts/models";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { toDateObjectWithFallback } from "utils/helpers";
@@ -16,7 +16,7 @@ export type AuditEvent = {
};
export const useAlerts = () => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
const useAlertHistory = (
diff --git a/keep-ui/utils/hooks/useConfig.ts b/keep-ui/utils/hooks/useConfig.ts
index 68de69202..7356783e2 100644
--- a/keep-ui/utils/hooks/useConfig.ts
+++ b/keep-ui/utils/hooks/useConfig.ts
@@ -10,3 +10,15 @@ export const useConfig = () => {
fetcher("/api/config", session?.accessToken)
);
};
+
+export const useApiUrl = () => {
+ const { data: config } = useConfig();
+
+ if (config?.API_URL_CLIENT) {
+ return config.API_URL_CLIENT;
+ }
+
+ // backward compatibility or for docker-compose or other deployments where the browser
+ // can't access the API directly
+ return "/backend";
+};
diff --git a/keep-ui/utils/hooks/useDashboards.ts b/keep-ui/utils/hooks/useDashboards.ts
index de61bd967..7f3c81245 100644
--- a/keep-ui/utils/hooks/useDashboards.ts
+++ b/keep-ui/utils/hooks/useDashboards.ts
@@ -1,6 +1,6 @@
import useSWR from "swr";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export interface Dashboard {
@@ -11,7 +11,7 @@ export interface Dashboard {
export const useDashboards = () => {
const { data: session } = useSession();
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data, error, mutate } = useSWR(
session ? `${apiUrl}/dashboard` : null,
diff --git a/keep-ui/utils/hooks/useDeduplicationRules.ts b/keep-ui/utils/hooks/useDeduplicationRules.ts
index 1d6d43c54..54b68015b 100644
--- a/keep-ui/utils/hooks/useDeduplicationRules.ts
+++ b/keep-ui/utils/hooks/useDeduplicationRules.ts
@@ -2,11 +2,11 @@ import { DeduplicationRule } from "app/deduplication/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useDeduplicationRules = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
@@ -17,7 +17,7 @@ export const useDeduplicationRules = (options: SWRConfiguration = {}) => {
};
export const useDeduplicationFields = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable>(
diff --git a/keep-ui/utils/hooks/useExtractionRules.ts b/keep-ui/utils/hooks/useExtractionRules.ts
index 779509bdd..0ff32b445 100644
--- a/keep-ui/utils/hooks/useExtractionRules.ts
+++ b/keep-ui/utils/hooks/useExtractionRules.ts
@@ -1,7 +1,7 @@
import { ExtractionRule } from "app/extraction/model";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useExtractions = (
@@ -9,7 +9,7 @@ export const useExtractions = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/useGroups.ts b/keep-ui/utils/hooks/useGroups.ts
index 0c2ed17fe..3e1dde9a2 100644
--- a/keep-ui/utils/hooks/useGroups.ts
+++ b/keep-ui/utils/hooks/useGroups.ts
@@ -2,11 +2,11 @@ import { Group } from "app/settings/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useGroups = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/useIncidents.ts b/keep-ui/utils/hooks/useIncidents.ts
index 9e94c6386..b3ba58a26 100644
--- a/keep-ui/utils/hooks/useIncidents.ts
+++ b/keep-ui/utils/hooks/useIncidents.ts
@@ -7,7 +7,7 @@ import {
import { PaginatedWorkflowExecutionDto } from "app/workflows/builder/types";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { useWebsocket } from "./usePusher";
import { useCallback, useEffect } from "react";
@@ -35,7 +35,7 @@ export const useIncidents = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
const filtersParams = new URLSearchParams();
@@ -70,7 +70,7 @@ export const useIncidentAlerts = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
() =>
@@ -88,7 +88,7 @@ export const useIncidentFutureIncidents = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
@@ -105,7 +105,7 @@ export const useIncident = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
@@ -123,7 +123,7 @@ export const useIncidentWorkflowExecutions = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
() =>
@@ -192,7 +192,7 @@ export const useIncidentsMeta = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/useMaintenanceRules.ts b/keep-ui/utils/hooks/useMaintenanceRules.ts
index 0e46f54b9..b771615b1 100644
--- a/keep-ui/utils/hooks/useMaintenanceRules.ts
+++ b/keep-ui/utils/hooks/useMaintenanceRules.ts
@@ -1,7 +1,7 @@
import { MaintenanceRule } from "app/maintenance/model";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useMaintenanceRules = (
@@ -9,7 +9,7 @@ export const useMaintenanceRules = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/useMappingRules.ts b/keep-ui/utils/hooks/useMappingRules.ts
index 87db305a1..cf116bc9c 100644
--- a/keep-ui/utils/hooks/useMappingRules.ts
+++ b/keep-ui/utils/hooks/useMappingRules.ts
@@ -1,7 +1,7 @@
import { MappingRule } from "app/mapping/models";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useMappings = (
@@ -9,7 +9,7 @@ export const useMappings = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/usePermissions.ts b/keep-ui/utils/hooks/usePermissions.ts
index 3248cc082..b240ec2f6 100644
--- a/keep-ui/utils/hooks/usePermissions.ts
+++ b/keep-ui/utils/hooks/usePermissions.ts
@@ -2,11 +2,11 @@ import { Permission } from "app/settings/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const usePermissions = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/usePresets.ts b/keep-ui/utils/hooks/usePresets.ts
index b4b9d5509..3559427d9 100644
--- a/keep-ui/utils/hooks/usePresets.ts
+++ b/keep-ui/utils/hooks/usePresets.ts
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef } from "react";
import { Preset } from "app/alerts/models";
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { useLocalStorage } from "utils/hooks/useLocalStorage";
import { useConfig } from "./useConfig";
@@ -14,7 +14,7 @@ import moment from "moment";
export const usePresets = (type?: string, useFilters?: boolean) => {
const { data: session } = useSession();
const { data: configData } = useConfig();
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
//ideally, we can use pathname. but hardcoding it for now.
const isDashBoard = type === "dashboard";
const [presetsOrderFromLS, setPresetsOrderFromLS] = useLocalStorage(
@@ -54,8 +54,8 @@ export const usePresets = (type?: string, useFilters?: boolean) => {
...currentPreset,
alerts_count: currentPreset.alerts_count + newPreset.alerts_count,
created_by: newPreset.created_by,
- is_private: newPreset.is_private
- });
+ is_private: newPreset.is_private,
+ });
} else {
// If the preset is not in the current presets, add it
updatedPresets.set(newPresetId, {
@@ -71,7 +71,14 @@ export const usePresets = (type?: string, useFilters?: boolean) => {
updatePresets(
presetsOrderRef.current,
newPresets.filter(
- (p) => !["feed", "deleted", "dismissed", "without-incident", "groups"].includes(p.name)
+ (p) =>
+ ![
+ "feed",
+ "deleted",
+ "dismissed",
+ "without-incident",
+ "groups",
+ ].includes(p.name)
)
)
);
@@ -79,7 +86,13 @@ export const usePresets = (type?: string, useFilters?: boolean) => {
updatePresets(
staticPresetsOrderRef.current,
newPresets.filter((p) =>
- ["feed", "deleted", "dismissed", "without-incident", "groups"].includes(p.name)
+ [
+ "feed",
+ "deleted",
+ "dismissed",
+ "without-incident",
+ "groups",
+ ].includes(p.name)
)
)
);
@@ -126,10 +139,22 @@ export const usePresets = (type?: string, useFilters?: boolean) => {
if (data) {
const dynamicPresets = data.filter(
(p) =>
- !["feed", "deleted", "dismissed", "without-incident", "groups"].includes(p.name)
+ ![
+ "feed",
+ "deleted",
+ "dismissed",
+ "without-incident",
+ "groups",
+ ].includes(p.name)
);
const staticPresets = data.filter((p) =>
- ["feed", "deleted", "dismissed", "without-incident", "groups"].includes(p.name)
+ [
+ "feed",
+ "deleted",
+ "dismissed",
+ "without-incident",
+ "groups",
+ ].includes(p.name)
);
//if it is dashboard we don't need to merge with local storage.
@@ -193,7 +218,13 @@ export const usePresets = (type?: string, useFilters?: boolean) => {
} = useFetchAllPresets(options);
const filteredPresets = presets?.filter(
(preset) =>
- !["feed", "deleted", "dismissed", "groups", "without-incident"].includes(preset.name)
+ ![
+ "feed",
+ "deleted",
+ "dismissed",
+ "groups",
+ "without-incident",
+ ].includes(preset.name)
);
return {
data: filteredPresets,
diff --git a/keep-ui/utils/hooks/useProviders.ts b/keep-ui/utils/hooks/useProviders.ts
index f7d3d854f..668af3a1e 100644
--- a/keep-ui/utils/hooks/useProviders.ts
+++ b/keep-ui/utils/hooks/useProviders.ts
@@ -1,5 +1,5 @@
import { useSession } from "next-auth/react";
-import { getApiURL } from "../apiUrl";
+import { useApiUrl } from "./useConfig";
import { SWRConfiguration } from "swr";
import { ProvidersResponse } from "app/providers/providers";
import { fetcher } from "../fetcher";
@@ -9,7 +9,7 @@ export const useProviders = (
options: SWRConfiguration = { revalidateOnFocus: false }
) => {
const { data: session } = useSession();
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
return useSWRImmutable(
() => (session ? `${apiUrl}/providers` : null),
diff --git a/keep-ui/utils/hooks/usePusher.ts b/keep-ui/utils/hooks/usePusher.ts
index 106c46384..57828a2a3 100644
--- a/keep-ui/utils/hooks/usePusher.ts
+++ b/keep-ui/utils/hooks/usePusher.ts
@@ -1,18 +1,21 @@
import Pusher from "pusher-js";
import { useConfig } from "./useConfig";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
let PUSHER: Pusher | null = null;
const POLLING_INTERVAL = 3000;
export const useWebsocket = () => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: configData } = useConfig();
const { data: session } = useSession();
let channelName = `private-${session?.tenantId}`;
+ console.log("useWebsocket: Initializing with config:", configData);
+ console.log("useWebsocket: Session:", session);
+
if (
PUSHER === null &&
configData !== undefined &&
@@ -20,34 +23,73 @@ export const useWebsocket = () => {
configData.PUSHER_DISABLED === false
) {
channelName = `private-${session?.tenantId}`;
- PUSHER = new Pusher(configData.PUSHER_APP_KEY, {
- wsHost: configData.PUSHER_HOST,
- wsPort: configData.PUSHER_PORT,
- forceTLS: false,
- disableStats: true,
- enabledTransports: ["ws", "wss"],
- cluster: configData.PUSHER_CLUSTER || "local",
- channelAuthorization: {
- transport: "ajax",
- endpoint: `${apiUrl}/pusher/auth`,
- headers: {
- Authorization: `Bearer ${session?.accessToken!}`,
+ console.log("useWebsocket: Creating new Pusher instance");
+ try {
+ const isRelativeHost =
+ configData.PUSHER_HOST && !configData.PUSHER_HOST.includes("://");
+ console.log("useWebsocket: isRelativeHost:", isRelativeHost);
+ PUSHER = new Pusher(configData.PUSHER_APP_KEY, {
+ wsHost: isRelativeHost
+ ? window.location.hostname
+ : configData.PUSHER_HOST,
+ wsPath: isRelativeHost ? configData.PUSHER_HOST : "",
+ wsPort: isRelativeHost
+ ? window.location.protocol === "https:"
+ ? 443
+ : 80
+ : configData.PUSHER_PORT,
+ forceTLS: window.location.protocol === "https:",
+ disableStats: true,
+ enabledTransports: ["ws", "wss"],
+ cluster: configData.PUSHER_CLUSTER || "local",
+ channelAuthorization: {
+ transport: "ajax",
+ endpoint: `${apiUrl}/pusher/auth`,
+ headers: {
+ Authorization: `Bearer ${session?.accessToken!}`,
+ },
},
- },
- });
- PUSHER.subscribe(channelName);
+ });
+ console.log("useWebsocket: Pusher instance created successfully");
+
+ PUSHER.connection.bind("connected", () => {
+ console.log("useWebsocket: Pusher connected successfully");
+ });
+
+ PUSHER.connection.bind("error", (err: any) => {
+ console.error("useWebsocket: Pusher connection error:", err);
+ });
+
+ PUSHER.subscribe(channelName)
+ .bind("pusher:subscription_succeeded", () => {
+ console.log(
+ `useWebsocket: Successfully subscribed to ${channelName}`
+ );
+ })
+ .bind("pusher:subscription_error", (err: any) => {
+ console.error(
+ `useWebsocket: Subscription error for ${channelName}:`,
+ err
+ );
+ });
+ } catch (error) {
+ console.error("useWebsocket: Error creating Pusher instance:", error);
+ }
}
const subscribe = useCallback(() => {
+ console.log(`useWebsocket: Subscribing to ${channelName}`);
return PUSHER?.subscribe(channelName);
}, [channelName]);
const unsubscribe = useCallback(() => {
+ console.log(`useWebsocket: Unsubscribing from ${channelName}`);
return PUSHER?.unsubscribe(channelName);
}, [channelName]);
const bind = useCallback(
(event: any, callback: any) => {
+ console.log(`useWebsocket: Binding to event ${event} on ${channelName}`);
return PUSHER?.channel(channelName)?.bind(event, callback);
},
[channelName]
@@ -55,6 +97,9 @@ export const useWebsocket = () => {
const unbind = useCallback(
(event: any, callback: any) => {
+ console.log(
+ `useWebsocket: Unbinding from event ${event} on ${channelName}`
+ );
return PUSHER?.channel(channelName)?.unbind(event, callback);
},
[channelName]
@@ -62,12 +107,17 @@ export const useWebsocket = () => {
const trigger = useCallback(
(event: any, data: any) => {
+ console.log(
+ `useWebsocket: Triggering event ${event} on ${channelName} with data:`,
+ data
+ );
return PUSHER?.channel(channelName).trigger(event, data);
},
[channelName]
);
const channel = useCallback(() => {
+ console.log(`useWebsocket: Getting channel ${channelName}`);
return PUSHER?.channel(channelName);
}, [channelName]);
@@ -86,24 +136,40 @@ export const useAlertPolling = () => {
const [pollAlerts, setPollAlerts] = useState(0);
const lastPollTimeRef = useRef(0);
+ console.log("useAlertPolling: Initializing");
+
const handleIncoming = useCallback((incoming: any) => {
+ console.log("useAlertPolling: Received incoming data:", incoming);
const currentTime = Date.now();
const timeSinceLastPoll = currentTime - lastPollTimeRef.current;
+ console.log(
+ `useAlertPolling: Time since last poll: ${timeSinceLastPoll}ms`
+ );
+
if (timeSinceLastPoll < POLLING_INTERVAL) {
+ console.log("useAlertPolling: Ignoring poll due to short interval");
setPollAlerts(0);
} else {
+ console.log("useAlertPolling: Updating poll alerts");
lastPollTimeRef.current = currentTime;
- setPollAlerts(Math.floor(Math.random() * 10000));
+ const newPollValue = Math.floor(Math.random() * 10000);
+ console.log(`useAlertPolling: New poll value: ${newPollValue}`);
+ setPollAlerts(newPollValue);
}
}, []);
useEffect(() => {
+ console.log("useAlertPolling: Setting up event listener for 'poll-alerts'");
bind("poll-alerts", handleIncoming);
return () => {
+ console.log(
+ "useAlertPolling: Cleaning up event listener for 'poll-alerts'"
+ );
unbind("poll-alerts", handleIncoming);
};
}, [bind, unbind, handleIncoming]);
+ console.log("useAlertPolling: Current poll alerts value:", pollAlerts);
return { data: pollAlerts };
};
diff --git a/keep-ui/utils/hooks/useRoles.ts b/keep-ui/utils/hooks/useRoles.ts
index f71a048a6..dabfc9b58 100644
--- a/keep-ui/utils/hooks/useRoles.ts
+++ b/keep-ui/utils/hooks/useRoles.ts
@@ -2,11 +2,11 @@ import { Role } from "app/settings/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useRoles = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/useRules.ts b/keep-ui/utils/hooks/useRules.ts
index 3a710ed88..97976d51e 100644
--- a/keep-ui/utils/hooks/useRules.ts
+++ b/keep-ui/utils/hooks/useRules.ts
@@ -1,6 +1,6 @@
import { useSession } from "next-auth/react";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export type Rule = {
@@ -25,7 +25,7 @@ export type Rule = {
};
export const useRules = (options?: SWRConfiguration) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/useScopes.ts b/keep-ui/utils/hooks/useScopes.ts
index 8d437e8c1..775d8717a 100644
--- a/keep-ui/utils/hooks/useScopes.ts
+++ b/keep-ui/utils/hooks/useScopes.ts
@@ -2,11 +2,11 @@ import { Scope } from "app/settings/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useScopes = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/useSearchAlerts.ts b/keep-ui/utils/hooks/useSearchAlerts.ts
index 1eb580ddf..01de3fe14 100644
--- a/keep-ui/utils/hooks/useSearchAlerts.ts
+++ b/keep-ui/utils/hooks/useSearchAlerts.ts
@@ -1,7 +1,7 @@
import useSWR, { SWRConfiguration } from "swr";
import { AlertDto } from "app/alerts/models";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { useDebouncedValue } from "./useDebouncedValue";
import { RuleGroupType, formatQuery } from "react-querybuilder";
@@ -10,7 +10,7 @@ export const useSearchAlerts = (
args: { query: RuleGroupType; timeframe: number },
options?: SWRConfiguration
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
const [debouncedArgs] = useDebouncedValue(args, 2000);
@@ -30,7 +30,7 @@ export const useSearchAlerts = (
body: JSON.stringify({
query: {
cel_query: formatQuery(debouncedRules, "cel"),
- sql_query: formatQuery(debouncedRules, "parameterized_named")
+ sql_query: formatQuery(debouncedRules, "parameterized_named"),
},
timeframe: debouncedTimeframe,
}),
diff --git a/keep-ui/utils/hooks/useTags.ts b/keep-ui/utils/hooks/useTags.ts
index 998b7b4fc..124da6649 100644
--- a/keep-ui/utils/hooks/useTags.ts
+++ b/keep-ui/utils/hooks/useTags.ts
@@ -1,13 +1,12 @@
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
import { Tag } from "app/alerts/models";
-
export const useTags = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/useUsers.ts b/keep-ui/utils/hooks/useUsers.ts
index 5a15256c9..de254e040 100644
--- a/keep-ui/utils/hooks/useUsers.ts
+++ b/keep-ui/utils/hooks/useUsers.ts
@@ -2,11 +2,11 @@ import { User } from "app/settings/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
import useSWRImmutable from "swr/immutable";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useUsers = (options: SWRConfiguration = {}) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWRImmutable(
diff --git a/keep-ui/utils/hooks/useWorkflowExecutions.ts b/keep-ui/utils/hooks/useWorkflowExecutions.ts
index 2414ce3c6..2763ff3aa 100644
--- a/keep-ui/utils/hooks/useWorkflowExecutions.ts
+++ b/keep-ui/utils/hooks/useWorkflowExecutions.ts
@@ -6,7 +6,7 @@ import {
import { useSession } from "next-auth/react";
import { useSearchParams } from "next/navigation";
import useSWR, { SWRConfiguration } from "swr";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "utils/fetcher";
export const useWorkflowExecutions = (
@@ -14,7 +14,7 @@ export const useWorkflowExecutions = (
revalidateOnFocus: false,
}
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
@@ -30,7 +30,7 @@ export const useWorkflowExecutionsV2 = (
limit: number = 25,
offset: number = 0
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
const searchParams = useSearchParams();
limit = searchParams?.get("limit")
@@ -61,7 +61,7 @@ export const useWorkflowExecution = (
workflowId: string,
workflowExecutionId: string
) => {
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
const { data: session } = useSession();
return useSWR(
diff --git a/keep-ui/utils/hooks/useWorkflowRun.ts b/keep-ui/utils/hooks/useWorkflowRun.ts
index 74a9f9d45..dbaa98dc8 100644
--- a/keep-ui/utils/hooks/useWorkflowRun.ts
+++ b/keep-ui/utils/hooks/useWorkflowRun.ts
@@ -1,6 +1,6 @@
import { useState } from "react";
import { useSession } from "next-auth/react";
-import { getApiURL } from "utils/apiUrl";
+import { useApiUrl } from "./useConfig";
import { useRouter } from "next/navigation";
import { useProviders } from "./useProviders";
import { Filter, Workflow } from "app/workflows/models";
@@ -19,13 +19,12 @@ export const useWorkflowRun = (workflow: Workflow) => {
let message = "";
const [alertFilters, setAlertFilters] = useState([]);
const [alertDependencies, setAlertDependencies] = useState([]);
+ const apiUrl = useApiUrl();
const { data: providersData = { providers: {} } as ProvidersData } =
useProviders();
const providers = providersData.providers;
- const apiUrl = getApiURL();
-
if (!workflow) {
return {};
}
diff --git a/keep-ui/utils/hooks/useWorkflows.ts b/keep-ui/utils/hooks/useWorkflows.ts
index 3739627bd..26859eaf2 100644
--- a/keep-ui/utils/hooks/useWorkflows.ts
+++ b/keep-ui/utils/hooks/useWorkflows.ts
@@ -1,13 +1,13 @@
import { Workflow } from "app/workflows/models";
import { useSession } from "next-auth/react";
import { SWRConfiguration } from "swr";
-import { getApiURL } from "../apiUrl";
+import { useApiUrl } from "./useConfig";
import { fetcher } from "../fetcher";
import useSWRImmutable from "swr/immutable";
export const useWorkflows = (options: SWRConfiguration = {}) => {
const { data: session } = useSession();
- const apiUrl = getApiURL();
+ const apiUrl = useApiUrl();
return useSWRImmutable(
() => (session ? `${apiUrl}/workflows` : null),
diff --git a/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py
new file mode 100644
index 000000000..eae0abfc5
--- /dev/null
+++ b/keep/api/models/db/migrations/versions/2024-10-22-10-38_8438f041ee0e.py
@@ -0,0 +1,32 @@
+"""add pulling_enabled
+
+Revision ID: 8438f041ee0e
+Revises: 83c1020be97d
+Create Date: 2024-10-22 10:38:29.857284
+
+"""
+
+import sqlalchemy as sa
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "8438f041ee0e"
+down_revision = "83c1020be97d"
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ with op.batch_alter_table("provider", schema=None) as batch_op:
+ batch_op.add_column(
+ sa.Column("pulling_enabled", sa.Boolean(), nullable=False, default=True)
+ )
+ # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+ # ### commands auto generated by Alembic - please adjust! ###
+ with op.batch_alter_table("provider", schema=None) as batch_op:
+ batch_op.drop_column("pulling_enabled")
+ # ### end Alembic commands ###
diff --git a/keep/api/models/db/provider.py b/keep/api/models/db/provider.py
index 37d8d05fa..33e200784 100644
--- a/keep/api/models/db/provider.py
+++ b/keep/api/models/db/provider.py
@@ -20,6 +20,7 @@ class Provider(SQLModel, table=True):
sa_column=Column(JSON)
) # scope name is key and value is either True if validated or string with error message, e.g: {"read": True, "write": "error message"}
consumer: bool = False
+ pulling_enabled: bool = True
last_pull_time: Optional[datetime]
provisioned: bool = Field(default=False)
diff --git a/keep/api/models/provider.py b/keep/api/models/provider.py
index 93810817c..5c15bfc22 100644
--- a/keep/api/models/provider.py
+++ b/keep/api/models/provider.py
@@ -39,6 +39,7 @@ class Provider(BaseModel):
methods: list[ProviderMethod] = []
installed_by: str | None = None
installation_time: datetime | None = None
+ pulling_enabled: bool = True
last_pull_time: datetime | None = None
docs: str | None = None
tags: list[
diff --git a/keep/api/routes/preset.py b/keep/api/routes/preset.py
index a812d6be1..cfa701681 100644
--- a/keep/api/routes/preset.py
+++ b/keep/api/routes/preset.py
@@ -1,16 +1,18 @@
+import json
import logging
import os
import uuid
from datetime import datetime
from typing import Optional
+
from fastapi import (
APIRouter,
BackgroundTasks,
Depends,
HTTPException,
+ Query,
Request,
Response,
- Query
)
from pydantic import BaseModel
from sqlmodel import Session, select
@@ -24,7 +26,6 @@
update_provider_last_pull_time,
)
from keep.api.models.alert import AlertDto
-from keep.api.models.time_stamp import TimeStampFilter
from keep.api.models.db.preset import (
Preset,
PresetDto,
@@ -33,6 +34,7 @@
Tag,
TagDto,
)
+from keep.api.models.time_stamp import TimeStampFilter
from keep.api.tasks.process_event_task import process_event
from keep.api.tasks.process_topology_task import process_topology
from keep.contextmanager.contextmanager import ContextManager
@@ -41,7 +43,6 @@
from keep.providers.base.base_provider import BaseTopologyProvider
from keep.providers.providers_factory import ProvidersFactory
from keep.searchengine.searchengine import SearchEngine
-import json
router = APIRouter()
logger = logging.getLogger(__name__)
@@ -86,6 +87,10 @@ def pull_data_from_providers(
"trace_id": trace_id,
}
+ if not provider.pulling_enabled:
+ logger.debug("Pulling is disabled for this provider", extra=extra)
+ continue
+
if provider.last_pull_time is not None:
now = datetime.now()
days_passed = (now - provider.last_pull_time).days
@@ -173,9 +178,7 @@ def pull_data_from_providers(
# Function to handle the time_stamp query parameter and parse it
-def _get_time_stamp_filter(
- time_stamp: Optional[str] = Query(None)
-) -> TimeStampFilter:
+def _get_time_stamp_filter(time_stamp: Optional[str] = Query(None)) -> TimeStampFilter:
if time_stamp:
try:
# Parse the JSON string
@@ -186,6 +189,7 @@ def _get_time_stamp_filter(
raise HTTPException(status_code=400, detail="Invalid time_stamp format")
return TimeStampFilter()
+
@router.get(
"",
description="Get all presets for tenant",
@@ -195,7 +199,7 @@ def get_presets(
IdentityManagerFactory.get_auth_verifier(["read:preset"])
),
session: Session = Depends(get_session),
- time_stamp: TimeStampFilter = Depends(_get_time_stamp_filter)
+ time_stamp: TimeStampFilter = Depends(_get_time_stamp_filter),
) -> list[PresetDto]:
tenant_id = authenticated_entity.tenant_id
logger.info(f"Getting all presets {time_stamp}")
@@ -224,7 +228,9 @@ def get_presets(
# get the number of alerts + noisy alerts for each preset
search_engine = SearchEngine(tenant_id=tenant_id)
# get the preset metatada
- presets_dto = search_engine.search_preset_alerts(presets=presets_dto, time_stamp=time_stamp)
+ presets_dto = search_engine.search_preset_alerts(
+ presets=presets_dto, time_stamp=time_stamp
+ )
return presets_dto
diff --git a/keep/api/routes/providers.py b/keep/api/routes/providers.py
index e30f7c349..e746ce839 100644
--- a/keep/api/routes/providers.py
+++ b/keep/api/routes/providers.py
@@ -490,6 +490,7 @@ async def install_provider(
provider_id = provider_info.pop("provider_id")
provider_name = provider_info.pop("provider_name")
provider_type = provider_info.pop("provider_type", None) or provider_id
+ pulling_enabled = provider_info.pop("pulling_enabled", True)
except KeyError as e:
raise HTTPException(
status_code=400, detail=f"Missing required field: {e.args[0]}"
@@ -507,6 +508,7 @@ async def install_provider(
provider_name,
provider_type,
provider_info,
+ pulling_enabled=pulling_enabled,
)
return JSONResponse(status_code=200, content=result)
except HTTPException as e:
diff --git a/keep/providers/netdata_provider/netdata_provider.py b/keep/providers/netdata_provider/netdata_provider.py
index 1def2c787..114ef40e8 100644
--- a/keep/providers/netdata_provider/netdata_provider.py
+++ b/keep/providers/netdata_provider/netdata_provider.py
@@ -72,10 +72,10 @@ def _format_alert(
),
status=(
NetdataProvider.STATUS_MAP.get(
- event["status"]["text"], AlertStatus.INFO
+ event["status"]["text"], AlertStatus.FIRING
)
if "status" in event
- else AlertStatus.INFO
+ else AlertStatus.FIRING
),
alert=event["alert"] if "alert" in event else None,
url=(
diff --git a/keep/providers/providers_factory.py b/keep/providers/providers_factory.py
index 079467200..fb5d9bdd6 100644
--- a/keep/providers/providers_factory.py
+++ b/keep/providers/providers_factory.py
@@ -411,6 +411,7 @@ def get_installed_providers(
provider_copy.installation_time = p.installation_time
provider_copy.last_pull_time = p.last_pull_time
provider_copy.provisioned = p.provisioned
+ provider_copy.pulling_enabled = p.pulling_enabled
try:
provider_auth = {"name": p.name}
if include_details:
diff --git a/keep/providers/providers_service.py b/keep/providers/providers_service.py
index dad1d8d37..453a2ebcf 100644
--- a/keep/providers/providers_service.py
+++ b/keep/providers/providers_service.py
@@ -47,6 +47,7 @@ def install_provider(
provider_config: Dict[str, Any],
provisioned: bool = False,
validate_scopes: bool = True,
+ pulling_enabled: bool = True,
) -> Dict[str, Any]:
provider_unique_id = uuid.uuid4().hex
logger.info(
@@ -95,6 +96,7 @@ def install_provider(
validatedScopes=validated_scopes,
consumer=provider.is_consumer,
provisioned=provisioned,
+ pulling_enabled=pulling_enabled,
)
try:
session.add(provider_model)
@@ -148,6 +150,8 @@ def update_provider(
if provider.provisioned:
raise HTTPException(403, detail="Cannot update a provisioned provider")
+ pulling_enabled = provider_info.pop("pulling_enabled", True)
+
provider_config = {
"authentication": provider_info,
"name": provider.name,
@@ -171,6 +175,7 @@ def update_provider(
provider.installed_by = updated_by
provider.validatedScopes = validated_scopes
+ provider.pulling_enabled = pulling_enabled
session.commit()
return {
diff --git a/pyproject.toml b/pyproject.toml
index 1dfcc6d45..5546b50e7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
[tool.poetry]
name = "keep"
-version = "0.26.0"
+version = "0.27.1"
description = "Alerting. for developers, by developers."
authors = ["Keep Alerting LTD"]
readme = "README.md"
Error: {mockError.message || "Something went wrong!"}
diff --git a/keep-ui/app/workflows/workflow-tile.tsx b/keep-ui/app/workflows/workflow-tile.tsx index 7e3da37ba..ad9a4e636 100644 --- a/keep-ui/app/workflows/workflow-tile.tsx +++ b/keep-ui/app/workflows/workflow-tile.tsx @@ -2,7 +2,7 @@ import { useSession } from "next-auth/react"; import { Workflow, Filter } from "./models"; -import { getApiURL } from "../../utils/apiUrl"; +import { useApiUrl } from "utils/hooks/useConfig"; import Image from "next/image"; import React, { useState, useMemo } from "react"; import { useRouter } from "next/navigation"; @@ -265,7 +265,7 @@ export const ProvidersCarousel = ({ function WorkflowTile({ workflow }: { workflow: Workflow }) { // Create a set to keep track of unique providers - const apiUrl = getApiURL(); + const apiUrl = useApiUrl(); const { data: session } = useSession(); const router = useRouter(); const [openPanel, setOpenPanel] = useState(false); @@ -720,7 +720,7 @@ function WorkflowTile({ workflow }: { workflow: Workflow }) { export function WorkflowTileOld({ workflow }: { workflow: Workflow }) { // Create a set to keep track of unique providers - const apiUrl = getApiURL(); + const apiUrl = useApiUrl(); const { data: session } = useSession(); const router = useRouter(); const [openPanel, setOpenPanel] = useState(false); diff --git a/keep-ui/app/workflows/workflows.client.tsx b/keep-ui/app/workflows/workflows.client.tsx index 2d90aa818..8a5d9e34b 100644 --- a/keep-ui/app/workflows/workflows.client.tsx +++ b/keep-ui/app/workflows/workflows.client.tsx @@ -11,7 +11,7 @@ import { import { useSession } from "next-auth/react"; import { fetcher } from "../../utils/fetcher"; import { Workflow, MockWorkflow } from "./models"; -import { getApiURL } from "../../utils/apiUrl"; +import { useApiUrl } from "utils/hooks/useConfig"; import Loading from "../loading"; import React from "react"; import WorkflowsEmptyState from "./noworfklows"; @@ -23,7 +23,7 @@ import Modal from "@/components/ui/Modal"; import MockWorkflowCardSection from "./mockworkflows"; export default function WorkflowsPage() { - const apiUrl = getApiURL(); + const apiUrl = useApiUrl(); const router = useRouter(); const { data: session, status, update } = useSession(); const [fileError, setFileError] = useState