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

[Metricbeat] migrate docker module to ReporterV2 error #11462

Merged
merged 1 commit into from
Mar 28, 2019
Merged

[Metricbeat] migrate docker module to ReporterV2 error #11462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 4 additions & 8 deletions metricbeat/module/docker/container/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.container")

func init() {
mb.Registry.MustAddMetricSet("docker", "container", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -66,16 +63,15 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {

// Fetch returns a list of all containers as events.
// This is based on https://docs.docker.com/engine/reference/api/docker_remote_api_v1.24/#/list-containers.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
// Fetch a list of all containers.
containers, err := m.dockerClient.ContainerList(context.Background(), types.ContainerListOptions{})
if err != nil {
err = errors.Wrap(err, "failed to get docker containers list")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker containers list")
}
eventsMapping(r, containers, m.dedot)

return nil
}

//Close stops the metricset
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/docker/container/container_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
)

func TestData(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig())
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig())
events, errs := mbtest.ReportingFetchV2Error(f)
if len(errs) > 0 {
t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
}
assert.NotEmpty(t, events)

if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
if err := mbtest.WriteEventsReporterV2Error(f, t, ""); err != nil {
t.Fatal("write", err)
}
}
Expand Down
12 changes: 4 additions & 8 deletions metricbeat/module/docker/cpu/cpu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.cpu")

func init() {
mb.Registry.MustAddMetricSet("docker", "cpu", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -72,17 +69,16 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
}

// Fetch returns a list of docker CPU stats.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
stats, err := docker.FetchStats(m.dockerClient, m.Module().Config().Timeout)
if err != nil {
err = errors.Wrap(err, "failed to get docker stats")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker stats")
}

formattedStats := m.cpuService.getCPUStatsList(stats, m.dedot)
eventsMapping(r, formattedStats)

return nil
}

//Close stops the metricset
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/docker/cpu/cpu_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
)

func TestData(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig())
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig())
events, errs := mbtest.ReportingFetchV2Error(f)
if len(errs) > 0 {
t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
}
assert.NotEmpty(t, events)

if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
if err := mbtest.WriteEventsReporterV2Error(f, t, ""); err != nil {
t.Fatal("write", err)
}
}
Expand Down
12 changes: 4 additions & 8 deletions metricbeat/module/docker/diskio/diskio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.diskio")

func init() {
mb.Registry.MustAddMetricSet("docker", "diskio", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -63,17 +60,16 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
}

// Fetch creates list of events with diskio stats for all containers.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
stats, err := docker.FetchStats(m.dockerClient, m.Module().Config().Timeout)
if err != nil {
err = errors.Wrap(err, "failed to get docker stats")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker stats")
}

formattedStats := m.blkioService.getBlkioStatsList(stats, m.dedot)
eventsMapping(r, formattedStats)

return nil
}

//Close stops the metricset
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/docker/diskio/diskio_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
)

func TestData(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig())
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig())
events, errs := mbtest.ReportingFetchV2Error(f)
if len(errs) > 0 {
t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
}
assert.NotEmpty(t, events)

