Skip to content

Commit

Permalink
Reverting changes that added details to inventory
Browse files Browse the repository at this point in the history
  • Loading branch information
@rahulreddy15
rahulreddy15 committed Feb 24, 2025
1 parent da069a4 commit cbfcbea
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 351 deletions.
4 changes: 1 addition & 3 deletions pkg/integrations/legacy/runner.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,11 +707,9 @@ func EmitDataSet(
if err != nil {
return fmt.Errorf("couldn't determine a unique entity Key: %s", err.Error())
}
// Custom attributes are from infra agent config
customAttr := ctx.Config().CustomAttributes.DataMap()

if len(dataSet.Inventory) > 0 {
inventoryDataSet := BuildInventoryDataSet(elog, dataSet.Inventory, labels, customAttr, integrationUser, pluginName, pluginVersion, agentIdentifier, entityKey.String())
inventoryDataSet := BuildInventoryDataSet(elog, dataSet.Inventory, labels, integrationUser, pluginName, entityKey.String())
emitter.EmitInventory(inventoryDataSet, entity.NewWithoutID(entityKey))
}

Expand Down
101 changes: 16 additions & 85 deletions pkg/integrations/legacy/runner_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,7 @@ func newFakePlugin(ctx customContext, pluginVersion int) externalPlugin {
Context: ctx,
},
pluginInstance: &PluginV1Instance{
Labels: map[string]string{"role": "fileserver", "environment": "development", "agent_role": "overwrite agent role"},
Labels: map[string]string{"role": "fileserver", "environment": "development"},
plugin: &Plugin{
Name: "new-plugin",
ProtocolVersion: pluginVersion,
Expand Down Expand Up @@ -573,7 +573,7 @@ func newFakePluginWithEnvVars(pluginVersion int) externalPlugin {
Context: ctx,
},
pluginInstance: &PluginV1Instance{
Labels: map[string]string{"role": "fileserver", "environment": "development", "agent_role": "overwrite agent role"},
Labels: map[string]string{"role": "fileserver", "environment": "development"},
plugin: &Plugin{
Name: "new-plugin",
ProtocolVersion: pluginVersion,
Expand Down Expand Up @@ -676,36 +676,22 @@ func (rs *RunnerSuite) TestPluginHandleOutputV1(c *C) {
c.Assert(err, IsNil)

c.Assert(rd, NotNil)
c.Assert(len(rd.Data), Equals, 4)
c.Assert(rd.Data[0].SortKey(), Equals, "first")

invData := rd.Data[3].(protocol.InventoryData)

Check failure on line 682 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-linux / Run Linter 

type assertion must be checked (forcetypeassert)

Check failure on line 682 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-macos / Lint tests 

type assertion must be checked (forcetypeassert)

Check failure on line 682 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-windows / Lint tests 

type assertion must be checked (forcetypeassert)
c.Assert(invData["id"], Equals, "integrationUser")
c.Assert(invData["value"], Equals, "test")

c.Assert(event, NotNil)
c.Assert(event["event_type"], Equals, "LoadBalancerSample")
c.Assert(event["id"], Equals, "first")
c.Assert(event["value"], Equals, "random")
c.Assert(event["integrationUser"], Equals, "test")

expectedLabelValues := map[string]string{
"first": "fake",
"labels/my_group": "test group",
"labels/role": "fileserver",
"labels/environment": "development",
"labels/agent_role": "overwrite agent role",
"integrationUser": "test",
"integrationName": "test",
"integrationVersion": "1.0.0",
}

c.Assert(len(rd.Data), Equals, 8)

for _, item := range rd.Data {
if invData, ok := item.(protocol.InventoryData); ok {
id, _ := invData["id"].(string)
value, _ := invData["value"].(string)

if expectedValue, exists := expectedLabelValues[id]; exists {
c.Assert(value, Equals, expectedValue)
} else {
c.Fatalf("Expected label: %v not found in Inventory", id)
}
for _, labelKey := range labelKeys {
if rd.Data[1].SortKey() != labelKey && rd.Data[2].SortKey() != labelKey {
c.Errorf("There isn't label '%s'' in the inventory", labelKey)
}
}
}
Expand Down Expand Up @@ -740,7 +726,6 @@ func (rs *RunnerSuite) TestPluginHandleOutputEventsV1(c *C) {
// labels from pluginInstance
c.Assert(event["label.environment"], Equals, "development")
c.Assert(event["label.role"], Equals, "fileserver")
c.Assert(event["label.agent_role"], Equals, "overwrite agent role")

// labels from databind
c.Assert(event["label.expected"], Equals, "extra label")
Expand Down Expand Up @@ -846,7 +831,7 @@ func (rs *RunnerSuite) TestEventsPluginRunV1(c *C) {
c.Assert(err, IsNil)

c.Assert(rd, NotNil)
c.Assert(len(rd.Data), Equals, 7)
c.Assert(len(rd.Data), Equals, 3)
c.Assert(rd.Data[0].SortKey(), Equals, "first")

c.Assert(event, NotNil)
Expand Down Expand Up @@ -1045,7 +1030,7 @@ func (rs *RunnerSuite) TestHandleOutputV1(c *C) {
c.Assert(err, IsNil)

// labels are added as inventory
c.Assert(len(rd.Data)-len(labelKeys), Equals, 7)
c.Assert(len(rd.Data)-len(labelKeys), Equals, 3)

firstData := rd.Data[0]
inv := firstData.(protocol.InventoryData)
Expand Down Expand Up @@ -1560,16 +1545,12 @@ func TestParsePayloadV3(t *testing.T) {
type fakeEmitter struct {
lastEventData map[string]interface{}
lastEntityKey string
inventory types.PluginInventoryDataset
}

func (f *fakeEmitter) EmitInventoryWithPluginId(data types.PluginInventoryDataset, entityKey string, pluginId ids.PluginID) {
f.inventory = data
}

func (f *fakeEmitter) EmitInventory(data types.PluginInventoryDataset, entity entity.Entity) {
f.inventory = data
}
func (f *fakeEmitter) EmitInventory(data types.PluginInventoryDataset, entity entity.Entity) {}

Check failure on line 1553 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-linux / Run Linter 

unused-parameter: parameter 'data' seems to be unused, consider removing or renaming it as _ (revive)

Check failure on line 1553 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-macos / Lint tests 

unused-parameter: parameter 'data' seems to be unused, consider removing or renaming it as _ (revive)

Check failure on line 1553 in pkg/integrations/legacy/runner_test.go

View workflow job for this annotation

GitHub Actions / linter-windows / Lint tests 

unused-parameter: parameter 'data' seems to be unused, consider removing or renaming it as _ (revive)

func (f *fakeEmitter) EmitEvent(eventData map[string]interface{}, entityKey entity.Key) {
f.lastEventData = eventData
Expand Down Expand Up @@ -1605,29 +1586,6 @@ func TestEmitPayloadV2NoDisplayNameNoEntityName(t *testing.T) {
assert.EqualValues(t, "Motorbike", emitter.lastEventData["entityName"])
assert.EqualValues(t, "motorbike:street_hawk", emitter.lastEventData["entityKey"])

expectedLabelValues := map[string]string{
"integrationUser": "testuser",
"integrationName": "test/test",
"integrationVersion": "x.y.z",
"reportingAgent": "my-agent-id",
"motor": "", // we are type converting to string so motor does not have a value
}

assert.EqualValues(t, len(emitter.inventory), 5)

for _, item := range emitter.inventory {
if invData, ok := item.(protocol.InventoryData); ok {
id, _ := invData["id"].(string)
value, _ := invData["value"].(string)

if expectedValue, exists := expectedLabelValues[id]; exists {
assert.EqualValues(t, value, expectedValue)
} else {
assert.Fail(t, "Expected label not found in Inventory", "Label: %s not found in inventory", id)
}
}
}

// Local entity, no displayName, no entityName
assert.NoError(t, EmitDataSet(ctx, &emitter, "test/test", "x.y.z", "testuser", rd.DataSets[2], extraAnnotations, labels, entityRewrite, version))
_, ok := emitter.lastEventData["displayName"]
Expand All @@ -1636,27 +1594,6 @@ func TestEmitPayloadV2NoDisplayNameNoEntityName(t *testing.T) {
assert.False(t, ok)
// but entityKey is the agent key
assert.EqualValues(t, "my-agent-id", emitter.lastEventData["entityKey"])

// Check inventory data
assert.EqualValues(t, len(emitter.inventory), 5)

for _, item := range emitter.inventory {
if invData, ok := item.(protocol.InventoryData); ok {
id, _ := invData["id"].(string)
value, _ := invData["value"].(string)

if expectedValue, exists := expectedLabelValues[id]; exists {
assert.EqualValues(t, value, expectedValue)
} else {
assert.Fail(t, "Expected label not found in Inventory", "Label: %s not found in inventory", id)
}
}
}
}

func createMockConfigWithDataMap(attrs map[string]interface{}) *config.Config {
customAttrs := config.CustomAttributeMap(attrs)
return &config.Config{CustomAttributes: customAttrs} //nolint:all
}

func TestEmitDataSet_OnAddHostnameDecoratesWithHostname(t *testing.T) {
Expand Down Expand Up @@ -1689,7 +1626,6 @@ func TestEmitDataSet_OnAddHostnameDecoratesWithHostname(t *testing.T) {
ctx.On("EntityKey").Return(agentIdentifier)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver(hn, "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1741,7 +1677,6 @@ func TestEmitDataSet_EntityNameLocalhostIsNotReplacedWithHostnameV2(t *testing.T
ctx.On("EntityKey").Return(agID)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("foo.bar", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1789,7 +1724,6 @@ func TestEmitDataSet_EntityNameLocalhostIsReplacedWithHostnameV3(t *testing.T) {
ctx.On("EntityKey").Return(agID)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("foo.bar", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1838,7 +1772,6 @@ func TestEmitDataSet_MetricHostnameIsReplacedIfLocalhostV3(t *testing.T) {
ctx.On("EntityKey").Return(agID)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("foo.bar", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1888,7 +1821,6 @@ func TestEmitDataSet_ReportingFieldsAreReplacedIfLocalhostV3(t *testing.T) {
ctx.On("EntityKey").Return(agID)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("foo.bar", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1937,7 +1869,6 @@ func TestEmitDataSet_LogsEntityViolationsOncePerEntity(t *testing.T) {
ctx.On("EntityKey").Return(agID)
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("foo.bar", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))

em := &fakeEmitter{}
extraAnnotations := map[string]string{}
Expand Down Expand Up @@ -1975,7 +1906,6 @@ func TestEmitDataSet_DoNotOverrideExistingMetrics(t *testing.T) {
ctx.On("EntityKey").Return("agent-id")
ctx.On("HostnameResolver").Return(newFixedHostnameResolver("long", "short"))
ctx.On("IDLookup").Return(newFixedIDLookup())
ctx.On("Config").Return(createMockConfigWithDataMap(make(map[string]interface{})))
em := &fakeEmitter{}
extraAnnotations := map[string]string{
"cluster_name": "K8sDiscoveredCluster",
Expand Down Expand Up @@ -2277,7 +2207,8 @@ func TestLogFields(t *testing.T) {
"TEMP_DIR": "a/path",
})
assert.Equal(t, fields["labels"], map[string]string{
"agent_role": "overwrite agent role", "environment": "development", "role": "fileserver",
"role": "fileserver",
"environment": "development",
})

if runtime.GOOS == "windows" {
Expand Down
43 changes: 7 additions & 36 deletions pkg/integrations/legacy/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,22 +13,12 @@ import (
"github.com/sirupsen/logrus"
)

const (
integrationUserID = "integrationUser"
integrationNameID = "integrationName"
integrationVersionID = "integrationVersion"
reportingAgentID = "reportingAgent"
)

func BuildInventoryDataSet(
entryLog log.Entry,
inventoryData map[string]protocol.InventoryData,
labels map[string]string,
customAttr map[string]string,
integrationUser string,
pluginName string,
pluginVersion string,
reportingAgent string,
entityKey string) types.PluginInventoryDataset {
var inventoryDataSet types.PluginInventoryDataset

Expand All @@ -42,39 +32,20 @@ func BuildInventoryDataSet(
}
}

addLabeledData := func(id string, value string) {
for key, value := range labels {
inventoryDataSet = append(inventoryDataSet, protocol.InventoryData{
"id": id,
"id": fmt.Sprintf("labels/%s", key),
"value": value,
"entityKey": entityKey,
})
}

for key, value := range customAttr {
// Do not set in the case of duplicate key
if _, exists := labels[key]; !exists {
addLabeledData(fmt.Sprintf("labels/%s", key), value)
}
}

for key, value := range labels {
addLabeledData(fmt.Sprintf("labels/%s", key), value)
}

if integrationUser != "" {
addLabeledData(integrationUserID, integrationUser)
}

if pluginName != "" {
addLabeledData(integrationNameID, pluginName)
}

if pluginVersion != "" {
addLabeledData(integrationVersionID, pluginVersion)
}

if reportingAgent != "" {
addLabeledData(reportingAgentID, reportingAgent)
inventoryDataSet = append(inventoryDataSet, protocol.InventoryData{
"id": "integrationUser",
"value": integrationUser,
"entityKey": entityKey,
})
}

return inventoryDataSet
Expand Down
Loading

0 comments on commit cbfcbea

Please # to comment.