diff --git a/apps/web/src/services/alert-manager-v2/components/AlertsManagementTable.vue b/apps/web/src/services/alert-manager-v2/components/AlertsManagementTable.vue
index f8be6bc874..5f6b4ef536 100644
--- a/apps/web/src/services/alert-manager-v2/components/AlertsManagementTable.vue
+++ b/apps/web/src/services/alert-manager-v2/components/AlertsManagementTable.vue
@@ -1,29 +1,41 @@
-
-
-
- {{ $t('MONITORING.ALERT.ALERT_LIST.CREATE') }}
-
+
+
+
+
+
+
+
{{ $t('ALERT_MANAGER.STATUS') }}
+
+ {{ item.label }}
+
+
+
+
{{ $t('ALERT_MANAGER.ALERTS.LABEL_URGENCY') }}
+
+ {{ item.label }}
+
+
+
@@ -178,3 +288,17 @@ const handleExportToExcel = () => {
+
+
diff --git a/apps/web/src/services/alert-manager-v2/composables/alert-info.ts b/apps/web/src/services/alert-manager-v2/composables/alert-info.ts
deleted file mode 100644
index 26fb148fa0..0000000000
--- a/apps/web/src/services/alert-manager-v2/composables/alert-info.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { reactive } from 'vue';
-
-import { cloneDeep } from 'lodash';
-
-import type { AlertUpdateParameters } from '@/schema/monitoring/alert/api-verbs/update';
-import { i18n } from '@/translations';
-
-import { showSuccessMessage } from '@/lib/helper/notice-alert-helper';
-
-import ErrorHandler from '@/common/composables/error/errorHandler';
-
-import { useAlertPageStore } from '@/services/alert-manager-v2/stores/alert-page-store';
-
-interface AlertDetailItemState {
- isEditMode: boolean;
- alertId: string;
- projectChannelId?: string;
- dataForUpdate?: any;
-}
-
-export const useAlertInfoItem = (obj: AlertDetailItemState) => {
- const alertPageStore = useAlertPageStore();
- const state = reactive(obj);
- const cancelEdit = (initialData) => {
- state.isEditMode = false;
- if (typeof initialData === 'object') {
- state.dataForUpdate = cloneDeep(initialData);
- } else {
- state.dataForUpdate = initialData;
- }
- };
-
- const startEdit = (initialData) => {
- state.isEditMode = true;
- if (typeof initialData === 'object') {
- state.dataForUpdate = cloneDeep(initialData);
- } else {
- state.dataForUpdate = initialData;
- }
- };
-
- const getMessage = (editMode) => editMode === i18n.t('MONITORING.ALERT.DETAIL.INFO.ALT_S_UPDATE_DESCRIPTION');
-
- const getParams = () => {
- const param: Omit = {};
-
- param.description = state.dataForUpdate;
- return param;
- };
- const updateAlert = async (editMode) => {
- try {
- await alertPageStore.updateAlertData({
- updateParams: getParams(editMode),
- alertId: state.alertId,
- });
- showSuccessMessage(getMessage(editMode, true), '');
- state.isEditMode = false;
- } catch (e) {
- ErrorHandler.handleRequestError(e, getMessage(editMode, false));
- }
- };
-
- const onClickSave = async (editMode) => {
- await updateAlert(editMode);
- };
-
- return {
- state,
- cancelEdit,
- startEdit,
- onClickSave,
- };
-};
diff --git a/apps/web/src/services/alert-manager-v2/composables/alert-state-i18n.ts b/apps/web/src/services/alert-manager-v2/composables/alert-state-i18n.ts
deleted file mode 100644
index 5d65b710e4..0000000000
--- a/apps/web/src/services/alert-manager-v2/composables/alert-state-i18n.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { ComputedRef } from 'vue';
-import { computed } from 'vue';
-import type { TranslateResult } from 'vue-i18n';
-
-import type { AlertState } from '@/schema/monitoring/alert/type';
-import { i18n } from '@/translations';
-
-
-export const useAlertStateI18n = (): ComputedRef> => computed(() => ({
- TRIGGERED: i18n.t('MONITORING.ALERT.ALERT_LIST.TRIGGERED'),
- ACKNOWLEDGED: i18n.t('MONITORING.ALERT.ALERT_LIST.ACKNOWLEDGED'),
- RESOLVED: i18n.t('MONITORING.ALERT.ALERT_LIST.RESOLVED'),
- ERROR: i18n.t('MONITORING.ALERT.ALERT_LIST.ERROR'),
-}));
diff --git a/apps/web/src/services/alert-manager-v2/composables/alert-table-data.ts b/apps/web/src/services/alert-manager-v2/composables/alert-table-data.ts
new file mode 100644
index 0000000000..0f3c88cc3e
--- /dev/null
+++ b/apps/web/src/services/alert-manager-v2/composables/alert-table-data.ts
@@ -0,0 +1,21 @@
+import type { ComputedRef } from 'vue';
+import { computed } from 'vue';
+import type { TranslateResult } from 'vue-i18n';
+
+import type { AlertStateType, AlertUrgencyType } from '@/schema/alert-manager/alert/type';
+import { i18n } from '@/translations';
+
+
+export const getAlertStateI18n = (): ComputedRef> => computed(() => ({
+ ALL: i18n.t('ALERT_MANAGER.ALERTS.ALL'),
+ TRIGGERED: i18n.t('ALERT_MANAGER.ALERTS.TRIGGERED'),
+ ACKNOWLEDGED: i18n.t('ALERT_MANAGER.ALERTS.ACKNOWLEDGED'),
+ RESOLVED: i18n.t('ALERT_MANAGER.ALERTS.RESOLVED'),
+ ERROR: i18n.t('ALERT_MANAGER.ALERTS.ERROR'),
+}));
+
+export const getAlertUrgencyI18n = (): ComputedRef> => computed(() => ({
+ ALL: i18n.t('ALERT_MANAGER.ALERTS.ALL'),
+ HIGH: i18n.t('ALERT_MANAGER.ALERTS.HIGH'),
+ LOW: i18n.t('ALERT_MANAGER.ALERTS.LOW'),
+}));
diff --git a/apps/web/src/services/alert-manager-v2/composables/alert-urgency-i18n.ts b/apps/web/src/services/alert-manager-v2/composables/alert-urgency-i18n.ts
deleted file mode 100644
index f2a2d89174..0000000000
--- a/apps/web/src/services/alert-manager-v2/composables/alert-urgency-i18n.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import type { ComputedRef } from 'vue';
-import { computed } from 'vue';
-import type { TranslateResult } from 'vue-i18n';
-
-import type { AlertUrgency } from '@/schema/monitoring/alert/type';
-import { i18n } from '@/translations';
-
-
-export const useAlertUrgencyI18n = (): ComputedRef> => computed(() => ({
- ALL: i18n.t('MONITORING.ALERT.ALERT_LIST.ALL'),
- HIGH: i18n.t('MONITORING.ALERT.ALERT_LIST.HIGH'),
- LOW: i18n.t('MONITORING.ALERT.ALERT_LIST.LOW'),
-}));
diff --git a/apps/web/src/services/alert-manager-v2/constants/alert-manager-constant.ts b/apps/web/src/services/alert-manager-v2/constants/alert-manager-constant.ts
index 9e622189ec..4bc7afd02a 100644
--- a/apps/web/src/services/alert-manager-v2/constants/alert-manager-constant.ts
+++ b/apps/web/src/services/alert-manager-v2/constants/alert-manager-constant.ts
@@ -1,5 +1,3 @@
-import type { AlertSeverityType } from '@/schema/alert-manager/alert/type';
-
import * as styles from '@/styles/colors';
import {
blue, coral, red, yellow,
@@ -18,12 +16,19 @@ export const SERVICE_SETTING_CARD = {
RULE_SET: 'rule_set',
} as const;
-export const ALERT_SEVERITY_COLORS: Record = {
+export const ALERT_SEVERITY_COLORS = {
CRITICAL: red[600],
ERROR: coral[600],
WARNING: yellow[600],
INFO: blue[600],
-};
+} as const;
+export const ALERT_STATUS_FILTERS = {
+ OPEN: 'OPEN',
+ TRIGGERED: 'TRIGGERED',
+ ACKNOWLEDGED: 'ACKNOWLEDGED',
+ RESOLVED: 'RESOLVED',
+ ERROR: 'ERROR',
+} as const;
export const WEBHOOK_DETAIL_TABS = {
DETAIL: 'detail',
diff --git a/apps/web/src/services/alert-manager-v2/types/alert-manager-type.ts b/apps/web/src/services/alert-manager-v2/types/alert-manager-type.ts
index 1e08d6e103..49f25a73ab 100644
--- a/apps/web/src/services/alert-manager-v2/types/alert-manager-type.ts
+++ b/apps/web/src/services/alert-manager-v2/types/alert-manager-type.ts
@@ -14,6 +14,11 @@ export type ServiceDetailSettingCardType = typeof SERVICE_SETTING_CARD[keyof typ
export type WebhookDetailTabsType = typeof WEBHOOK_DETAIL_TABS[keyof typeof WEBHOOK_DETAIL_TABS];
+export type AlertFilterType = {
+ label: TranslateResult;
+ name: string;
+};
+
export type createHeaderInfoByStep = {
title: TranslateResult;
desc?: TranslateResult;
diff --git a/packages/language-pack/console-translation-2.8.babel b/packages/language-pack/console-translation-2.8.babel
index f94d383f64..6f3fe251d5 100644
--- a/packages/language-pack/console-translation-2.8.babel
+++ b/packages/language-pack/console-translation-2.8.babel
@@ -946,6 +946,27 @@
+
+ SERVICE
+ false
+
+
+
+
+
+ en-US
+ true
+
+
+ ja-JP
+ true
+
+
+ ko-KR
+ true
+
+
+
SET_AUTO_RECOVERY_NO
false
@@ -53309,7 +53330,7 @@
en-US
- true
+ false
ja-JP
@@ -53330,7 +53351,7 @@
en-US
- true
+ false
ja-JP
@@ -53351,7 +53372,7 @@
en-US
- true
+ false
ja-JP
@@ -53401,7 +53422,7 @@
en-US
- true
+ false
ja-JP
@@ -53422,7 +53443,7 @@
en-US
- true
+ false
ja-JP
@@ -53443,7 +53464,7 @@
en-US
- true
+ false
ja-JP
@@ -53469,7 +53490,7 @@
en-US
- true
+ false
ja-JP
@@ -53490,7 +53511,7 @@
en-US
- true
+ false
ja-JP
@@ -53521,7 +53542,7 @@
en-US
- true
+ false
ja-JP
@@ -53542,7 +53563,7 @@
en-US
- true
+ false
ja-JP
@@ -53563,7 +53584,7 @@
en-US
- true
+ false
ja-JP
@@ -53584,7 +53605,7 @@
en-US
- true
+ false
ja-JP
@@ -53610,7 +53631,7 @@
en-US
- true
+ false
ja-JP
@@ -53631,7 +53652,7 @@
en-US
- true
+ false
ja-JP
@@ -53652,7 +53673,7 @@
en-US
- true
+ false
ja-JP
@@ -53676,7 +53697,7 @@
en-US
- true
+ false
ja-JP
@@ -53697,7 +53718,7 @@
en-US
- true
+ false
ja-JP
@@ -53718,7 +53739,7 @@
en-US
- true
+ false
ja-JP
@@ -53742,7 +53763,7 @@
en-US
- true
+ false
ja-JP
@@ -53763,7 +53784,7 @@
en-US
- true
+ false
ja-JP
@@ -53784,7 +53805,7 @@
en-US
- true
+ false
ja-JP
@@ -53805,7 +53826,7 @@
en-US
- true
+ false
ja-JP
@@ -53826,7 +53847,7 @@
en-US
- true
+ false
ja-JP
@@ -53847,7 +53868,7 @@
en-US
- true
+ false
ja-JP
@@ -53873,7 +53894,7 @@
en-US
- true
+ false
ja-JP
@@ -53894,7 +53915,7 @@
en-US
- true
+ false
ja-JP
@@ -53915,7 +53936,7 @@
en-US
- true
+ false
ja-JP
@@ -53936,7 +53957,7 @@
en-US
- true
+ false
ja-JP
@@ -53961,7 +53982,7 @@
en-US
- true
+ false
ja-JP
@@ -53985,7 +54006,7 @@
en-US
- true
+ false
ja-JP
@@ -54006,7 +54027,7 @@
en-US
- true
+ false
ja-JP
@@ -54027,7 +54048,7 @@
en-US
- true
+ false
ja-JP
@@ -54048,7 +54069,7 @@
en-US
- true
+ false
ja-JP
@@ -54069,7 +54090,7 @@
en-US
- true
+ false
ja-JP
@@ -54090,7 +54111,7 @@
en-US
- true
+ false
ja-JP
@@ -54111,7 +54132,7 @@
en-US
- true
+ false
ja-JP
@@ -54134,7 +54155,7 @@
en-US
- true
+ false
ja-JP
@@ -54155,7 +54176,7 @@
en-US
- true
+ false
ja-JP
@@ -54181,7 +54202,7 @@
en-US
- true
+ false
ja-JP
@@ -54202,7 +54223,7 @@
en-US
- true
+ false
ja-JP
@@ -54223,7 +54244,7 @@
en-US
- true
+ false
ja-JP
@@ -54244,7 +54265,7 @@
en-US
- true
+ false
ja-JP
@@ -54265,7 +54286,7 @@
en-US
- true
+ false
ja-JP
@@ -54286,7 +54307,7 @@
en-US
- true
+ false
ja-JP
@@ -54307,7 +54328,7 @@
en-US
- true
+ false
ja-JP
@@ -54328,7 +54349,7 @@
en-US
- true
+ false
ja-JP
@@ -54349,7 +54370,7 @@
en-US
- true
+ false
ja-JP
@@ -54370,7 +54391,7 @@
en-US
- true
+ false
ja-JP
@@ -54396,7 +54417,7 @@
en-US
- true
+ false
ja-JP
@@ -54422,7 +54443,7 @@
en-US
- true
+ false
ja-JP
@@ -54453,7 +54474,7 @@
en-US
- true
+ false
ja-JP
@@ -54474,7 +54495,7 @@
en-US
- true
+ false
ja-JP
@@ -54495,7 +54516,7 @@
en-US
- true
+ false
ja-JP
@@ -54516,7 +54537,7 @@
en-US
- true
+ false
ja-JP
@@ -54542,7 +54563,7 @@
en-US
- true
+ false
ja-JP
@@ -54584,7 +54605,7 @@
en-US
- true
+ false
ja-JP
@@ -54605,7 +54626,7 @@
en-US
- true
+ false
ja-JP
@@ -54630,11 +54651,11 @@
ja-JP
- false
+ true
ko-KR
- false
+ true
@@ -54651,11 +54672,11 @@
ja-JP
- false
+ true
ko-KR
- false
+ true
@@ -54672,7 +54693,7 @@
en-US
- true
+ false
ja-JP
diff --git a/packages/language-pack/en.json b/packages/language-pack/en.json
index 88bd88baa9..715e2bdc9c 100644
--- a/packages/language-pack/en.json
+++ b/packages/language-pack/en.json
@@ -45,6 +45,7 @@
"RESPONDER": "Responder",
"RULE": "Rule",
"SAVE_CHANGES": "Save Changes",
+ "SERVICE": "Service",
"SET_AUTO_RECOVERY_NO": "No, do it Manually",
"SET_AUTO_RECOVERY_YES": "Yes, Automatically resolve alerts",
"SEVERITY": "Severity",
diff --git a/packages/language-pack/ja.json b/packages/language-pack/ja.json
index 431d14eab6..2ef47dae70 100644
--- a/packages/language-pack/ja.json
+++ b/packages/language-pack/ja.json
@@ -45,6 +45,7 @@
"RESPONDER": "回答者",
"RULE": "ルール",
"SAVE_CHANGES": "変更事項保存",
+ "SERVICE": "サービス",
"SET_AUTO_RECOVERY_NO": "いいえ、手動で行います。",
"SET_AUTO_RECOVERY_YES": "はい、自動的にアラートを完了にします。",
"SEVERITY": "緊急度",
diff --git a/packages/language-pack/ko.json b/packages/language-pack/ko.json
index 330895e9ec..903cb8b9b5 100644
--- a/packages/language-pack/ko.json
+++ b/packages/language-pack/ko.json
@@ -5,7 +5,7 @@
"ACCOUNT_ID": "계정 ID",
"ACKNOWLEDGED": "확인",
"ADD_NOTE": "노트 추가",
- "ALL": "전체 서비스",
+ "ALL": "전체",
"ALT_S_UPDATE_STATE": "상태 변경 완료",
"AUTO_RECOVERY": "자동 복구",
"AUTO_RESOLVE_ALERTS": "자동으로 얼럿 완료하기",
@@ -45,6 +45,7 @@
"RESPONDER": "응답자",
"RULE": "규칙",
"SAVE_CHANGES": "변경사항 저장",
+ "SERVICE": "서비스",
"SET_AUTO_RECOVERY_NO": "아니오, 직접 완료합니다.",
"SET_AUTO_RECOVERY_YES": "네, 자동으로 얼럿을 완료합니다.",
"SEVERITY": "심각도",