Skip to content

[AutoOps] Reuse Common Fields and Drop non-standard ones #45101

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

Merged
pickypg merged 1 commit into from
Jun 30, 2025
Merged

[AutoOps] Reuse Common Fields and Drop non-standard ones #45101

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
5 changes: 0 additions & 5 deletions x-pack/metricbeat/module/autoops_es/auto_ops_testing/testing.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (
"github.com/gofrs/uuid/v5"
"github.com/stretchr/testify/require"

libbeatversion "github.com/elastic/beats/v7/libbeat/version"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils"
"github.com/elastic/elastic-agent-libs/mapstr"
Expand Down Expand Up @@ -346,10 +345,6 @@ func CheckEvent(t *testing.T, event mb.Event, info utils.ClusterInfo) {
require.Equal(t, info.ClusterID, GetObjectValue(event.ModuleFields, "cluster.id"))
require.Equal(t, info.ClusterName, GetObjectValue(event.ModuleFields, "cluster.name"))
require.Equal(t, info.Version.Number.String(), GetObjectValue(event.ModuleFields, "cluster.version"))

require.Equal(t, "autoops_es", GetObjectValue(event.RootFields, "service.name"))
require.Equal(t, libbeatversion.GetDefaultVersion(), GetObjectValue(event.RootFields, "metricbeatVersion"))
require.Equal(t, libbeatversion.Commit(), GetObjectValue(event.RootFields, "commit"))
}

func CheckEventWithTransactionId(t *testing.T, event mb.Event, info utils.ClusterInfo, transactionId string) {
Expand Down
8 changes: 4 additions & 4 deletions x-pack/metricbeat/module/autoops_es/cat_shards/cat_shards_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ func Test500FailedToResolveIndexesWhileFetching(t *testing.T) {
require.Equal(t, "GET", errorField.HTTPMethod)
require.Equal(t, 500, errorField.HTTPStatusCode)
require.Equal(t, "Server Error", errorField.HTTPResponse) // checking the HTTP response body
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
})
}

Expand All @@ -217,7 +217,7 @@ func Test404FailedToResolveIndexesWhileFetching(t *testing.T) {
require.Equal(t, "cat_shards", errorField.MetricSet)
require.Equal(t, "GET", errorField.HTTPMethod)
require.Equal(t, 404, errorField.HTTPStatusCode)
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
// avoiding the HTTP response body check on purpose, as the error response is a JSON string, and it's already tested
})
}
Expand All @@ -244,7 +244,7 @@ func Test405FailedToResolveIndexesWhileFetching(t *testing.T) {
require.Equal(t, "cat_shards", errorField.MetricSet)
require.Equal(t, "GET", errorField.HTTPMethod)
require.Equal(t, 405, errorField.HTTPStatusCode)
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
// avoiding the HTTP response body check on purpose, as the error response is a JSON string, and it's already tested
})
}
Expand All @@ -271,7 +271,7 @@ func Test500FailedToResolveIndexesWhileFetchingEmptyResponse(t *testing.T) {
require.Equal(t, "cat_shards", errorField.MetricSet)
require.Equal(t, "GET", errorField.HTTPMethod)
require.Equal(t, 500, errorField.HTTPStatusCode)
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
// avoiding the HTTP response body check on purpose, as the error response is a JSON string, and it's already tested
})
}
10 changes: 5 additions & 5 deletions x-pack/metricbeat/module/autoops_es/events/events.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
package events

import (
"github.com/elastic/beats/v7/libbeat/version"
"github.com/elastic/beats/v7/metricbeat/mb"
"github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils"
"github.com/elastic/elastic-agent-libs/mapstr"
Expand All @@ -29,10 +28,11 @@ func CreateEvent(info *utils.ClusterInfo, metricSetFields mapstr.M, transactionI
"transactionId": transactionId,
},
RootFields: mapstr.M{
"service.name": "autoops_es",
"metricbeatVersion": version.GetDefaultVersion(),
"commit": version.Commit(),
"orchestrator.resource.id": utils.GetResourceID(),
"orchestrator": mapstr.M{
"resource": mapstr.M{
"id": utils.GetResourceID(),
},
},
},
}
}
Expand Down
8 changes: 8 additions & 0 deletions x-pack/metricbeat/module/autoops_es/events/events_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
"testing"

"github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/auto_ops_testing"
"github.com/elastic/beats/v7/x-pack/metricbeat/module/autoops_es/utils"

"github.com/stretchr/testify/require"

Expand All @@ -37,6 +38,10 @@ func TestCreateEventWithRandomTransactionId(t *testing.T) {
}

func TestCreateEvent(t *testing.T) {
t.Cleanup(utils.ClearResourceID)

utils.SetResourceID("resource-id")

info := auto_ops_testing.CreateClusterInfo("8.15.3")
metricSetFields := mapstr.M{
"field1": "value1",
Expand All @@ -54,4 +59,7 @@ func TestCreateEvent(t *testing.T) {
require.Equal(t, "value1", auto_ops_testing.GetObjectValue(event.MetricSetFields, "field1"))
require.Equal(t, "value2", auto_ops_testing.GetObjectValue(event.MetricSetFields, "obj1.field1"))
require.Equal(t, "value3", auto_ops_testing.GetObjectValue(event.MetricSetFields, "obj2.field1"))

// orchestrator
require.Equal(t, "resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
}
4 changes: 2 additions & 2 deletions x-pack/metricbeat/module/autoops_es/metricset/cluster_info_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func TestNestedFailedClusterInfoNoId(t *testing.T) {
require.Equal(t, "test_nested_metricset", errorField.MetricSet)
require.Equal(t, http.MethodGet, errorField.HTTPMethod)
require.Equal(t, 0, errorField.HTTPStatusCode) // status code vary based on the server response for cluster not ready
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
})
}

Expand All @@ -82,6 +82,6 @@ func TestNestedFailedClusterInfoNAId(t *testing.T) {
require.Equal(t, "", errorField.ClusterID)
require.Equal(t, "/", errorField.URLPath)
require.Equal(t, "test_metricset", errorField.MetricSet)
require.Equal(t, "test-resource-id", event.RootFields["orchestrator.resource.id"])
require.Equal(t, "test-resource-id", auto_ops_testing.GetObjectValue(event.RootFields, "orchestrator.resource.id"))
})
}