github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

[Fleet] Allow traces to be added to the monitoring_enabled array in Agent policies (#189908)

Browse source 
## Summary

This PR modifies the Agent policy schema to allow `traces` to be added
to the `monitoring_enabled` array.
This commit is contained in:
Shaunak Kashyap 2024-08-08 15:43:01 -07:00 • committed by GitHub
parent b5c7e53f17
commit b4b17c6f90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
x-pack/plugins/fleet/common/constants/epm.ts
View file

@ -93,6 +93,7 @@ export const agentAssetTypes = {
export const dataTypes = {
Logs: 'logs',
Metrics: 'metrics',
Traces: 'traces',
} as const;
// currently identical but may be a subset or otherwise different some day

2
x-pack/plugins/fleet/common/services/generate_new_agent_policy.test.ts
View file

@ -15,7 +15,7 @@ describe('generateNewAgentPolicyWithDefaults', () => {
name: '',
description: '',
namespace: 'default',
monitoring_enabled: ['logs', 'metrics'],
monitoring_enabled: ['logs', 'metrics', 'traces'],
inactivity_timeout: 1209600,
is_protected: false,
});

6
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
View file

@ -491,7 +491,7 @@ describe('When on the package policy create page', () => {
expect(sendCreateAgentPolicy as jest.MockedFunction<any>).toHaveBeenCalledWith(
{
description: '',
monitoring_enabled: ['logs', 'metrics'],
monitoring_enabled: ['logs', 'metrics', 'traces'],
name: 'Agent policy 2',
namespace: 'default',
inactivity_timeout: 1209600,
@ -526,7 +526,7 @@ describe('When on the package policy create page', () => {
expect(sendCreateAgentPolicy as jest.MockedFunction<any>).toHaveBeenCalledWith(
{
description: '',
monitoring_enabled: ['logs', 'metrics'],
monitoring_enabled: ['logs', 'metrics', 'traces'],
name: 'Agent policy 2',
namespace: 'default',
inactivity_timeout: 1209600,
@ -826,7 +826,7 @@ describe('When on the package policy create page', () => {
expect(sendGetOneAgentPolicy).not.toHaveBeenCalled();
expect(sendCreateAgentPolicy).toHaveBeenCalledWith(
expect.objectContaining({
monitoring_enabled: ['logs', 'metrics'],
monitoring_enabled: ['logs', 'metrics', 'traces'],
name: 'Agent policy 1',
}),
{ withSysMonitoring: true }

2
x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.test.tsx
View file

@ -541,7 +541,7 @@ describe('edit package policy page', () => {
expect(sendCreateAgentPolicy as jest.MockedFunction<any>).toHaveBeenCalledWith(
{
description: '',
monitoring_enabled: ['logs', 'metrics'],
monitoring_enabled: ['logs', 'metrics', 'traces'],
name: 'Agent policy 2',
namespace: 'default',
inactivity_timeout: 1209600,

2
x-pack/plugins/fleet/server/services/epm/kibana/index_pattern/install.ts
View file

@ -12,7 +12,7 @@ import { appContextService } from '../../..';
import { getPackageSavedObjects } from '../../packages/get';
const INDEX_PATTERN_SAVED_OBJECT_TYPE = 'index-pattern';
export const indexPatternTypes = Object.values(dataTypes);
export const indexPatternTypes = [dataTypes.Logs, dataTypes.Metrics];
export function getIndexPatternSavedObjects() {
return indexPatternTypes.map((indexPatternType) => ({

6
x-pack/plugins/fleet/server/types/models/agent_policy.ts
View file

@ -56,7 +56,11 @@ export const AgentPolicyBaseSchema = {
}),
monitoring_enabled: schema.maybe(
schema.arrayOf(
schema.oneOf([schema.literal(dataTypes.Logs), schema.literal(dataTypes.Metrics)])
schema.oneOf([
schema.literal(dataTypes.Logs),
schema.literal(dataTypes.Metrics),
schema.literal(dataTypes.Traces),
])
)
),
keep_monitoring_alive: schema.maybe(schema.boolean({ defaultValue: false })),