if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
if err := mbtest.WriteEventsReporterV2Error(f, t, ""); err != nil {
t.Fatal("write", err)
}
}
Expand Down
3 changes: 2 additions & 1 deletion metricbeat/module/docker/healthcheck/data.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (
"strings"

"github.com/docker/docker/api/types"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/common"
"github.com/elastic/beats/metricbeat/mb"
Expand All @@ -41,7 +42,7 @@ func eventMapping(r mb.ReporterV2, cont *types.Container, m *MetricSet) {

container, err := m.dockerClient.ContainerInspect(context.TODO(), cont.ID)
if err != nil {
logger.Error("Error inspecting container %v: %v", cont.ID, err)
errors.Wrapf(err, "Error inspecting container %v", cont.ID)
return
}

Expand Down
12 changes: 4 additions & 8 deletions metricbeat/module/docker/healthcheck/healthcheck.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.healthcheck")

func init() {
mb.Registry.MustAddMetricSet("docker", "healthcheck", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -65,16 +62,15 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {

// Fetch returns a list of all containers as events.
// This is based on https://docs.docker.com/engine/reference/api/docker_remote_api_v1.24/#/list-containers.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
// Fetch a list of all containers.
containers, err := m.dockerClient.ContainerList(context.TODO(), types.ContainerListOptions{})
if err != nil {
err = errors.Wrap(err, "failed to get docker containers list")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker containers list")
}
eventsMapping(r, containers, m)

return nil
}

//Close stops the metricset
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/docker/healthcheck/healthcheck_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
)

func TestData(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig())
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig())
events, errs := mbtest.ReportingFetchV2Error(f)
if len(errs) > 0 {
t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
}
assert.NotEmpty(t, events)

if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
if err := mbtest.WriteEventsReporterV2Error(f, t, ""); err != nil {
t.Fatal("write", err)
}
}
Expand Down
12 changes: 4 additions & 8 deletions metricbeat/module/docker/memory/memory.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.memory")

func init() {
mb.Registry.MustAddMetricSet("docker", "memory", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -63,17 +60,16 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
}

// Fetch creates a list of memory events for each container.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
stats, err := docker.FetchStats(m.dockerClient, m.Module().Config().Timeout)
if err != nil {
err = errors.Wrap(err, "failed to get docker stats")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker stats")
}

memoryStats := m.memoryService.getMemoryStatsList(stats, m.dedot)
eventsMapping(r, memoryStats)

return nil
}

//Close stops the metricset
Expand Down
6 changes: 3 additions & 3 deletions metricbeat/module/docker/memory/memory_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import (
)

func TestData(t *testing.T) {
f := mbtest.NewReportingMetricSetV2(t, getConfig())
events, errs := mbtest.ReportingFetchV2(f)
f := mbtest.NewReportingMetricSetV2Error(t, getConfig())
events, errs := mbtest.ReportingFetchV2Error(f)
if len(errs) > 0 {
t.Fatalf("Expected 0 error, had %d. %v\n", len(errs), errs)
}
assert.NotEmpty(t, events)

if err := mbtest.WriteEventsReporterV2(f, t, ""); err != nil {
if err := mbtest.WriteEventsReporterV2Error(f, t, ""); err != nil {
t.Fatal("write", err)
}
}
Expand Down
12 changes: 4 additions & 8 deletions metricbeat/module/docker/network/network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,10 @@ import (
"github.com/docker/docker/client"
"github.com/pkg/errors"

"github.com/elastic/beats/libbeat/logp"
"github.com/elastic/beats/metricbeat/mb"
"github.com/elastic/beats/metricbeat/module/docker"
)

var logger = logp.NewLogger("docker.network")

func init() {
mb.Registry.MustAddMetricSet("docker", "network", New,
mb.WithHostParser(docker.HostParser),
Expand Down Expand Up @@ -65,17 +62,16 @@ func New(base mb.BaseMetricSet) (mb.MetricSet, error) {
}

// Fetch methods creates a list of network events for each container.
func (m *MetricSet) Fetch(r mb.ReporterV2) {
func (m *MetricSet) Fetch(r mb.ReporterV2) error {
stats, err := docker.FetchStats(m.dockerClient, m.Module().Config().Timeout)
if err != nil {
err = errors.Wrap(err, "failed to get docker stats")
logger.Error(err)
r.Error(err)
return
return errors.Wrap(err, "failed to get docker stats")
}

formattedStats := m.netService.getNetworkStatsPerContainer(stats, m.dedot)
eventsMapping(r, formattedStats)

return nil
}

//Close stops the metricset
Expand Down
4 changes: 2 additions & 2 deletions metricbeat/module/docker/network/network_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import (
)

func TestData(t *testing.T) {
ms := mbtest.NewReportingMetricSetV2(t, getConfig())
err := mbtest.WriteEventsReporterV2(ms, t, "")
ms := mbtest.NewReportingMetricSetV2Error(t, getConfig())
err := mbtest.WriteEventsReporterV2Error(ms, t, "")
if err != nil {
t.Fatal("write", err)
}
Expand Down