Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
5596af3
saved object for engine monitoring config, type started WiP
CAWilson94 Apr 29, 2025
990132a
add all schema items to SOMapping for SavedObjectsTyoe
CAWilson94 Apr 30, 2025
2bc807b
PR comments addressed: savedObjectMapping initial pass
CAWilson94 May 1, 2025
e4c5383
matchers, dynamic false to stop uncontrolled field additions
CAWilson94 May 1, 2025
25e346f
schema for monitoring eneity source; descriptor client for savedObject
CAWilson94 May 1, 2025
6a17bac
typo, add SO to saved objectsin secsol server
CAWilson94 May 1, 2025
1253a07
schema updated - removed detectRemovals, matcher leafs all array type…
CAWilson94 May 1, 2025
4771fde
remove list endpoint, not required
CAWilson94 May 1, 2025
6bd8d77
fields and values string to arrays
CAWilson94 May 2, 2025
44c176f
data client jest test - WiP issues with joi locally, testing buildkit…
CAWilson94 May 7, 2025
bf92e49
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 7, 2025
ea6ed20
[CI] Auto-commit changed files from 'node scripts/check_mappings_upda…
kibanamachine May 7, 2025
9f61b4a
Update x-pack/solutions/security/plugins/security_solution/server/lib…
CAWilson94 May 7, 2025
681d3f5
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 7, 2025
23567cd
Merge remote-tracking branch 'origin/main' into ea-12283-monitoring-e…
CAWilson94 May 19, 2025
a2a72ab
monitoring entity source data client tests (unit) updated, all passing)
CAWilson94 May 20, 2025
82b13e8
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 20, 2025
99a9843
Update packages/kbn-check-mappings-update-cli/current_mappings.json
CAWilson94 May 20, 2025
9d21e44
Update packages/kbn-check-mappings-update-cli/current_fields.json
CAWilson94 May 20, 2025
dc02b6e
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 20, 2025
b954470
update typename to match doc spec
CAWilson94 May 20, 2025
72d9ec4
update monitoring entity source sync to just source - naming data client
CAWilson94 May 20, 2025
aa4e5a7
update import
CAWilson94 May 20, 2025
fa605a2
update naming
CAWilson94 May 20, 2025
d47399d
fix naming from sync - entity source only
CAWilson94 May 20, 2025
d722cd8
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 20, 2025
51d3a70
Update packages/kbn-check-mappings-update-cli/current_mappings.json
CAWilson94 May 20, 2025
1c21320
remove unused function
CAWilson94 May 20, 2025
3f4cf81
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 20, 2025
e55d087
Update monitoring routes to use Security Solution context instead of …
CAWilson94 May 20, 2025
0a3ce14
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 20, 2025
bb34621
Increment saved object types counter
CAWilson94 May 21, 2025
dd1fc6b
add monitoringDataClient to request_context
CAWilson94 May 21, 2025
08e91ae
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 21, 2025
82640da
[CI] Auto-commit changed files from 'node scripts/jest_integration -u…
kibanamachine May 21, 2025
f5ff787
update exported member of interface
CAWilson94 May 21, 2025
299e469
export interface for monitoringEntitySourceDescriptor
CAWilson94 May 21, 2025
514bd3e
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 21, 2025
c9ad81f
add registered type to so registration test
CAWilson94 May 21, 2025
08c50e8
update auth snapshot testing for FTR
CAWilson94 May 22, 2025
1d0365b
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 27, 2025
2734e42
reverted experimental features mistaken update; integrationName now s…
CAWilson94 May 29, 2025
56421dc
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 29, 2025
f4e2146
remove the detectRemovals mapping in schema - updated on design spec
CAWilson94 May 29, 2025
bd56ba7
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine May 29, 2025
cfe73c0
update mappings version for saved object: changing integrationName to…
CAWilson94 May 29, 2025
f0f126d
formatting
CAWilson94 May 29, 2025
ed55f03
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 29, 2025
606e74d
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 30, 2025
f9701e7
mappings changed index to dynamic for objects, removed index under ma…
CAWilson94 May 30, 2025
aa89ae8
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 May 30, 2025
fd52407
update saved objects count
CAWilson94 Jun 2, 2025
59a5312
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 2, 2025
f00f4d0
[CI] Auto-commit changed files from 'node scripts/jest_integration -u…
kibanamachine Jun 2, 2025
1efef05
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 3, 2025
0f23d39
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 3, 2025
1dc32ca
matchers reverted to specific properties
CAWilson94 Jun 3, 2025
5313ebb
remove unused mappings addition
CAWilson94 Jun 3, 2025
6332210
[CI] Auto-commit changed files from 'node scripts/jest_integration -u…
kibanamachine Jun 3, 2025
ba4646d
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Jun 3, 2025
25e005c
dynamic false added - index false out
CAWilson94 Jun 4, 2025
d5e1b93
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 4, 2025
21b3e4a
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 4, 2025
a364ec8
Remove index pattern - don't need to query this.
CAWilson94 Jun 5, 2025
23fec8f
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 5, 2025
6cdf28c
Updated matchers for non searchable with kibana core guidance
CAWilson94 Jun 5, 2025
616ff78
saved objects count update
CAWilson94 Jun 5, 2025
cd27928
Merge branch 'main' into ea-12283-monitoring-entity-source-config
CAWilson94 Jun 5, 2025
7d11fa7
[CI] Auto-commit changed files from 'node scripts/jest_integration -u…
kibanamachine Jun 5, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions packages/kbn-check-mappings-update-cli/current_fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,19 @@
"schemaVersion"
],
"enterprise_search_telemetry": [],
"entity-analytics-monitoring-entity-source": [
Comment thread
CAWilson94 marked this conversation as resolved.
"enabled",
"error",
"filter",
"indexPattern",
"integrationName",
"managed",
"matchers",
"matchers.fields",
"matchers.values",
"name",
"type"
],
"entity-definition": [
"description",
"filter",
Expand Down Expand Up @@ -828,6 +841,19 @@
"job.job_id",
"model_id"
],
"monitoring-entity-source": [
"enabled",
"error",
"filter",
"indexPattern",
"integrationName",
"managed",
"matchers",
"matchers.fields",
"matchers.values",
"name",
"type"
],
"monitoring-telemetry": [
"reportedClusterUuids"
],
Expand Down
31 changes: 31 additions & 0 deletions packages/kbn-check-mappings-update-cli/current_mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1059,6 +1059,37 @@
"dynamic": false,
"properties": {}
},
"entity-analytics-monitoring-entity-source": {
"dynamic": false,
"properties": {
"enabled": {
"type": "boolean"
},
"error": {
"type": "keyword"
},
"filter": {
"dynamic": false,
"type": "object"
},
"integrationName": {
"type": "keyword"
},
"managed": {
"type": "boolean"
},
"matchers": {
"dynamic": false,
"type": "object"
},
"name": {
"type": "keyword"
},
"type": {
"type": "keyword"
}
}
},
"entity-definition": {
"dynamic": false,
"properties": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
export { registerCoreObjectTypes } from './registration';

// set minimum number of registered saved objects to ensure no object types are removed after 8.8
// declared in internal implementation exclicilty to prevent unintended changes.
export const SAVED_OBJECT_TYPES_COUNT = 133 as const;
// declared in internal implementation explicitly to prevent unintended changes.
export const SAVED_OBJECT_TYPES_COUNT = 134 as const;
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
"endpoint:unified-user-artifact-manifest": "71c7fcb52c658b21ea2800a6b6a76972ae1c776e",
"endpoint:user-artifact-manifest": "1c3533161811a58772e30cdc77bac4631da3ef2b",
"enterprise_search_telemetry": "9ac912e1417fc8681e0cd383775382117c9e3d3d",
"entity-analytics-monitoring-entity-source": "207ca6f7ed3a04ebe33d81675a09e253446fe897",
"entity-definition": "1c6bff35c423d5dc5650bc806cf2899e4706a0bc",
"entity-discovery-api-key": "c267a65c69171d1804362155c1378365f5acef88",
"entity-engine-status": "09f6a617020708e4f638137e5ef35bd9534133be",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ const previouslyRegisteredTypes = [
'endpoint:user-artifact-manifest',
'endpoint:unified-user-artifact-manifest',
'enterprise_search_telemetry',
'entity-analytics-monitoring-entity-source',
'entity-definition',
'entity-discovery-api-key',
'epm-packages',
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
/*
* Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
* or more contributor license agreements. Licensed under the Elastic License
* 2.0; you may not use this file except in compliance with the Elastic License
* 2.0.
*/

/*
* NOTICE: Do not edit this file manually.
* This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
*
* info:
* title: Monitoring Entity Source Schema
* version: 1
*/

import { z } from '@kbn/zod';

export type MonitoringEntitySourceDescriptor = z.infer<typeof MonitoringEntitySourceDescriptor>;
export const MonitoringEntitySourceDescriptor = z.object({
type: z.string(),
name: z.string(),
managed: z.boolean().optional(),
indexPattern: z.string().optional(),
enabled: z.boolean().optional(),
error: z.string().optional(),
integrationName: z.string().optional(),
matchers: z
.array(
z.object({
fields: z.array(z.string()),
values: z.array(z.string()),
})
)
.optional(),
filter: z.object({}).optional(),
});

export type MonitoringEntitySourceResponse = z.infer<typeof MonitoringEntitySourceResponse>;
export const MonitoringEntitySourceResponse = z.object({
Comment thread
CAWilson94 marked this conversation as resolved.
id: z.string().optional(),
name: z.string().optional(),
type: z.string().optional(),
indexPattern: z.string().optional(),
integrationName: z.string().optional(),
enabled: z.boolean().optional(),
matchers: z
.array(
z.object({
fields: z.array(z.string()),
values: z.array(z.string()),
})
)
.optional(),
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,145 @@
openapi: 3.0.0
info:
title: Monitoring Entity Source Schema
description: Schema for managing entity source configurations in the monitoring system.
version: "1"

paths:
/api/entity_analytics/monitoring/entity_source:
post:
operationId: createEntitySource
summary: Create a new entity source configuration
requestBody:
required: true
content:
application/json:
schema:
$ref: "#/components/schemas/MonitoringEntitySourceDescriptor"
responses:
"200":
description: Entity source created successfully
content:
application/json:
schema:
$ref: "#/components/schemas/MonitoringEntitySourceResponse"

/api/entity_analytics/monitoring/entity_source/{id}:
Comment thread
CAWilson94 marked this conversation as resolved.
get:
operationId: getEntitySource
summary: Get an entity source configuration by ID
parameters:
- name: id
in: path
required: true
schema:
type: string
responses:
"200":
description: Entity source details retrieved
content:
application/json:
schema:
$ref: "#/components/schemas/MonitoringEntitySourceResponse"

put:
operationId: updateEntitySource
summary: Update an entity source configuration
parameters:
- name: id
in: path
required: true
schema:
type: string
requestBody:
required: true
content:
application/json:
schema:
$ref: "#/components/schemas/MonitoringEntitySourceDescriptor"
responses:
"200":
description: Entity source updated successfully

delete:
operationId: deleteEntitySource
summary: Delete an entity source configuration
parameters:
- name: id
in: path
required: true
schema:
type: string
responses:
"200":
description: Entity source deleted successfully

components:
schemas:
MonitoringEntitySourceDescriptor:
type: object
required: [type, name]
properties:
type:
type: string
name:
type: string
managed:
type: boolean
indexPattern:
type: string
enabled:
type: boolean
error:
type: string
integrationName:
type: string
matchers:
type: array
items:
type: object
required:
- fields
- values
properties:
fields:
type: array
items:
type: string
values:
type: array
items:
type: string
filter:
type: object

MonitoringEntitySourceResponse:
type: object
properties:
id:
type: string
name:
type: string
type:
type: string
indexPattern:
type: string
integrationName:
type: string
enabled:
type: boolean
matchers:
type: array
items:
type: object
required:
- fields
- values
properties:
fields:
type: array
items:
type: string
values:
type: array
items:
type: string
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ const createSecuritySolutionRequestContextMock = (
getEntityStoreApiKeyManager: jest.fn(),
getEntityStoreDataClient: jest.fn(() => clients.entityStoreDataClient),
getPrivilegeMonitoringDataClient: jest.fn(() => clients.privilegeMonitorDataClient),
getMonitoringEntitySourceDataClient: jest.fn(),
getSiemRuleMigrationsClient: jest.fn(() => clients.siemRuleMigrationsClient),
getInferenceClient: jest.fn(() => clients.getInferenceClient()),
getAssetInventoryClient: jest.fn(() => clients.assetInventoryDataClient),
Expand Down
Loading