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

[Metricbeat] Memcached: add support for Unix socket #15822

Merged
merged 2 commits into from
Jan 27, 2020
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.next.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ TLS or Beats that accept connections over TLS and validate client certificates.
- Add a `system/network_summary` metricset {pull}15196[15196]
- Add mesh metricset for Istio Metricbeat module{pull}15535[15535]
- Make the `system/cpu` metricset collect normalized CPU metrics by default. {issue}15618[15618] {pull}15729[15729]
- Add support for Unix socket in Memcached metricbeat module. {issue}13685[13685] {pull}15822[15822]

*Packetbeat*

Expand Down
24 changes: 23 additions & 1 deletion metricbeat/module/memcached/stats/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,20 @@ package stats
import (
"bufio"
"net"
"net/url"
"strings"

"github.com/pkg/errors"

"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/mb/parse"
)

var hostParser = parse.URLHostParserBuilder{DefaultScheme: "tcp"}.Build()

func init() {
mb.Registry.MustAddMetricSet("memcached", "stats", New,
mb.WithHostParser(hostParser),
mb.DefaultMetricSet(),
)
}
Expand All @@ -47,7 +52,12 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
// format. It publishes the event which is then forwarded to the output. In case
// of an error set the Error field of mb.Event or simply call report.Error().
func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {
conn, err := net.DialTimeout("tcp", m.Host(), m.Module().Config().Timeout)
network, address, err := m.getNetworkAndAddress()
if err != nil {
return errors.Wrap(err, "error in fetch")
}

conn, err := net.DialTimeout(network, address, m.Module().Config().Timeout)
if err != nil {
return errors.Wrap(err, "error in fetch")
}
Expand Down Expand Up @@ -81,3 +91,15 @@ func (m *MetricSet) Fetch(reporter mb.ReporterV2) error {

return nil
}

func (m *MetricSet) getNetworkAndAddress() (network string, address string, err error) {
hostData := m.HostData()
u, err := url.Parse(hostData.URI)
if err != nil {
err = errors.Wrap(err, "invalid URL")
return
}
network = u.Scheme
address = u.Host
return
}