Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[8.x] [UII] Advanced agent monitoring options UI for HTTP endpoint and diagnostics (#193361) #193658

Merged
merged 2 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 3 additions & 0 deletions packages/kbn-check-mappings-update-cli/current_fields.json
Original file line number Diff line number Diff line change
Expand Up @@ -605,8 +605,11 @@
"is_preconfigured",
"is_protected",
"keep_monitoring_alive",
"monitoring_diagnostics",
"monitoring_enabled",
"monitoring_http",
"monitoring_output_id",
"monitoring_pprof_enabled",
"name",
"namespace",
"overrides",
Expand Down
12 changes: 12 additions & 0 deletions packages/kbn-check-mappings-update-cli/current_mappings.json
Original file line number Diff line number Diff line change
Expand Up @@ -1996,13 +1996,25 @@
"keep_monitoring_alive": {
"type": "boolean"
},
"monitoring_diagnostics": {
"index": false,
"type": "flattened"
},
"monitoring_enabled": {
"index": false,
"type": "keyword"
},
"monitoring_http": {
"index": false,
"type": "flattened"
},
"monitoring_output_id": {
"type": "keyword"
},
"monitoring_pprof_enabled": {
"index": false,
"type": "boolean"
},
"name": {
"type": "keyword"
},
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-doc-links/src/get_doc_links.ts
Original file line number Diff line number Diff line change
Expand Up @@ -879,6 +879,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
roleAndPrivileges: `${FLEET_DOCS}fleet-roles-and-privileges.html`,
proxiesSettings: `${FLEET_DOCS}fleet-agent-proxy-support.html`,
unprivilegedMode: `${FLEET_DOCS}elastic-agent-unprivileged.html#unprivileged-change-mode`,
httpMonitoring: `${FLEET_DOCS}agent-policy.html#change-policy-enable-agent-monitoring`,
},
integrationDeveloper: {
upload: `${INTEGRATIONS_DEV_DOCS}upload-a-new-integration.html`,
Expand Down
1 change: 1 addition & 0 deletions packages/kbn-doc-links/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -564,6 +564,7 @@ export interface DocLinks {
roleAndPrivileges: string;
proxiesSettings: string;
unprivilegedMode: string;
httpMonitoring: string;
}>;
readonly integrationDeveloper: {
upload: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
"infra-custom-dashboards": "1a5994f2e05bb8a1609825ddbf5012f77c5c67f3",
"infrastructure-monitoring-log-view": "5f86709d3c27aed7a8379153b08ee5d3d90d77f5",
"infrastructure-ui-source": "113182d6895764378dfe7fa9fa027244f3a457c4",
"ingest-agent-policies": "90625b4a5ded9d4867358fcccc14a57c0454fcee",
"ingest-agent-policies": "5e95e539826a40ad08fd0c1d161da0a4d86ffc6d",
"ingest-download-sources": "279a68147e62e4d8858c09ad1cf03bd5551ce58d",
"ingest-outputs": "daafff49255ab700e07491376fe89f04fc998b91",
"ingest-package-policies": "53a94064674835fdb35e5186233bcd7052eabd22",
Expand Down
137 changes: 137 additions & 0 deletions x-pack/plugins/fleet/common/openapi/bundled.json
Original file line number Diff line number Diff line change
Expand Up @@ -7592,6 +7592,56 @@
},
"description": "User defined data tags that are added to all of the inputs. The values can be strings or numbers."
}
},
"monitoring_pprof_enabled": {
"type": "boolean"
},
"monitoring_http": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"host": {
"type": "string"
},
"port": {
"type": "number"
}
},
"required": [
"enabled"
]
},
"monitoring_diagnostics": {
"type": "object",
"properties": {
"limit": {
"type": "object",
"properties": {
"interval": {
"type": "string"
},
"burst": {
"type": "number"
}
}
},
"uploader": {
"type": "object",
"properties": {
"max_retries": {
"type": "number"
},
"init_dur": {
"type": "string"
},
"max_dur": {
"type": "string"
}
}
}
}
}
},
"required": [
Expand Down Expand Up @@ -7874,6 +7924,93 @@
}
}
},
"monitoring": {
"type": "object",
"properties": {
"namespace": {
"type": "string"
},
"use_output": {
"type": "string"
},
"enabled": {
"type": "boolean"
},
"metrics": {
"type": "boolean"
},
"logs": {
"type": "boolean"
},
"traces": {
"type": "boolean"
},
"pprof": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
}
},
"required": [
"enabled"
]
},
"http": {
"type": "object",
"properties": {
"enabled": {
"type": "boolean"
},
"host": {
"type": "string"
},
"port": {
"type": "number"
}
},
"required": [
"enabled"
]
},
"diagnostics": {
"type": "object",
"properties": {
"limit": {
"type": "object",
"properties": {
"interval": {
"type": "string"
},
"burst": {
"type": "number"
}
}
},
"uploader": {
"type": "object",
"properties": {
"max_retries": {
"type": "number"
},
"init_dur": {
"type": "string"
},
"max_dur": {
"type": "string"
}
}
}
}
}
},
"required": [
"enabled",
"metrics",
"logs",
"traces"
]
},
"fleet": {
"oneOf": [
{
Expand Down
89 changes: 89 additions & 0 deletions x-pack/plugins/fleet/common/openapi/bundled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4861,6 +4861,38 @@ components:
description: >-
User defined data tags that are added to all of the inputs. The
values can be strings or numbers.
monitoring_pprof_enabled:
type: boolean
monitoring_http:
type: object
properties:
enabled:
type: boolean
host:
type: string
port:
type: number
required:
- enabled
monitoring_diagnostics:
type: object
properties:
limit:
type: object
properties:
interval:
type: string
burst:
type: number
uploader:
type: object
properties:
max_retries:
type: number
init_dur:
type: string
max_dur:
type: string
required:
- id
- status
Expand Down Expand Up @@ -5054,6 +5086,63 @@ components:
type: integer
data:
$ref: '#/components/schemas/full_agent_policy_output_permissions'
monitoring:
type: object
properties:
namespace:
type: string
use_output:
type: string
enabled:
type: boolean
metrics:
type: boolean
logs:
type: boolean
traces:
type: boolean
pprof:
type: object
properties:
enabled:
type: boolean
required:
- enabled
http:
type: object
properties:
enabled:
type: boolean
host:
type: string
port:
type: number
required:
- enabled
diagnostics:
type: object
properties:
limit:
type: object
properties:
interval:
type: string
burst:
type: number
uploader:
type: object
properties:
max_retries:
type: number
init_dur:
type: string
max_dur:
type: string
required:
- enabled
- metrics
- logs
- traces
fleet:
oneOf:
- type: object
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,38 @@ properties:
- type: string
- type: number
description: User defined data tags that are added to all of the inputs. The values can be strings or numbers.
monitoring_pprof_enabled:
type: boolean
monitoring_http:
type: object
properties:
enabled:
type: boolean
host:
type: string
port:
type: number
required:
- enabled
monitoring_diagnostics:
type: object
properties:
limit:
type: object
properties:
interval:
type: string
burst:
type: number
uploader:
type: object
properties:
max_retries:
type: number
init_dur:
type: string
max_dur:
type: string
required:
- id
- status
Expand Down
Loading