Skip to content
Open
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
14 changes: 14 additions & 0 deletions extension/agenthealth/handler/useragent/useragent.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,17 @@
flagEnhancedContainerInsights = "enhanced_container_insights"
flagSELinux = "selinux"
flagROSA = "rosa"
FlagWindowsEventIDs = "win_event_ids"
FlagWindowsEventFilters = "win_event_filters"
FlagWindowsEventLevels = "win_event_levels"
separator = " "

typeInputs = "inputs"
typeProcessors = "processors"
typeOutputs = "outputs"
typeFeature = "feature"

pluginWindowsEventLog = "windows_event_log"

Check failure on line 46 in extension/agenthealth/handler/useragent/useragent.go

View workflow job for this annotation

GitHub Actions / Check lint

const `pluginWindowsEventLog` is unused (unused)
)

var (
Expand Down Expand Up @@ -79,9 +84,18 @@
func (ua *userAgent) SetComponents(otelCfg *otelcol.Config, telegrafCfg *telegraf.Config) {
ua.dataLock.Lock()
defer ua.dataLock.Unlock()

winFeatures := collections.NewSet[string]()

for _, input := range telegrafCfg.Inputs {
ua.inputs.Add(input.Config.Name)
ua.detectWindowsEventLogFeatures(input, winFeatures)
}

if len(winFeatures) > 0 {
ua.AddFeatureFlags(maps.Keys(winFeatures)...)
}

for _, output := range telegrafCfg.Outputs {
ua.outputs.Add(output.Config.Name)
}
Expand Down
16 changes: 16 additions & 0 deletions extension/agenthealth/handler/useragent/useragent_notwindows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//go:build !windows

// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: MIT

package useragent

import (
"github.com/influxdata/telegraf/models"

"github.com/aws/amazon-cloudwatch-agent/internal/util/collections"
)

func (ua *userAgent) detectWindowsEventLogFeatures(input *models.RunningInput, winFeatures collections.Set[string]) {

Check failure on line 14 in extension/agenthealth/handler/useragent/useragent_notwindows.go

View workflow job for this annotation

GitHub Actions / Check lint

unused-parameter: parameter 'input' seems to be unused, consider removing or renaming it as _ (revive)
// No-op on non-Windows platforms
}
14 changes: 14 additions & 0 deletions extension/agenthealth/handler/useragent/useragent_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -284,3 +284,17 @@ func TestListen(t *testing.T) {
ua.SetContainerInsightsFlag()
wg.Wait()
}

func TestWindowsEventLogAdoptionMetrics(t *testing.T) {
ua := newUserAgent()

ua.AddFeatureFlags(FlagWindowsEventIDs, FlagWindowsEventFilters, FlagWindowsEventLevels)

assert.Len(t, ua.feature, 3)
assert.Equal(t, "feature:(win_event_filters win_event_ids win_event_levels)", ua.featureStr.Load())

header := ua.Header(true)
assert.Contains(t, header, FlagWindowsEventIDs)
assert.Contains(t, header, FlagWindowsEventFilters)
assert.Contains(t, header, FlagWindowsEventLevels)
}
31 changes: 31 additions & 0 deletions extension/agenthealth/handler/useragent/useragent_windows.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//go:build windows

// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
// SPDX-License-Identifier: MIT

package useragent

import (
"github.com/influxdata/telegraf/models"

"github.com/aws/amazon-cloudwatch-agent/internal/util/collections"
"github.com/aws/amazon-cloudwatch-agent/plugins/inputs/windows_event_log"
)

func (ua *userAgent) detectWindowsEventLogFeatures(input *models.RunningInput, winFeatures collections.Set[string]) {
if input.Config.Name == pluginWindowsEventLog {
if plugin, ok := input.Input.(*windows_event_log.Plugin); ok {
for _, eventConfig := range plugin.Events {
if len(eventConfig.EventIDs) > 0 {
winFeatures.Add(FlagWindowsEventIDs)
}
if len(eventConfig.Filters) > 0 {
winFeatures.Add(FlagWindowsEventFilters)
}
if len(eventConfig.Levels) > 0 {
winFeatures.Add(FlagWindowsEventLevels)
}
}
}
}
}
Loading