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.

Sign up for GitHub

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

[apmpackage] Remove duplicate input variable attributes #5982

Merged
merged 3 commits into from
Aug 23, 2021
Merged

[apmpackage] Remove duplicate input variable attributes #5982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
513a68c
[apmpackage] Remove duplicate input variable attributes
simitt Aug 20, 2021
5b4d36a
Fix TLS settings
simitt Aug 23, 2021
b659a93
Merge branch 'master' into apmpackage-0.4.0
simitt Aug 23, 2021
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
6 changes: 3 additions & 3 deletions apmpackage/apm/agent/input/template.yml.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ apm-server:
certificate: {{tls_certificate}}
key: {{tls_key}}
key_passphrase: {{tls_key_passphrase}}
supported_protocols: {{tls_supported_protocols}}
supported_protocols:
{{#each tls_supported_protocols}}
- {{this}}
{{/each}}
cipher_suites: {{tls_cipher_suites}}
cipher_suites:
{{#each tls_cipher_suites}}
- {{this}}
{{/each}}
curve_types: {{tls_curve_types}}
curve_types:
{{#each tls_curve_types}}
- {{this}}
{{/each}}
Expand Down
121 changes: 1 addition & 120 deletions apmpackage/apm/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,219 +43,100 @@ policy_templates:
vars:
- name: host
type: text
title: Host
required: true
show_user: true
default: localhost:8200
- name: url
type: text
title: URL
required: true
show_user: true
default: http://localhost:8200
- name: secret_token
type: text
title: Secret token for Agent authentication
required: false
show_user: true
- name: api_key_enabled
type: bool
title: API Key for Agent authentication
description: Enable API Key auth between APM Server and APM Agents.
required: false
show_user: true
default: false
- name: enable_rum
type: bool
title: Enable RUM
description: Enable Real User Monitoring (RUM).
required: true
show_user: true
default: true
- name: anonymous_enabled
type: bool
title: Anonymous Agent access
description: Enable anonymous access to APM Server for select APM Agents.
required: false
show_user: true
default: true
- name: anonymous_allow_agent
type: text
title: Anonymous Agent access - allowed agents
description: Allowed agent names for anonymous access.
multi: true
required: false
show_user: false
default: ['rum-js', 'js-base', 'iOS/swift']
- name: anonymous_allow_service
type: text
title: Anonymous Agent access - allowed services
description: Allowed service names for anonymous access.
multi: true
required: false
show_user: false
- name: anonymous_rate_limit_event_limit
type: integer
title: Anonymous Agent access - event rate limit (event limit)
description: Maximum number of events per client IP per second.
required: false
show_user: false
default: 10
- name: anonymous_rate_limit_ip_limit
type: integer
title: Anonymous Agent access - rate limit (IP limit)
description: Number of unique client IPs for which a distinct rate limit will be maintained.
required: false
show_user: false
default: 10000
- name: default_service_environment
type: text
title: Default Service Environment
description: Default service environment to record in events which have no service environment defined.
required: false
show_user: false
- name: rum_allow_origins
type: text
title: RUM - Origin Headers
description: Allowed Origin headers to be sent by User Agents.
multi: true
required: false
show_user: false
default: ['"*"']
- name: rum_allow_headers
type: text
title: RUM - Access-Control-Allow-Headers
description: Supported Access-Control-Allow-Headers in addition to "Content-Type", "Content-Encoding" and "Accept".
multi: true
required: false
show_user: false
- name: rum_response_headers
type: yaml
title: RUM - Custom HTTP response headers
description: Added to RUM responses, e.g. for security policy compliance.
required: false
show_user: false
- name: rum_library_pattern
type: text
title: RUM - Library Frame Pattern
description: Identify library frames by matching a stacktrace frame's `file_name` and `abs_path` against this regexp.
required: false
show_user: false
default: '"node_modules|bower_components|~"'
- name: rum_exclude_from_grouping
type: text
title: RUM - Exclude from grouping
description: Exclude stacktrace frames from error group calculations by matching a stacktrace frame's `file_name` against this regexp.
required: false
show_user: false
default: '"^/webpack"'
- name: api_key_limit
type: integer
title: Maximum number of API Keys for Agent authentication
description: Restrict number of unique API Keys per minute, used for auth between APM Agents and Server.
required: false
show_user: false
default: 100
- name: max_event_bytes
type: integer
title: Maximum size per event (bytes)
required: false
show_user: false
default: 307200
- name: capture_personal_data
type: bool
title: Capture personal data
description: Capture personal data such as IP or User Agent.
required: false
show_user: false
default: true
- name: max_header_bytes
type: integer
title: Maximum size of a request's header (bytes)
required: false
show_user: false
default: 1048576
- name: idle_timeout
type: text
title: Idle time before underlying connection is closed
required: false
show_user: false
default: "45s"
- name: read_timeout
type: text
title: Maximum duration for reading an entire request
required: false
show_user: false
default: "3600s"
- name: shutdown_timeout
type: text
title: Maximum duration before releasing resources when shutting down
required: false
show_user: false
default: "30s"
- name: write_timeout
type: text
title: Maximum duration for writing a response
required: false
show_user: false
default: "30s"
- name: max_connections
type: integer
title: Simultaneously accepted connections
description: 0 for unlimited
required: false
show_user: false
default: 0
- name: response_headers
type: yaml
title: Custom HTTP headers added to HTTP responses
description: Might be used for security policy compliance.
required: false
show_user: false
- name: expvar_enabled
type: bool
title: Enable APM Server Golang expvar support
description: exposed under /debug/vars
required: false
show_user: false
default: false
- name: tls_enabled
type: bool
title: Enable TLS
required: false
show_user: false
default: false
- name: tls_certificate
type: text
title: File path to server certificate
description: Required when TLS is enabled.
required: false
show_user: false
- name: tls_key
type: text
title: File path to server certificate key
description: Required when TLS is enabled.
required: false
show_user: false
- name: tls_supported_protocols
type: text
multi: true
title: Supported protocol versions
required: false
show_user: false
default: ["TLSv1.0", "TLSv1.1", "TLSv1.2"]
- name: tls_cipher_suites
type: text
multi: true
title: Cipher suites for TLS connections.
description: Not configurable for TLS 1.3.
required: false
show_user: false
- name: tls_curve_types
type: text
multi: true
title: Curve types for ECDHE based cipher suites
required: false
show_user: false
template_path: template.yml.hbs
owner:
github: elastic/apm-server