diff --git a/x-pack/plugins/observability/public/components/alert_search_bar/containers/state_container.tsx b/x-pack/plugins/observability/public/components/alert_search_bar/containers/state_container.tsx index 5513cc62df626..a08971b0c350e 100644 --- a/x-pack/plugins/observability/public/components/alert_search_bar/containers/state_container.tsx +++ b/x-pack/plugins/observability/public/components/alert_search_bar/containers/state_container.tsx @@ -35,7 +35,7 @@ interface AlertSearchBarStateTransitions { } const defaultState: AlertSearchBarContainerState = { - rangeFrom: 'now-2h', + rangeFrom: 'now-24h', rangeTo: 'now', kuery: '', status: ALL_ALERTS.status, diff --git a/x-pack/plugins/observability/public/components/alerts_table/rule_details/get_rule_details_table_configuration.tsx b/x-pack/plugins/observability/public/components/alerts_table/rule_details/get_rule_details_table_configuration.tsx index 369a3d4c5c12d..d03e90452fa28 100644 --- a/x-pack/plugins/observability/public/components/alerts_table/rule_details/get_rule_details_table_configuration.tsx +++ b/x-pack/plugins/observability/public/components/alerts_table/rule_details/get_rule_details_table_configuration.tsx @@ -6,7 +6,7 @@ */ import React from 'react'; -import { TIMESTAMP } from '@kbn/rule-data-utils'; +import { ALERT_START } from '@kbn/rule-data-utils'; import { SortOrder } from '@elastic/elasticsearch/lib/api/typesWithBodyKey'; import { AlertsTableConfigurationRegistry, @@ -35,7 +35,7 @@ export const getRuleDetailsTableConfiguration = ( }), sort: [ { - [TIMESTAMP]: { + [ALERT_START]: { order: 'desc' as SortOrder, }, }, diff --git a/x-pack/plugins/observability/public/pages/rule_details/components/rule_details_tabs.tsx b/x-pack/plugins/observability/public/pages/rule_details/components/rule_details_tabs.tsx index 163aee618f9b9..f5e514d57a68a 100644 --- a/x-pack/plugins/observability/public/pages/rule_details/components/rule_details_tabs.tsx +++ b/x-pack/plugins/observability/public/pages/rule_details/components/rule_details_tabs.tsx @@ -68,20 +68,6 @@ export function RuleDetailsTabs({ ]); const tabs: EuiTabbedContentTab[] = [ - { - id: RULE_DETAILS_EXECUTION_TAB, - name: i18n.translate('xpack.observability.ruleDetails.rule.eventLogTabText', { - defaultMessage: 'Execution history', - }), - 'data-test-subj': 'eventLogListTab', - content: ( - - - {rule && ruleType ? : null} - - - ), - }, { id: RULE_DETAILS_ALERTS_TAB, name: i18n.translate('xpack.observability.ruleDetails.rule.alertsTabText', { @@ -117,6 +103,20 @@ export function RuleDetailsTabs({ ), }, + { + id: RULE_DETAILS_EXECUTION_TAB, + name: i18n.translate('xpack.observability.ruleDetails.rule.eventLogTabText', { + defaultMessage: 'Execution history', + }), + 'data-test-subj': 'eventLogListTab', + content: ( + + + {rule && ruleType ? : null} + + + ), + }, ]; const handleTabIdChange = (newTabId: TabId) => { diff --git a/x-pack/plugins/observability/public/pages/rule_details/rule_details.tsx b/x-pack/plugins/observability/public/pages/rule_details/rule_details.tsx index 6a9c38b1b1e80..90ed7866a1560 100644 --- a/x-pack/plugins/observability/public/pages/rule_details/rule_details.tsx +++ b/x-pack/plugins/observability/public/pages/rule_details/rule_details.tsx @@ -103,7 +103,7 @@ export function RuleDetailsPage() { return urlTabId && [RULE_DETAILS_EXECUTION_TAB, RULE_DETAILS_ALERTS_TAB].includes(urlTabId) ? (urlTabId as TabId) - : RULE_DETAILS_EXECUTION_TAB; + : RULE_DETAILS_ALERTS_TAB; }); const [esQuery, setEsQuery] = useState<{ bool: BoolQuery }>(); diff --git a/x-pack/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts b/x-pack/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts index 9711443fcbf84..5ea77239f0f06 100644 --- a/x-pack/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts +++ b/x-pack/test/observability_functional/apps/observability/pages/alerts/state_synchronization.ts @@ -61,7 +61,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await assertAlertsPageState({ kuery: '', // workflowStatus: 'Open', - timeRange: 'Last 2 hours', + timeRange: 'Last 24 hours', }); });