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

Removed technical preview language #11761

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
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
5 changes: 5 additions & 0 deletions packages/logstash/changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
# newer versions go on top
- version: "2.4.12"
changes:
- description: Update documentation for GA of agent based monitoring
type: documentation
link: https://github.com/elastic/integrations/pull/11761
- version: "2.4.11"
changes:
- description: Guard against missing elements in codec payload
Expand Down
2 changes: 1 addition & 1 deletion packages/logstash/data_stream/node_cel/manifest.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
type: metrics
title: Logstash Node Stats
dataset: logstash.node
release: experimental
release: ga
elasticsearch:
index_template:
mappings:
Expand Down
10 changes: 5 additions & 5 deletions packages/logstash/docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ You can find additional information about monitoring Logstash with the Logstash

The `logstash` package works with Logstash 8.5.0 and later

## Technical Preview note
## Metrics Collection

This Logstash package also includes a technical preview of Logstash data collection and dashboards
native to elastic agent. The technical preview includes enhanced data collection, and a number of dashboards, which include additional insight into running pipelines.
Metric collection for the Logstash integration can be done via Elastic Agent (preferred) or with Stack Monitoring.
By utilizing Elastic Agent we are able to query additional monitoring APIs and provide additional dashboards, which provide the best view into your Logstash deployment and pipeline execution.

Note that this feature is not intended for use with the Stack Monitoring UI inside Kibana,
and is included as a technical preview. Existing implementations wishing to continue using the Stack Monitoring UI should uncheck the technical preview option, and continue to use `Metrics (Stack Monitoring)`. Those users who wish to use the technical preview should uncheck `Metrics (Stack Monitoring)` and check `Metrics (Technical Preview)`
Metrics collection is not compatible with the Stack Monitoring UI inside Kibana, only a single type of Metrics collection should be selected with this integration.
Users that prefer the Stack Monitoring UI should uncheck `Metrics (Elastic Agent)` and continue to use `Metrics (Stack Monitoring)`.


## Logs
Expand Down
59 changes: 30 additions & 29 deletions packages/logstash/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,16 @@ policy_templates:
title: Logstash logs and metrics
description: Collect logs and metrics from Logstash instances
inputs:
- type: logfile
title: "Logs"
description: "Collect application and slowlog logs from Logstash instances"
vars:
- name: condition
title: Condition
description: Condition to filter when to collect this input
type: text
multi: false
required: false
show_user: false
- type: logstash/metrics
title: "Metrics (Stack Monitoring)"
description: "Collect node metrics and stats from Logstash instances to power the Stack Monitoring application in Kibana.\n Please disable if only using Technical Preview Logstash Monitoring"
- type: cel
title: "Metrics (Elastic Agent)"
description: "Collect Metrics and stats from Logstash instances to power dedicated Logstash Dashboards in Kibana"
vars:
- name: hosts
- name: url
type: text
title: Hosts
multi: true
required: true
title: Logstash URL
show_user: true
default:
- http://localhost:9600
required: true
default: http://localhost:9600
- name: username
type: text
title: Username
Expand All @@ -71,7 +58,7 @@ policy_templates:
multi: false
required: false
show_user: false
- name: ssl
- name: resource_ssl
type: yaml
title: SSL Configuration
description: i.e. certificate, certificate_authorities, verification_mode etc. See [SSL](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#ssl-client-config) for details.
Expand All @@ -89,16 +76,29 @@ policy_templates:
multi: false
required: false
show_user: false
- type: cel
title: "Metrics (Technical Preview).\nPlease disable if using Stack Monitoring"
description: "Collect Metrics and stats from Logstash instances to power dedicated Logstash Dashboards in Kibana"
- type: logfile
title: "Logs"
description: "Collect application and slowlog logs from Logstash instances"
vars:
- name: url
- name: condition
title: Condition
description: Condition to filter when to collect this input
type: text
title: Logstash URL
show_user: true
multi: false
required: false
show_user: false
- type: logstash/metrics
title: "Metrics (Stack Monitoring)"
description: "Collect node metrics and stats from Logstash instances to power the Stack Monitoring application in Kibana.\n Disable if using Agent Based Monitoring."
vars:
- name: hosts
type: text
title: Hosts
multi: true
required: true
default: http://localhost:9600
show_user: true
default:
- http://localhost:9600
- name: username
type: text
title: Username
Expand All @@ -113,7 +113,7 @@ policy_templates:
multi: false
required: false
show_user: false
- name: resource_ssl
- name: ssl
type: yaml
title: SSL Configuration
description: i.e. certificate, certificate_authorities, verification_mode etc. See [SSL](https://www.elastic.co/guide/en/beats/metricbeat/current/configuration-ssl.html#ssl-client-config) for details.
Expand All @@ -131,3 +131,4 @@ policy_templates:
multi: false
required: false
show_user: false