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

Check fields are documented for aws metricsets #23887

Merged
merged 3 commits into from
Feb 15, 2021
Merged

Check fields are documented for aws metricsets #23887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c8874
Check fields are documented for aws metricsets
kaiyan-sheng Feb 5, 2021
1670a9b
add changelog
kaiyan-sheng Feb 8, 2021
5bc2d55
Merge remote-tracking branch 'upstream/master' into s3_test
kaiyan-sheng Feb 8, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.next.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,6 +497,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Add stack monitoring section to elasticsearch module documentation {pull}#23286[23286]
- Fix metric grouping for windows/perfmon module {issue}23489[23489] {pull}23505[23505]
- Add check for iis/application_pool metricset for nil worker process id values. {issue}23605[23605] {pull}23647[23647]
- Unskip s3_request integration test. {pull}23887[23887]
- Add system.hostfs configuration option for system module. {pull}23831[23831]

*Packetbeat*
Expand Down Expand Up @@ -954,6 +955,7 @@ https://github.com/elastic/beats/compare/v7.0.0-alpha2...master[Check the HEAD d
- Apache: convert status.total_kbytes to status.total_bytes in fleet mode. {pull}23022[23022]
- Release MSSQL as GA {pull}23146[23146]
- Enrich events of `state_service` metricset with kubernetes services' metadata. {pull}23730[23730]
- Check fields are documented in aws metricsets. {pull}23887[23887]

*Packetbeat*

Expand Down
1 change: 1 addition & 0 deletions x-pack/metricbeat/module/aws/cloudwatch/cloudwatch_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ func TestFetch(t *testing.T) {
}

assert.NotEmpty(t, events)
mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
}

func TestData(t *testing.T) {
Expand Down
19 changes: 1 addition & 18 deletions x-pack/metricbeat/module/aws/rds/rds_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,7 @@ func TestFetch(t *testing.T) {
}

assert.NotEmpty(t, events)

for _, event := range events {
t.Logf("%s/%s event: %+v", metricSet.Module().Name(), metricSet.Name(), event)

// RootField
mtest.CheckEventField("service.name", "string", event, t)
mtest.CheckEventField("cloud.provider", "string", event, t)
mtest.CheckEventField("cloud.provider", "string", event, t)
mtest.CheckEventField("cloud.region", "string", event, t)
mtest.CheckEventField("cloud.availability_zone", "string", event, t)

// MetricSetField
mtest.CheckEventField("db_instance.arn", "string", event, t)
mtest.CheckEventField("db_instance.class", "string", event, t)
mtest.CheckEventField("queries", "float", event, t)
mtest.CheckEventField("latency.select", "float", event, t)
mtest.CheckEventField("login_failures", "float", event, t)
}
mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
}

func TestData(t *testing.T) {
Expand Down
9 changes: 1 addition & 8 deletions x-pack/metricbeat/module/aws/s3_daily_storage/s3_daily_storage_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,7 @@ func TestFetch(t *testing.T) {
}

assert.NotEmpty(t, events)

for _, event := range events {
mtest.CheckEventField("cloud.region", "string", event, t)
mtest.CheckEventField("aws.dimensions.BucketName", "string", event, t)
mtest.CheckEventField("aws.dimensions.StorageType", "string", event, t)
mtest.CheckEventField("aws.s3.metrics.BucketSizeBytes.avg", "float", event, t)
mtest.CheckEventField("aws.s3.metrics.NumberOfObjects.avg", "float", event, t)
}
mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
}

func TestData(t *testing.T) {
Expand Down
24 changes: 1 addition & 23 deletions x-pack/metricbeat/module/aws/s3_request/s3_request_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
)

func TestFetch(t *testing.T) {
t.Skip("flaky test: https://github.com/elastic/beats/issues/21826")
config := mtest.GetConfigForTest(t, "s3_request", "60s")

metricSet := mbtest.NewReportingMetricSetV2Error(t, config)
Expand All @@ -28,28 +27,7 @@ func TestFetch(t *testing.T) {
}

assert.NotEmpty(t, events)

for _, event := range events {
mtest.CheckEventField("cloud.region", "string", event, t)
mtest.CheckEventField("aws.dimensions.BucketName", "string", event, t)
mtest.CheckEventField("aws.dimensions.StorageType", "string", event, t)
mtest.CheckEventField("s3.metrics.AllRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.GetRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.PutRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.DeleteRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.HeadRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.PostRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.SelectRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.SelectScannedBytes.avg", "float", event, t)
mtest.CheckEventField("s3.metrics.SelectReturnedBytes.avg", "float", event, t)
mtest.CheckEventField("s3.metrics.ListRequests.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.BytesDownloaded.avg", "float", event, t)
mtest.CheckEventField("s3.metrics.BytesUploaded.avg", "float", event, t)
mtest.CheckEventField("s3.metrics.4xxErrors.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.5xxErrors.avg", "int", event, t)
mtest.CheckEventField("s3.metrics.FirstByteLatency.avg", "float", event, t)
mtest.CheckEventField("s3.metrics.TotalRequestLatency.avg", "float", event, t)
}
mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
}

func TestData(t *testing.T) {
Expand Down
18 changes: 1 addition & 17 deletions x-pack/metricbeat/module/aws/sqs/sqs_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,23 +27,7 @@ func TestFetch(t *testing.T) {
}

assert.NotEmpty(t, events)

for _, event := range events {
// RootField
mtest.CheckEventField("service.name", "string", event, t)
mtest.CheckEventField("cloud.region", "string", event, t)
// MetricSetField
mtest.CheckEventField("empty_receives", "float", event, t)
mtest.CheckEventField("messages.delayed", "float", event, t)
mtest.CheckEventField("messages.deleted", "float", event, t)
mtest.CheckEventField("messages.not_visible", "float", event, t)
mtest.CheckEventField("messages.received", "float", event, t)
mtest.CheckEventField("messages.sent", "float", event, t)
mtest.CheckEventField("messages.visible", "float", event, t)
mtest.CheckEventField("oldest_message_age.sec", "float", event, t)
mtest.CheckEventField("sent_message_size", "float", event, t)
mtest.CheckEventField("queue.name", "string", event, t)
}
mbtest.TestMetricsetFieldsDocumented(t, metricSet, events)
}

func TestData(t *testing.T) {
Expand Down