Skip to content

Commit

Permalink
Deprecate the metrics endpoint in Winlogbeat (#4145)
Browse files Browse the repository at this point in the history
The metrics endpoint is replaced by the http endpoint for all beats in 6.0. See #3717
  • Loading branch information
ruflin authored and andrewkroh committed May 1, 2017
1 parent 0c5f94b commit 243d3af
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 20 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,9 @@ https://github.com/elastic/beats/compare/v5.3.0...master[Check the HEAD diff]
*Packetbeat*

*Winlogbeat*
- Deprecated metrics endpoint. It is superseded by a libbeat feature that can serve metrics on an HTTP endpoint. {pull}4145[4145]

==== Knwon Issue
==== Known Issue

*Affecting all Beats*

Expand Down
6 changes: 0 additions & 6 deletions winlogbeat/_meta/beat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
# in the directory in which it was started.
#winlogbeat.registry_file: .winlogbeat.yml

# Diagnostic metrics that can retrieved through a web interface if a
# bindaddress value (host:port) is specified. The web address will be
# http://<bindaddress>/debug/vars
#winlogbeat.metrics:
# bindaddress: 'localhost:8123'

# event_logs specifies a list of event logs to monitor as well as any
# accompanying options. The YAML data type of event_logs is a list of
# dictionaries.
Expand Down
1 change: 1 addition & 0 deletions winlogbeat/beater/winlogbeat.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func (eb *Winlogbeat) setup(b *beat.Beat) error {
}

if config.Metrics.BindAddress != "" {
logp.Warn("DEPRECATED: Metrics endpoint is deprecated and will be removed in 6.0")
bindAddress := config.Metrics.BindAddress
sock, err := net.Listen("tcp", bindAddress)
if err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Windows will prevent Winlogbeat from reading the event log because it limits the
number of conditions that can be used in an event log query. If this occurs a similar
warning as shown below will be logged by Winlogbeat, and it will continue
processing data from other event logs. For more information, see
https://support.microsoft.com/en-us/kb/970453.
https://support.microsoft.com/en-us/kb/970453.
`WARN EventLog[Application] Open() error. No events will be read from this
source. The specified query is invalid.`
Expand All @@ -183,12 +183,12 @@ event IDs.
[source,yaml]
--------------------------------------------------------------------------------
processors:
- drop_event.when.and:
- equals.log_name: Security
- not.or:
- equals.event_id: 903
- equals.event_id: 1024
processors:
- drop_event.when.and:
- equals.log_name: Security
- not.or:
- equals.event_id: 903
- equals.event_id: 1024
- equals.event_id: 4624
--------------------------------------------------------------------------------
Expand Down Expand Up @@ -328,6 +328,8 @@ fields.

===== metrics.bindaddress

[]deprecated

The hostname and port where the Beat will host an HTTP web service that provides
metrics. This field is optional.

Expand Down
6 changes: 0 additions & 6 deletions winlogbeat/winlogbeat.full.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@
# in the directory in which it was started.
#winlogbeat.registry_file: .winlogbeat.yml

# Diagnostic metrics that can retrieved through a web interface if a
# bindaddress value (host:port) is specified. The web address will be
# http://<bindaddress>/debug/vars
#winlogbeat.metrics:
# bindaddress: 'localhost:8123'

# event_logs specifies a list of event logs to monitor as well as any
# accompanying options. The YAML data type of event_logs is a list of
# dictionaries.
Expand Down

0 comments on commit 243d3af

Please sign in to comment.