From 4c7abf4edb422cbaa8b8a5105c10590530856f2a Mon Sep 17 00:00:00 2001 From: Jeffrey Chien Date: Thu, 27 Jul 2023 10:01:14 -0400 Subject: [PATCH] Remove windows event log plugin from adapter translation. (#362) --- .../tocwconfig/sampleConfig/complete_windows_config.yaml | 4 ---- translator/translate/otel/receiver/adapter/translators.go | 4 ++-- .../translate/otel/receiver/adapter/translators_test.go | 6 ++---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml index 1c1e70a6c2..441c5d06ad 100644 --- a/translator/tocwconfig/sampleConfig/complete_windows_config.yaml +++ b/translator/tocwconfig/sampleConfig/complete_windows_config.yaml @@ -165,9 +165,6 @@ receivers: alias_name: LogicalDisk collection_interval: 1m0s initial_delay: 1s - telegraf_windows_event_log: - collection_interval: 1m0s - initial_delay: 1s udplog/emf_logs: attributes: {} encoding: utf-8 @@ -212,7 +209,6 @@ service: - telegraf_win_perf_counters/3081249416 - telegraf_win_perf_counters/3762679655 - telegraf_win_perf_counters/4283769065 - - telegraf_windows_event_log traces/xray: exporters: - awsxray diff --git a/translator/translate/otel/receiver/adapter/translators.go b/translator/translate/otel/receiver/adapter/translators.go index 46cb69a947..8a258f0c15 100644 --- a/translator/translate/otel/receiver/adapter/translators.go +++ b/translator/translate/otel/receiver/adapter/translators.go @@ -32,7 +32,7 @@ var ( logKey = common.ConfigKey(common.LogsKey, common.LogsCollectedKey) logMetricKey = common.ConfigKey(common.LogsKey, common.MetricsCollectedKey) metricKey = common.ConfigKey(common.MetricsKey, common.MetricsCollectedKey) - skipInputSet = map[string]bool{files.SectionKey: true} + skipInputSet = collections.NewSet[string](files.SectionKey, windows_events.SectionKey) ) var ( @@ -149,7 +149,7 @@ func fromInputs(conf *confmap.Conf, validInputs map[string]bool, baseKey string) } } cfgKey := common.ConfigKey(baseKey, inputName) - if skipInputSet[inputName] { + if skipInputSet.Contains(inputName) { // logs agent is separate from otel agent continue } else if multipleInputSet.Contains(inputName) { diff --git a/translator/translate/otel/receiver/adapter/translators_test.go b/translator/translate/otel/receiver/adapter/translators_test.go index 0fefc570d8..7c64bef4d3 100644 --- a/translator/translate/otel/receiver/adapter/translators_test.go +++ b/translator/translate/otel/receiver/adapter/translators_test.go @@ -114,10 +114,8 @@ func TestFindReceiversInConfig(t *testing.T) { }, }, }, - os: translatorconfig.OS_TYPE_WINDOWS, - want: map[component.ID]wantResult{ - component.NewID("telegraf_windows_event_log"): {"logs::logs_collected::windows_events", time.Minute}, - }, + os: translatorconfig.OS_TYPE_WINDOWS, + want: map[component.ID]wantResult{}, }, "WithNoSocketListener": { input: map[string]interface{}{