github/oneuptime
1
1
Fork 0
mirror of https://github.com/OneUptime/oneuptime.git synced 2026-04-06 00:32:12 +02:00
Code Issues 193 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OneUptime/oneuptime

Browse Source
This commit is contained in:
Nawaz Dhandala
2026-03-23 10:13:44 +00:00
parent d421caff2e 910d7d0066
commit 61ea40a23a
5 changed files with 3 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

388
App/FeatureSet/Dashboard/src/Components/Form/Monitor/KubernetesMonitor/KubernetesSimplifiedCriteriaForm.tsx
View File

@@ -1,388 +0,0 @@
import React, {
FunctionComponent,
ReactElement,
useEffect,
useState,
} from "react";
import MonitorCriteria from "Common/Types/Monitor/MonitorCriteria";
import MonitorCriteriaInstance from "Common/Types/Monitor/MonitorCriteriaInstance";
import {
FilterType,
CriteriaFilterUtil,
} from "Common/Types/Monitor/CriteriaFilter";
import {
buildOfflineCriteriaInstance,
buildOnlineCriteriaInstance,
} from "Common/Types/Monitor/KubernetesAlertTemplates";
import ObjectID from "Common/Types/ObjectID";
import Dropdown, {
DropdownOption,
DropdownValue,
} from "Common/UI/Components/Dropdown/Dropdown";
import { InputType } from "Common/UI/Components/Input/Input";
import Input from "Common/UI/Components/Input/Input";
import FieldLabelElement from "Common/UI/Components/Forms/Fields/FieldLabel";
import Toggle from "Common/UI/Components/Toggle/Toggle";
export interface ComponentProps {
metricAlias: string;
monitorName: string;
monitorStatusDropdownOptions: Array<DropdownOption>;
incidentSeverityDropdownOptions: Array<DropdownOption>;
alertSeverityDropdownOptions: Array<DropdownOption>;
onCallPolicyDropdownOptions: Array<DropdownOption>;
value?: MonitorCriteria | undefined;
onChange: (value: MonitorCriteria) => void;
}
const operatorOptions: Array<DropdownOption> = [
{ label: "> Greater Than", value: FilterType.GreaterThan },
{ label: "< Less Than", value: FilterType.LessThan },
{ label: ">= Greater Than or Equal", value: FilterType.GreaterThanOrEqualTo },
{ label: "<= Less Than or Equal", value: FilterType.LessThanOrEqualTo },
{ label: "= Equal To", value: FilterType.EqualTo },
];
function extractStateFromCriteria(criteria: MonitorCriteria | undefined): {
filterType: FilterType;
thresholdValue: number;
alertSeverityId: string;
incidentSeverityId: string;
autoResolve: boolean;
alertOnCallPolicyIds: Array<string>;
incidentOnCallPolicyIds: Array<string>;
} {
const defaults = {
filterType: FilterType.GreaterThan,
thresholdValue: 0,
alertSeverityId: "",
incidentSeverityId: "",
autoResolve: true,
alertOnCallPolicyIds: [] as Array<string>,
incidentOnCallPolicyIds: [] as Array<string>,
};
if (!criteria?.data?.monitorCriteriaInstanceArray?.length) {
return defaults;
}
// Extract from the first criteria instance (the "unhealthy" one)
const firstInstance: MonitorCriteriaInstance | undefined =
criteria.data.monitorCriteriaInstanceArray[0];
if (!firstInstance?.data) {
return defaults;
}
const firstFilter = firstInstance.data.filters?.[0];
if (firstFilter) {
defaults.filterType = firstFilter.filterType || FilterType.GreaterThan;
defaults.thresholdValue =
typeof firstFilter.value === "number"
? firstFilter.value
: parseFloat(String(firstFilter.value)) || 0;
}
if (firstInstance.data.alerts?.length) {
const alert = firstInstance.data.alerts[0];
if (alert) {
defaults.alertSeverityId = alert.alertSeverityId?.toString() || "";
defaults.autoResolve = alert.autoResolveAlert !== false;
defaults.alertOnCallPolicyIds =
alert.onCallPolicyIds?.map((id: ObjectID) => id.toString()) || [];
}
}
if (firstInstance.data.incidents?.length) {
const incident = firstInstance.data.incidents[0];
if (incident) {
defaults.incidentSeverityId =
incident.incidentSeverityId?.toString() || "";
defaults.incidentOnCallPolicyIds =
incident.onCallPolicyIds?.map((id: ObjectID) => id.toString()) || [];
}
}
return defaults;
}
const KubernetesSimplifiedCriteriaForm: FunctionComponent<ComponentProps> = (
props: ComponentProps,
): ReactElement => {
const initialState = extractStateFromCriteria(props.value);
const [filterType, setFilterType] = useState<FilterType>(
initialState.filterType,
);
const [thresholdValue, setThresholdValue] = useState<number>(
initialState.thresholdValue,
);
const [alertSeverityId, setAlertSeverityId] = useState<string>(
initialState.alertSeverityId ||
(props.alertSeverityDropdownOptions[0]?.value?.toString() || ""),
);
const [incidentSeverityId, setIncidentSeverityId] = useState<string>(
initialState.incidentSeverityId ||
(props.incidentSeverityDropdownOptions[0]?.value?.toString() || ""),
);
const [autoResolve, setAutoResolve] = useState<boolean>(
initialState.autoResolve,
);
const [alertOnCallPolicyIds, setAlertOnCallPolicyIds] = useState<
Array<string>
>(initialState.alertOnCallPolicyIds);
const [incidentOnCallPolicyIds, setIncidentOnCallPolicyIds] = useState<
Array<string>
>(initialState.incidentOnCallPolicyIds);
// Find online/offline status IDs from monitor status options
const offlineMonitorStatusId: ObjectID = new ObjectID(
props.monitorStatusDropdownOptions.length >= 2
? (props.monitorStatusDropdownOptions[1]?.value?.toString() || "")
: (props.monitorStatusDropdownOptions[0]?.value?.toString() || ""),
);
const onlineMonitorStatusId: ObjectID = new ObjectID(
props.monitorStatusDropdownOptions[0]?.value?.toString() || "",
);
const buildAndEmitCriteria = (): void => {
if (!props.metricAlias) {
return;
}
const inverseFilterType: FilterType =
CriteriaFilterUtil.getInverseFilterType(filterType);
const offlineInstance: MonitorCriteriaInstance =
buildOfflineCriteriaInstance({
offlineMonitorStatusId,
incidentSeverityId: new ObjectID(incidentSeverityId),
alertSeverityId: new ObjectID(alertSeverityId),
monitorName: props.monitorName || "Kubernetes Monitor",
metricAlias: props.metricAlias,
filterType: filterType,
value: thresholdValue,
});
// Set auto-resolve and on-call policies on alerts and incidents
if (offlineInstance.data?.alerts) {
for (const alert of offlineInstance.data.alerts) {
alert.autoResolveAlert = autoResolve;
alert.onCallPolicyIds = alertOnCallPolicyIds.map(
(id: string) => new ObjectID(id),
);
}
}
if (offlineInstance.data?.incidents) {
for (const incident of offlineInstance.data.incidents) {
incident.autoResolveIncident = autoResolve;
incident.onCallPolicyIds = incidentOnCallPolicyIds.map(
(id: string) => new ObjectID(id),
);
}
}
const onlineInstance: MonitorCriteriaInstance = buildOnlineCriteriaInstance({
onlineMonitorStatusId,
metricAlias: props.metricAlias,
filterType: inverseFilterType,
value: thresholdValue,
});
const monitorCriteria: MonitorCriteria = new MonitorCriteria();
monitorCriteria.data = {
monitorCriteriaInstanceArray: [offlineInstance, onlineInstance],
};
props.onChange(monitorCriteria);
};
useEffect(() => {
buildAndEmitCriteria();
}, [
filterType,
thresholdValue,
alertSeverityId,
incidentSeverityId,
autoResolve,
alertOnCallPolicyIds,
incidentOnCallPolicyIds,
props.metricAlias,
props.monitorName,
]);
return (
<div className="space-y-4">
<p className="text-sm text-gray-500">
Configure when this monitor should trigger an alert. The recovery
criteria will be auto-generated with the inverse condition.
</p>
{/* Threshold Row */}
<div>
<FieldLabelElement
title="Alert Condition"
description="When the metric value matches this condition, an alert will be triggered."
required={true}
/>
<div className="flex items-center space-x-3">
<div className="w-64">
<Dropdown
options={operatorOptions}
value={operatorOptions.find(
(o: DropdownOption) => o.value === filterType,
)}
onChange={(
value: DropdownValue | Array<DropdownValue> | null,
) => {
setFilterType(
(value as FilterType) || FilterType.GreaterThan,
);
}}
placeholder="Select operator..."
/>
</div>
<div className="w-32">
<Input
value={String(thresholdValue)}
type={InputType.NUMBER}
onChange={(value: string) => {
setThresholdValue(parseFloat(value) || 0);
}}
placeholder="Threshold"
/>
</div>
</div>
</div>
{/* Alert Severity */}
<div>
<FieldLabelElement
title="Alert Severity"
description="The severity level for alerts created by this monitor."
required={true}
/>
<Dropdown
options={props.alertSeverityDropdownOptions}
value={props.alertSeverityDropdownOptions.find(
(o: DropdownOption) => o.value?.toString() === alertSeverityId,
)}
onChange={(value: DropdownValue | Array<DropdownValue> | null) => {
setAlertSeverityId(value?.toString() || "");
}}
placeholder="Select alert severity..."
/>
</div>
{/* Incident Severity */}
<div>
<FieldLabelElement
title="Incident Severity"
description="The severity level for incidents created by this monitor."
required={true}
/>
<Dropdown
options={props.incidentSeverityDropdownOptions}
value={props.incidentSeverityDropdownOptions.find(
(o: DropdownOption) => o.value?.toString() === incidentSeverityId,
)}
onChange={(value: DropdownValue | Array<DropdownValue> | null) => {
setIncidentSeverityId(value?.toString() || "");
}}
placeholder="Select incident severity..."
/>
</div>
{/* Alert On-Call Policy */}
<div>
<FieldLabelElement
title="Alert On-Call Policy"
description="On-call policies to notify when an alert is created."
required={false}
/>
<Dropdown
options={props.onCallPolicyDropdownOptions}
value={props.onCallPolicyDropdownOptions.filter(
(o: DropdownOption) =>
alertOnCallPolicyIds.includes(o.value?.toString() || ""),
)}
onChange={(
value: DropdownValue | Array<DropdownValue> | null,
) => {
if (Array.isArray(value)) {
setAlertOnCallPolicyIds(
value.map((v: DropdownValue) => v.toString()),
);
} else if (value) {
setAlertOnCallPolicyIds([value.toString()]);
} else {
setAlertOnCallPolicyIds([]);
}
}}
isMultiSelect={true}
placeholder="Select on-call policies..."
/>
</div>
{/* Incident On-Call Policy */}
<div>
<FieldLabelElement
title="Incident On-Call Policy"
description="On-call policies to notify when an incident is created."
required={false}
/>
<Dropdown
options={props.onCallPolicyDropdownOptions}
value={props.onCallPolicyDropdownOptions.filter(
(o: DropdownOption) =>
incidentOnCallPolicyIds.includes(o.value?.toString() || ""),
)}
onChange={(
value: DropdownValue | Array<DropdownValue> | null,
) => {
if (Array.isArray(value)) {
setIncidentOnCallPolicyIds(
value.map((v: DropdownValue) => v.toString()),
);
} else if (value) {
setIncidentOnCallPolicyIds([value.toString()]);
} else {
setIncidentOnCallPolicyIds([]);
}
}}
isMultiSelect={true}
placeholder="Select on-call policies..."
/>
</div>
{/* Auto-Resolve */}
<div>
<Toggle
title="Auto-resolve when recovered"
description="Automatically resolve alerts and incidents when the metric returns to a healthy state."
value={autoResolve}
onChange={(value: boolean) => {
setAutoResolve(value);
}}
/>
</div>
{/* Summary */}
<div className="rounded-lg border border-gray-200 bg-gray-50 p-3">
<p className="text-xs text-gray-600">
<strong>Summary:</strong> This monitor will create an alert and
incident when the metric is{" "}
<span className="font-mono bg-white px-1 rounded border">
{operatorOptions.find((o: DropdownOption) => o.value === filterType)
?.label || filterType}{" "}
{thresholdValue}
</span>
, and auto-recover when the condition clears.
</p>
</div>
</div>
);
};
export default KubernetesSimplifiedCriteriaForm;

