Skip to content

Commit

Permalink
Merge branch 'main' into delete-connector-modal-fix
Browse files Browse the repository at this point in the history
  • Loading branch information
elasticmachine authored Jan 24, 2025
2 parents 66a7d55 + f0eb5d6 commit 1f1a1d6
Show file tree
Hide file tree
Showing 118 changed files with 1,820 additions and 592 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,7 @@ x-pack/solutions/search/plugins/search_playground @elastic/search-kibana
x-pack/solutions/search/plugins/search_solution/search_navigation @elastic/search-kibana
x-pack/solutions/search/plugins/search_synonyms @elastic/search-kibana
x-pack/solutions/search/plugins/serverless_search @elastic/search-kibana
x-pack/solutions/security/packages/connectors @elastic/security-threat-hunting-explore
x-pack/solutions/security/packages/data_table @elastic/security-threat-hunting-investigations
x-pack/solutions/security/packages/data-stream-adapter @elastic/security-threat-hunting
x-pack/solutions/security/packages/distribution_bar @elastic/kibana-cloud-security-posture
Expand Down
9 changes: 9 additions & 0 deletions oas_docs/output/kibana.serverless.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9721,6 +9721,8 @@ paths:
schema:
type: object
properties:
enrichPolicyExecutionInterval:
$ref: '#/components/schemas/Security_Entity_Analytics_API_Interval'
entityTypes:
items:
$ref: '#/components/schemas/Security_Entity_Analytics_API_EntityType'
Expand Down Expand Up @@ -9840,6 +9842,8 @@ paths:
schema:
type: object
properties:
enrichPolicyExecutionInterval:
$ref: '#/components/schemas/Security_Entity_Analytics_API_Interval'
fieldHistoryLength:
default: 10
description: The number of historical values to keep for each field.
Expand Down Expand Up @@ -50543,6 +50547,11 @@ components:
required:
- dsl
- response
Security_Entity_Analytics_API_Interval:
description: Interval in which enrich policy runs. For example, `"1h"` means the rule runs every hour.
example: 1h
pattern: ^[1-9]\d*[smh]$
type: string
Security_Entity_Analytics_API_RiskEngineScheduleNowErrorResponse:
type: object
properties:
Expand Down
9 changes: 9 additions & 0 deletions oas_docs/output/kibana.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11892,6 +11892,8 @@ paths:
schema:
type: object
properties:
enrichPolicyExecutionInterval:
$ref: '#/components/schemas/Security_Entity_Analytics_API_Interval'
entityTypes:
items:
$ref: '#/components/schemas/Security_Entity_Analytics_API_EntityType'
Expand Down Expand Up @@ -12007,6 +12009,8 @@ paths:
schema:
type: object
properties:
enrichPolicyExecutionInterval:
$ref: '#/components/schemas/Security_Entity_Analytics_API_Interval'
fieldHistoryLength:
default: 10
description: The number of historical values to keep for each field.
Expand Down Expand Up @@ -57418,6 +57422,11 @@ components:
required:
- dsl
- response
Security_Entity_Analytics_API_Interval:
description: Interval in which enrich policy runs. For example, `"1h"` means the rule runs every hour.
example: 1h
pattern: ^[1-9]\d*[smh]$
type: string
Security_Entity_Analytics_API_RiskEngineScheduleNowErrorResponse:
type: object
properties:
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,7 @@
"@kbn/security-plugin-types-public": "link:x-pack/platform/packages/shared/security/plugin_types_public",
"@kbn/security-plugin-types-server": "link:x-pack/platform/packages/shared/security/plugin_types_server",
"@kbn/security-role-management-model": "link:x-pack/platform/packages/private/security/role_management_model",
"@kbn/security-solution-connectors": "link:x-pack/solutions/security/packages/connectors",
"@kbn/security-solution-distribution-bar": "link:x-pack/solutions/security/packages/distribution_bar",
"@kbn/security-solution-ess": "link:x-pack/solutions/security/plugins/security_solution_ess",
"@kbn/security-solution-features": "link:x-pack/solutions/security/packages/features",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import { CaseStatuses } from './types';

