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

Jump to bottom

Move HTTP calls to Logstash from New() to Fetch() #15306

Merged
merged 5 commits into from
Jan 3, 2020
Merged

Move HTTP calls to Logstash from New() to Fetch() #15306

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26bee1c
node_stats: move HTTP calls from New() to Fetch()
ycombinator Jan 2, 2020
ad2b588
node: move HTTP calls from New() to Fetch()
ycombinator Jan 2, 2020
b695681
Adding CHANGELOG entry
ycombinator Jan 2, 2020
f077d1d
Refactoring: extract common code into logstash package
ycombinator Jan 2, 2020
7ca1709
Unexporting getVersion
ycombinator Jan 2, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Fix CPU count in docker/cpu in cases where no `online_cpus` are reported {pull}15070[15070]
- Fix mixed modules loading standard and light metricsets {pull}15011[15011]
- Make `kibana` module more resilient to Kibana unavailability. {issue}15258[15258] {pull}15270[15270]
- Make `logstash` module more resilient to Logstash unavailability. {issue}15276[15276] {pull}15306[15306]

*Packetbeat*

Expand Down
35 changes: 18 additions & 17 deletions metricbeat/module/logstash/node/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,23 +58,6 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
return nil, err
}

if ms.XPack {
logstashVersion, err := logstash.GetVersion(ms)
if err != nil {
return nil, err
}

arePipelineGraphAPIsAvailable := logstash.ArePipelineGraphAPIsAvailable(logstashVersion)
if err != nil {
return nil, err
}

if !arePipelineGraphAPIsAvailable {
const errorMsg = "The %v metricset with X-Pack enabled is only supported with Logstash >= %v. You are currently running Logstash %v"
return nil, fmt.Errorf(errorMsg, ms.FullyQualifiedName(), logstash.PipelineGraphAPIsAvailableVersion, logstashVersion)
}
}

return &MetricSet{
ms,
}, nil
Expand Down Expand Up @@ -106,3 +89,21 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {

return nil
}

func (m *MetricSet) init() error {
if m.XPack {
logstashVersion, err := logstash.GetVersion(m.MetricSet)
if err != nil {
return err
}

arePipelineGraphAPIsAvailable := logstash.ArePipelineGraphAPIsAvailable(logstashVersion)

if !arePipelineGraphAPIsAvailable {
const errorMsg = "the %v metricset with X-Pack enabled is only supported with Logstash >= %v. You are currently running Logstash %v"
return fmt.Errorf(errorMsg, m.FullyQualifiedName(), logstash.PipelineGraphAPIsAvailableVersion, logstashVersion)
}
}

return nil
}
48 changes: 29 additions & 19 deletions metricbeat/module/logstash/node_stats/node_stats.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,25 +59,6 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
return nil, err
}

if ms.XPack {
logstashVersion, err := logstash.GetVersion(ms)
if err != nil {
return nil, err
}

arePipelineGraphAPIsAvailable := logstash.ArePipelineGraphAPIsAvailable(logstashVersion)
if err != nil {
return nil, err
}

if !arePipelineGraphAPIsAvailable {
const errorMsg = "The %v metricset with X-Pack enabled is only supported with Logstash >= %v. You are currently running Logstash %v"
return nil, fmt.Errorf(errorMsg, ms.FullyQualifiedName(), logstash.PipelineGraphAPIsAvailableVersion, logstashVersion)
}

ms.HTTP.SetURI(ms.HTTP.GetURI() + "?vertices=true")
}

return &MetricSet{
ms,
}, nil
Expand All @@ -87,6 +68,15 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
// It returns the event which is then forward to the output. In case of an error, a
// descriptive error must be returned.
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
err := m.init()
if err != nil {
if m.XPack {
m.Logger().Error(err)
return nil
}
return err
}

content, err := m.HTTP.FetchContent()
if err != nil {
if m.XPack {
Expand All @@ -107,3 +97,23 @@ func (m *MetricSet) Fetch(r mb.ReporterV2) error {

return nil
}

func (m *MetricSet) init() error {
if m.XPack {
logstashVersion, err := logstash.GetVersion(m.MetricSet)
if err != nil {
return err
}

arePipelineGraphAPIsAvailable := logstash.ArePipelineGraphAPIsAvailable(logstashVersion)

if !arePipelineGraphAPIsAvailable {
const errorMsg = "the %v metricset with X-Pack enabled is only supported with Logstash >= %v. You are currently running Logstash %v"
return fmt.Errorf(errorMsg, m.FullyQualifiedName(), logstash.PipelineGraphAPIsAvailableVersion, logstashVersion)
}

m.HTTP.SetURI(m.HTTP.GetURI() + "?vertices=true")
}

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ycombinator The two init function looks really close to me could it be possible to move them to the logstash package and use the same?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ph I extracted much of the common code into the logstash package. Please take a look at let me know what you think. Thanks!

return nil
}