6
App/FeatureSet/Dashboard/src/Components/Form/Monitor/MonitorStep.tsx
View File

@@ -68,7 +68,6 @@ import MonitorStepMetricMonitor, {
MonitorStepMetricMonitorUtil,
} from "Common/Types/Monitor/MonitorStepMetricMonitor";
import KubernetesMonitorStepForm from "./KubernetesMonitor/KubernetesMonitorStepForm";
import { KubernetesFormMode } from "./KubernetesMonitor/KubernetesMonitorStepForm";
import MonitorStepKubernetesMonitor, {
MonitorStepKubernetesMonitorUtil,
} from "Common/Types/Monitor/MonitorStepKubernetesMonitor";
@@ -134,8 +133,6 @@ const MonitorStepElement: FunctionComponent<ComponentProps> = (
const [error, setError] = useState<string>("");
const [isLoading, setIsLoading] = useState<boolean>(true);
const [kubernetesFormMode, setKubernetesFormMode] =
useState<KubernetesFormMode>("quick");
const fetchLogAttributes: PromiseVoidFunction = async (): Promise<void> => {
const attributeRepsonse: HTTPResponse<JSONObject> | HTTPErrorResponse =
@@ -764,9 +761,6 @@ return {
monitorStep.setKubernetesMonitor(value);
props.onChange?.(MonitorStep.clone(monitorStep));
}}
onModeChange={(mode: KubernetesFormMode) => {
setKubernetesFormMode(mode);
}}
/>
</Card>
)}

2
App/FeatureSet/Dashboard/src/Pages/Kubernetes/Utils/DocumentationMarkdown.ts
View File

@@ -19,7 +19,7 @@ export function getKubernetesInstallationMarkdown(
## Step 1: Add the OneUptime Helm Repository
\`\`\`bash
helm repo add oneuptime https://helm.oneuptime.com
helm repo add oneuptime https://helm-chart.oneuptime.com
helm repo update
\`\`\`

2
HelmChart/Public/install.sh
View File

@@ -164,7 +164,7 @@ then
exit 0
fi
# Install cluster with Helm.
# Install cluster with helm-chart.
sudo helm repo add oneuptime https://oneuptime.com/chart || echo "OneUptime already added"
sudo helm repo update

2
HelmChart/Public/oneuptime/templates/e2e-cron.yml
View File

@@ -1,5 +1,5 @@
{{- if $.Values.cronJobs.e2e.enabled }}
{{- if and $.Values.cronJobs.e2e.enabled (not $.Values.deployment.disableDeployments) }}
apiVersion: batch/v1
kind: CronJob