Skip to content

Commit ad63e5c

Browse files
saikatsarkar056saikatsarkar056
authored
Merge branch 'main' into api_create_flyout
2 parents 47b4c6e + e3f7586 commit ad63e5c

45 files changed

Lines changed: 338 additions & 191 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/CODEOWNERS‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2555,6 +2555,9 @@ x-pack/test/security_solution_api_integration/test_suites/investigations @elasti
25552555
/x-pack/platform/plugins/shared/stack_connectors/server/connector_types/inference @elastic/appex-ai-infra @elastic/security-generative-ai @elastic/obs-ai-assistant
25562556
/x-pack/platform/plugins/shared/stack_connectors/common/inference @elastic/appex-ai-infra @elastic/security-generative-ai @elastic/obs-ai-assistant
25572557

2558+
# Token tracking
2559+
x-pack/platform/plugins/shared/actions/server/lib/token_tracking @elastic/security-generative-ai
2560+
25582561
## Defend Workflows owner connectors
25592562
/x-pack/platform/plugins/shared/stack_connectors/public/connector_types/sentinelone @elastic/security-defend-workflows
25602563
/x-pack/platform/plugins/shared/stack_connectors/server/connector_types/sentinelone @elastic/security-defend-workflows

‎docs/reference/configuration-reference/apm-settings.md‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
mapped_pages:
33
- https://www.elastic.co/guide/en/kibana/current/apm-settings-kb.html
4-
- https://github.com/elastic/cloud/blob/master/docs/cloud-enterprise/ce-apm-settings.asciidoc
54
applies_to:
65
deployment:
76
ess: all
@@ -90,19 +89,3 @@ More settings are available in the [Observability advanced settings](/reference/
9089

9190
`xpack.apm.latestAgentVersionsUrl` ![logo cloud](https://doc-icons.s3.us-east-2.amazonaws.com/logo_cloud.svg "Supported on {{ech}}")
9291
: Specifies the URL of a self hosted file that contains latest agent versions. Defaults to `https://apm-agent-versions.elastic.co/versions.json`. Set to `''` to disable requesting latest agent versions.
93-
94-
## Logging settings [logging-settings]
95-
96-
The following APM logging (legacy) settings are a subset of the valid settings:
97-
98-
`logging.level`
99-
: Specifies the minimum log level. One of debug, info, warning, or error. Defaults to info.
100-
101-
`logging.selectors`
102-
: The list of debugging-only selector tags used by different APM Server components. Use * to enable debug output for all components. For example, add publish to display all the debug messages related to event publishing.
103-
104-
`logging.metrics.enabled`
105-
: If enabled, APM Server periodically logs its internal metrics that have changed in the last period. Defaults to true.
106-
107-
`logging.metrics.period`
108-
: The period after which to log the internal metrics. Defaults to 30s.

‎docs/reference/configuration-reference/logging-settings.md‎

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
mapped_pages:
33
- https://www.elastic.co/guide/en/kibana/current/logging-settings.html
4-
- https://github.com/elastic/cloud/blob/master/docs/cloud-enterprise/ce-kibana-logging-settings.asciidoc
4+
- https://www.elastic.co/guide/en/cloud-enterprise/current/ece-kibana-logging-settings.html
55
applies_to:
66
deployment:
77
self: all
@@ -52,29 +52,4 @@ The following table serves as a quick reference for different logging configurat
5252
| `logging.loggers[].<logger>.appenders` | Determines the appender to apply to a specific logger context as an array. Optional and falls back to the appender(s) of the `root` logger if not specified. |
5353
| $$$enable-http-debug-logs$$$ `deprecation.enable_http_debug_logs` | Optional boolean to log debug messages when a deprecated API is called. Default is `false`. |
5454

55-
## Logging and audit settings [logging-and-audit-settings]
56-
57-
To update these settings, refer to [APM settings](/reference/configuration-reference/apm-settings.md).
58-
59-
60-
`logging.verbose`
61-
: If set to _true_, all events are logged, including system usage information and all requests. Defaults to _false_.
62-
63-
`logging.quiet`
64-
: If set to _true_, all logging output other than error messages is suppressed. Defaults to _false_.
65-
66-
`elasticsearch.logQueries`
67-
: When set to _true_, queries sent to Elasticsearch are logged (requires `logging.verbose` set to _true_). Defaults to _false_.
68-
69-
`xpack.security.audit.enabled`
70-
: When set to _true_, audit logging is enabled for security events. Defaults to _false_.
71-
72-
`xpack.security.audit.appender.type`
73-
: When set to _"rolling-file"_ and `xpack.security.audit.enabled` is set to _true_, Kibana ECS audit logs are enabled.
74-
Beginning with version 8.0, this setting is no longer necessary for ECS audit log output; it's only necessary to set `xpack.security.audit.enabled` to `true`
75-
76-
`xpack.security.audit.ignore_filters`
77-
: List of filters that determine which audit events should be excluded from the ECS audit log.
78-
79-
`xpack.security.audit.appender.kind`
80-
: When set to _"rolling-file"_ and `xpack.security.audit.enabled` is set to _true_, Kibana ECS audit logs are enabled.
55+
For details on audit logging settings, refer to the [{{kib}} security settings](./security-settings.md#audit-logging-settings).

‎x-pack/platform/packages/shared/onechat/onechat-server/src/tools.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ export interface EsqlTool<RunInput extends ZodObject<any> = ZodObject<any>, RunO
111111
string,
112112
{
113113
/**
114-
* The data type of the parameter.
114+
* The data types of the parameter.
115115
*/
116116
type: FieldTypes;
117117

‎x-pack/platform/plugins/private/translations/translations/fr-FR.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39772,7 +39772,6 @@
3977239772
"xpack.securitySolution.onboarding.aiConnector.descriptionStart": "Cette fonctionnalité s'appuie sur un connecteur IA pour la traduction des règles.",
3977339773
"xpack.securitySolution.onboarding.aiConnector.learnMoreLink": "En savoir plus",
3977439774
"xpack.securitySolution.onboarding.aiConnector.llmMatrixLink": "performances du modèle",
39775-
"xpack.securitySolution.onboarding.aiConnector.siemMigrationLink": "Migration SIEM optimisée par l'IA",
3977639775
"xpack.securitySolution.onboarding.aiConnector.title": "Configurer le fournisseur d'IA",
3977739776
"xpack.securitySolution.onboarding.aiConnectorCardInferenceDescription": "Le connecteur fourni par Elastic est sélectionné par défaut. Vous pouvez configurer un autre connecteur et un autre modèle si vous le souhaitez. En savoir plus sur {docsLink} et {llmMatrixLink}",
3977839777
"xpack.securitySolution.onboarding.aiConnectorCardNotInferenceDescription": "Consultez la {llmMatrixLink} pour savoir quels sont les modèles les plus performants et {docsLink} pour en savoir plus sur la migration SIEM optimisée par l'IA.",
@@ -39888,7 +39887,6 @@
3988839887
"xpack.securitySolution.onboarding.subTitle": "Bienvenue dans Elastic Security",
3988939888
"xpack.securitySolution.onboarding.Title": "Bonjour, {userName} !",
3989039889
"xpack.securitySolution.onboarding.topic.default": "Paramétrer la sécurité",
39891-
"xpack.securitySolution.onboarding.topic.siemMigrations": "Migration de règles SIEM",
3989239890
"xpack.securitySolution.open.timeline.batchActionsTitle": "Actions groupées",
3989339891
"xpack.securitySolution.open.timeline.cancelButton": "Annuler",
3989439892
"xpack.securitySolution.open.timeline.collapseButton": "Réduire",
@@ -40648,7 +40646,6 @@
4064840646
"xpack.securitySolution.siemMigrations.rules.status.failedLabel": "Erreur",
4064940647
"xpack.securitySolution.siemMigrations.rules.status.installedLabel": "Installé",
4065040648
"xpack.securitySolution.siemMigrations.rules.table.alreadyTranslatedTooltip": "Règle de migration déjà traduite",
40651-
"xpack.securitySolution.siemMigrations.rules.table.goToMigrationsPageButton": "Retourner aux Migrations SIEM",
4065240649
"xpack.securitySolution.siemMigrations.rules.table.installAndEnableButtonLabel": "Installer et activer",
4065340650
"xpack.securitySolution.siemMigrations.rules.table.installSelectedButtonAriaLabel": "Installer toutes les règles traduites sélectionnées",
4065440651
"xpack.securitySolution.siemMigrations.rules.table.installSelectedRules": "Installer ({numberOfSelectedRules}) règle(s) sélectionnée(s)",
@@ -40683,18 +40680,14 @@
4068340680
"xpack.securitySolution.siemMigrations.rules.tableColumn.statusTooltip": "{title} {installed} - déjà ajoutée à Elastic SIEM. Cliquez sur \"Afficher\" pour la gérer et l'activer.{lineBreak} {translated} - prête à installer. Cette règle a été mappée à une règle Elastic si possible, ou traduite par l'IA.{lineBreak} {partiallyTranslated} - une partie de la requête n'a pas pu être traduite. Téléchargez les macros ou consultations manquants et vérifiez votre syntaxe.{lineBreak} {notTranslated} - aucune des requêtes originales n'a pu être traduite.",
4068440681
"xpack.securitySolution.siemMigrations.rules.tableColumn.statusTooltipTitle": "Légende du statut de la traduction",
4068540682
"xpack.securitySolution.siemMigrations.rules.tableColumn.updatedLabel": "Mis à jour",
40686-
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.content": "Voici un guide étape par étape sur l'importation de vos règles, actifs et données SIEM vers Elastic Security. Alimenté par l'IA.",
4068740683
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.finishButton": "OK",
4068840684
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.subtitle": "Nouveau guide d'intégration !",
40689-
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.title": "Migration SIEM facilitée",
4069040685
"xpack.securitySolution.siemMigrations.rules.tour.statusStepContent": "Les règles {installed} ont une coche. Cliquez sur {view} pour accéder aux détails des règles. Les règles {translated} sont prêtes à être {install}, ou {edit}. Les règles comportant des erreurs peuvent être {reprocessed}. {lineBreak}{lineBreak} En savoir plus sur notre {link}",
40691-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.content": "Les règles traduites de chaque migration apparaissent sur sa page de traductions de règle SIEM. Changez de migration grâce à ce menu déroulant. Lancez une nouvelle migration en cliquant sur \"Télécharger d'autres règles à traduire\".",
4069240686
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.editLabel": "Modifier",
4069340687
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.finishButton": "OK",
4069440688
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installedLabel": "Installé",
4069540689
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installLabel": "Installer",
4069640690
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepContent": "Votre guide et vos règles migrées seront toujours situés dans le Hub d'intégration. Utilisez-le pour examiner les anciennes règles de migration, ou lancez-en une nouvelle.",
40697-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepTitle": "Guide de migration de règles SIEM",
4069840691
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.nextStepButton": "Suivant",
4069940692
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.reprocessedLabel": "Re-traitée",
4070040693
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.siemMigrationsLinkLabel": "Traductions par IA ici",

‎x-pack/platform/plugins/private/translations/translations/ja-JP.json‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39817,7 +39817,6 @@
3981739817
"xpack.securitySolution.onboarding.aiConnector.descriptionStart": "この機能はルール変換のAIコネクターに依存します。",
3981839818
"xpack.securitySolution.onboarding.aiConnector.learnMoreLink": "詳しくはこちら",
3981939819
"xpack.securitySolution.onboarding.aiConnector.llmMatrixLink": "モデルパフォーマンス",
39820-
"xpack.securitySolution.onboarding.aiConnector.siemMigrationLink": "AIを活用したSIEM移行",
3982139820
"xpack.securitySolution.onboarding.aiConnector.title": "AIプロバイダーを構成",
3982239821
"xpack.securitySolution.onboarding.aiConnectorCardInferenceDescription": "デフォルトでは、Elasticが提供するコネクターが選択されています。必要に応じて、別のコネクターとモデルを設定できます。{docsLink}と{llmMatrixLink}の詳細",
3982339822
"xpack.securitySolution.onboarding.aiConnectorCardNotInferenceDescription": "最適なパフォーマンスのモデルについては、{llmMatrixLink}を参照してください。AIを活用したSIEM移行については、{docsLink}。",
@@ -39933,7 +39932,6 @@
3993339932
"xpack.securitySolution.onboarding.subTitle": "Elastic Securityへようこそ",
3993439933
"xpack.securitySolution.onboarding.Title": "こんにちは、{userName}さん！",
3993539934
"xpack.securitySolution.onboarding.topic.default": "セキュリティを設定",
39936-
"xpack.securitySolution.onboarding.topic.siemMigrations": "SIEMルール移行",
3993739935
"xpack.securitySolution.open.timeline.batchActionsTitle": "一斉アクション",
3993839936
"xpack.securitySolution.open.timeline.cancelButton": "キャンセル",
3993939937
"xpack.securitySolution.open.timeline.collapseButton": "縮小",
@@ -40693,7 +40691,6 @@
4069340691
"xpack.securitySolution.siemMigrations.rules.status.failedLabel": "エラー",
4069440692
"xpack.securitySolution.siemMigrations.rules.status.installedLabel": "インストール済み",
4069540693
"xpack.securitySolution.siemMigrations.rules.table.alreadyTranslatedTooltip": "移行ルールはすでに変換されています",
40696-
"xpack.securitySolution.siemMigrations.rules.table.goToMigrationsPageButton": "SIEM移行に戻る",
4069740694
"xpack.securitySolution.siemMigrations.rules.table.installAndEnableButtonLabel": "インストールして有効化",
4069840695
"xpack.securitySolution.siemMigrations.rules.table.installSelectedButtonAriaLabel": "選択した変換されたルールをインストール",
4069940696
"xpack.securitySolution.siemMigrations.rules.table.installSelectedRules": "選択したルール（{numberOfSelectedRules}）をインストール",
@@ -40731,15 +40728,11 @@
4073140728
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.content": "これは、SIEMのルール、アセット、データをElastic Securityにすばやくインポートするための段階的なガイドです。AIを活用しています。",
4073240729
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.finishButton": "OK",
4073340730
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.subtitle": "新しいオンボーディングガイド！",
40734-
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.title": "SIEM移行の合理化",
4073540731
"xpack.securitySolution.siemMigrations.rules.tour.statusStepContent": "{installed}ルールにはチェックマークが付いています。{view}をクリックしてルールの詳細にアクセスします。{translated}ルールは{install}できます。また、{edit}することもできます。エラーのあるルールは{reprocessed}できます。{lineBreak}{lineBreak}{link}の詳細",
40736-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.content": "各移行の変換されたルールは、SIEMルール変換ページに表示されます。このドロップダウンを使用して移行を切り替えます。［変換するその他のルールをアップロード］をクリックして、新しい移行を開始します。",
4073740732
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.editLabel": "編集",
4073840733
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.finishButton": "OK",
4073940734
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installedLabel": "インストール済み",
4074040735
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installLabel": "インストール",
40741-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepContent": "ガイドと移行されたルールは、いつでもオンボーディングハブで確認できます。これを使用して、以前のルール移行をレビューしたり、新しい移行を開始したりできます。",
40742-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepTitle": "SIEMルール移行ガイド",
4074340736
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.nextStepButton": "次へ",
4074440737
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.reprocessedLabel": "再処理済み",
4074540738
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.siemMigrationsLinkLabel": "ここでAI変換",

‎x-pack/platform/plugins/private/translations/translations/zh-CN.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39797,7 +39797,6 @@
3979739797
"xpack.securitySolution.onboarding.aiConnector.descriptionStart": "此功能依赖 AI 连接器进行规则转换。",
3979839798
"xpack.securitySolution.onboarding.aiConnector.learnMoreLink": "了解详情",
3979939799
"xpack.securitySolution.onboarding.aiConnector.llmMatrixLink": "模型性能",
39800-
"xpack.securitySolution.onboarding.aiConnector.siemMigrationLink": "AI 驱动式 SIEM 迁移",
3980139800
"xpack.securitySolution.onboarding.aiConnector.title": "配置 AI 提供商",
3980239801
"xpack.securitySolution.onboarding.aiConnectorCardInferenceDescription": "默认情况下会选择 Elastic 提供的连接器。如果愿意，您可以配置其他连接器和模型。详细了解 {docsLink} 和 {llmMatrixLink}",
3980339802
"xpack.securitySolution.onboarding.aiConnectorCardNotInferenceDescription": "请参阅 {llmMatrixLink} 了解有关哪些模型性能最高的信息。有关 AI 驱动式 SIEM 迁移的 {docsLink}。",
@@ -39913,7 +39912,6 @@
3991339912
"xpack.securitySolution.onboarding.subTitle": "欢迎使用 Elastic Security",
3991439913
"xpack.securitySolution.onboarding.Title": "{userName} 您好！",
3991539914
"xpack.securitySolution.onboarding.topic.default": "设置 Security",
39916-
"xpack.securitySolution.onboarding.topic.siemMigrations": "SIEM 规则迁移",
3991739915
"xpack.securitySolution.open.timeline.batchActionsTitle": "批处理操作",
3991839916
"xpack.securitySolution.open.timeline.cancelButton": "取消",
3991939917
"xpack.securitySolution.open.timeline.collapseButton": "折叠",
@@ -40673,7 +40671,6 @@
4067340671
"xpack.securitySolution.siemMigrations.rules.status.failedLabel": "错误",
4067440672
"xpack.securitySolution.siemMigrations.rules.status.installedLabel": "已安装",
4067540673
"xpack.securitySolution.siemMigrations.rules.table.alreadyTranslatedTooltip": "已转换迁移规则",
40676-
"xpack.securitySolution.siemMigrations.rules.table.goToMigrationsPageButton": "返回到 SIEM 迁移",
4067740674
"xpack.securitySolution.siemMigrations.rules.table.installAndEnableButtonLabel": "安装并启用",
4067840675
"xpack.securitySolution.siemMigrations.rules.table.installSelectedButtonAriaLabel": "安装选定的已转换规则",
4067940676
"xpack.securitySolution.siemMigrations.rules.table.installSelectedRules": "安装选定项 ({numberOfSelectedRules})",
@@ -40711,15 +40708,12 @@
4071140708
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.content": "这是帮助将 SIEM 规则、资产和数据快速导入 Elastic Security 的分步指南。由 AI 提供支持。",
4071240709
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.finishButton": "确定",
4071340710
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.subtitle": "全新载入指南！",
40714-
"xpack.securitySolution.siemMigrations.rules.tour.setupSiemMigrationGuide.title": "精简的 SIEM 迁移",
4071540711
"xpack.securitySolution.siemMigrations.rules.tour.statusStepContent": "{installed} 规则带有复选标记。单击 {view} 可访问规则详情。{translated} 规则已准备就绪，您可以 {install}，或进行 {edit}。包含错误的规则可以进行 {reprocessed}。{lineBreak}{lineBreak} 详细了解我们的 {link}",
40716-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.content": "每项迁移的已转换规则在其 SIEM 规则转换页面上显示。使用此下拉列表在您的迁移之间切换。通过单击“上传更多规则以进行转换”启动新迁移。",
4071740712
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.editLabel": "编辑",
4071840713
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.finishButton": "确定",
4071940714
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installedLabel": "已安装",
4072040715
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.installLabel": "安装",
4072140716
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepContent": "您始终可在载入中心找到指南和已迁移规则。使用它可复查以前的规则迁移或启动新迁移。",
40722-
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.migrationGuideStepTitle": "SIEM 规则迁移指南",
4072340717
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.nextStepButton": "下一步",
4072440718
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.reprocessedLabel": "已重新处理",
4072540719
"xpack.securitySolution.siemMigrations.rules.tour.translationRuleGuide.siemMigrationsLinkLabel": "在此处进行 AI 转换",

0 commit comments

Comments
 (0)