export const getStatusConfiguration = () => ({
[CaseStatuses.open]: {
color: 'primary',
color: 'success',
label: i18n.OPEN,
icon: 'folderOpen' as const,
},
[CaseStatuses['in-progress']]: {
color: 'warning',
color: 'primary',
label: i18n.IN_PROGRESS,
icon: 'folderExclamation' as const,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -575,6 +575,9 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
? `${SERVERLESS_DOCS}observability-synthetics-get-started-project.html`
: `${OBSERVABILITY_DOCS}synthetic-run-tests.html#synthetic-monitor-choose-project`,
syntheticsMigrateFromIntegration: `${OBSERVABILITY_DOCS}synthetics-migrate-from-integration.html`,
slo: isServerless
? `${SERVERLESS_DOCS}observability-slos.html`
: `${OBSERVABILITY_DOCS}slo.html`,
sloBurnRateRule: isServerless
? `${SERVERLESS_DOCS}observability-create-slo-burn-rate-alert-rule.html`
: `${OBSERVABILITY_DOCS}slo-burn-rate-alert.html`,
Expand Down
1 change: 1 addition & 0 deletions src/platform/packages/shared/kbn-doc-links/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -390,6 +390,7 @@ export interface DocLinks {
syntheticsCommandReference: string;
syntheticsProjectMonitors: string;
syntheticsMigrateFromIntegration: string;
slo: string;
sloBurnRateRule: string;
aiAssistant: string;
}>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export interface CreateRuleFormProps {
shouldUseRuleProducer?: boolean;
canShowConsumerSelection?: boolean;
showMustacheAutocompleteSwitch?: boolean;
isServerless?: boolean;
onCancel?: () => void;
onSubmit?: (ruleId: string) => void;
}
Expand All @@ -60,6 +61,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
shouldUseRuleProducer = false,
canShowConsumerSelection = true,
showMustacheAutocompleteSwitch = false,
isServerless = false,
onCancel,
onSubmit,
} = props;
Expand Down Expand Up @@ -195,6 +197,7 @@ export const CreateRuleForm = (props: CreateRuleFormProps) => {
validConsumers,
ruleType,
ruleTypes,
isServerless,
}),
}}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import React, { useMemo } from 'react';
import { EuiEmptyPrompt, EuiText } from '@elastic/eui';
import { QueryClientProvider, QueryClient } from '@tanstack/react-query';
import { type RuleCreationValidConsumer } from '@kbn/rule-data-utils';
import { useParams } from 'react-router-dom';
import { CreateRuleForm } from './create_rule_form';
import { EditRuleForm } from './edit_rule_form';
Expand All @@ -27,10 +28,20 @@ export interface RuleFormProps {
plugins: RuleFormPlugins;
onCancel?: () => void;
onSubmit?: (ruleId: string) => void;
validConsumers?: RuleCreationValidConsumer[];
multiConsumerSelection?: RuleCreationValidConsumer | null;
isServerless?: boolean;
}

export const RuleForm = (props: RuleFormProps) => {
const { plugins: _plugins, onCancel, onSubmit } = props;
const {
plugins: _plugins,
onCancel,
onSubmit,
validConsumers,
multiConsumerSelection,
isServerless,
} = props;
const { id, ruleTypeId } = useParams<{
id?: string;
ruleTypeId?: string;
Expand Down Expand Up @@ -80,6 +91,9 @@ export const RuleForm = (props: RuleFormProps) => {
plugins={plugins}
onCancel={onCancel}
onSubmit={onSubmit}
validConsumers={validConsumers}
multiConsumerSelection={multiConsumerSelection}
isServerless={isServerless}
/>
);
}
Expand Down Expand Up @@ -112,6 +126,9 @@ export const RuleForm = (props: RuleFormProps) => {
actionTypeRegistry,
id,
ruleTypeId,
validConsumers,
multiConsumerSelection,
isServerless,
onCancel,
onSubmit,
]);
Expand Down
Loading

0 comments on commit 1f1a1d6

Please sign in to comment.