diff --git a/cmd/ops_agent_uap_plugin/service_linux.go b/cmd/ops_agent_uap_plugin/service_linux.go index bdf08935aa..b369fb22d4 100644 --- a/cmd/ops_agent_uap_plugin/service_linux.go +++ b/cmd/ops_agent_uap_plugin/service_linux.go @@ -43,6 +43,7 @@ const ( LogsDirectory = "log/google-cloud-ops-agent" FluentBitStateDiectory = "state/fluent-bit" FluentBitRuntimeDirectory = "run/google-cloud-ops-agent-fluent-bit" + OtelStateDiectory = "state/opentelemetry-collector" OtelRuntimeDirectory = "run/google-cloud-ops-agent-opentelemetry-collector" DefaultPluginStateDirectory = "/var/lib/google-guest-agent/agent_state/plugins/ops-agent-plugin" ) @@ -209,7 +210,8 @@ func generateSubagentConfigs(ctx context.Context, runCommand RunCommandFunc, plu "-service", "otel", "-in", OpsAgentConfigLocationLinux, "-out", path.Join(pluginStateDirectory, OtelRuntimeDirectory), - "-logs", path.Join(pluginStateDirectory, LogsDirectory)) + "-logs", path.Join(pluginStateDirectory, LogsDirectory), + "-state", path.Join(pluginStateDirectory, OtelStateDiectory)) if output, err := runCommand(otelConfigGenerationCmd); err != nil { return fmt.Errorf("failed to generate Otel config:\ncommand output: %s\ncommand error: %s", output, err) @@ -220,7 +222,8 @@ func generateSubagentConfigs(ctx context.Context, runCommand RunCommandFunc, plu "-service", "fluentbit", "-in", OpsAgentConfigLocationLinux, "-out", path.Join(pluginStateDirectory, FluentBitRuntimeDirectory), - "-logs", path.Join(pluginStateDirectory, LogsDirectory), "-state", path.Join(pluginStateDirectory, FluentBitStateDiectory)) + "-logs", path.Join(pluginStateDirectory, LogsDirectory), + "-state", path.Join(pluginStateDirectory, FluentBitStateDiectory)) if output, err := runCommand(fluentBitConfigGenerationCmd); err != nil { return fmt.Errorf("failed to generate Fluntbit config:\ncommand output: %s\ncommand error: %s", output, err) diff --git a/cmd/ops_agent_windows/main_windows.go b/cmd/ops_agent_windows/main_windows.go index 0ddcfa7a50..8b7c03c579 100644 --- a/cmd/ops_agent_windows/main_windows.go +++ b/cmd/ops_agent_windows/main_windows.go @@ -106,6 +106,10 @@ func initServices() error { if err := os.MkdirAll(fluentbitStoragePath, 0644); err != nil { return err } + otelStoragePath := filepath.Join(os.Getenv("PROGRAMDATA"), dataDirectory, `run\file_storage`) + if err := os.MkdirAll(otelStoragePath, 0644); err != nil { + return err + } logDirectory := filepath.Join(os.Getenv("PROGRAMDATA"), dataDirectory, "log") if err := os.MkdirAll(logDirectory, 0644); err != nil { return err diff --git a/confgenerator/confgenerator.go b/confgenerator/confgenerator.go index cbb5489fab..267d42df64 100644 --- a/confgenerator/confgenerator.go +++ b/confgenerator/confgenerator.go @@ -122,7 +122,32 @@ func (uc *UnifiedConfig) getOTelLogLevel() string { return logLevel } -func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir string) (string, error) { +// fileStorageExtensionID returns the file_storage extension used by all receivers and exporters. +func fileStorageExtensionID() string { + return "file_storage" +} + +// fileStorageExtensionConfig returns a configured file_storage extension to be used by all receivers and exporters. +func fileStorageExtensionConfig(stateDir string) map[string]interface{} { + return map[string]interface{}{ + "directory": path.Join(stateDir, "file_storage"), + "create_directory": true, + } +} + +func (uc *UnifiedConfig) getEnabledExtensions(ctx context.Context, stateDir string) map[string]interface{} { + extensions := map[string]interface{}{} + expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"] + if expOtlpExporter { + extensions["googleclientauth"] = map[string]interface{}{} + } + if uc.Logging.Service.OTelLogging { + extensions["file_storage"] = fileStorageExtensionConfig(stateDir) + } + return extensions +} + +func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir, stateDir string) (string, error) { p := platform.FromContext(ctx) userAgent, _ := p.UserAgent("Google-Cloud-Ops-Agent-Metrics") metricVersionLabel, _ := p.VersionLabel("google-cloud-ops-agent-metrics") @@ -143,12 +168,7 @@ func (uc *UnifiedConfig) GenerateOtelConfig(ctx context.Context, outDir string) } agentSelfMetrics.AddSelfMetricsPipelines(receiverPipelines, pipelines) - expOtlpExporter := experimentsFromContext(ctx)["otlp_exporter"] - extensions := map[string]interface{}{} - if expOtlpExporter { - extensions["googleclientauth"] = map[string]interface{}{} - } - + extensions := uc.getEnabledExtensions(ctx, stateDir) otelConfig, err := otel.ModularConfig{ LogLevel: uc.getOTelLogLevel(), ReceiverPipelines: receiverPipelines, diff --git a/confgenerator/confgenerator_test.go b/confgenerator/confgenerator_test.go index afb6dc9381..070fe802fe 100644 --- a/confgenerator/confgenerator_test.go +++ b/confgenerator/confgenerator_test.go @@ -279,7 +279,7 @@ func generateConfigs(pc platformConfig, testDir string) (got map[string]string, } // Otel configs - otelGeneratedConfig, err := mergedUc.GenerateOtelConfig(ctx, "") + otelGeneratedConfig, err := mergedUc.GenerateOtelConfig(ctx, "", "") if err != nil { return } diff --git a/confgenerator/config.go b/confgenerator/config.go index 8162587599..9515a7975e 100644 --- a/confgenerator/config.go +++ b/confgenerator/config.go @@ -1179,7 +1179,7 @@ func (uc *UnifiedConfig) OTelLoggingSupported(ctx context.Context) bool { ucLoggingCopy.Logging.Service = &LoggingService{} } ucLoggingCopy.Logging.Service.OTelLogging = true - _, err = ucLoggingCopy.GenerateOtelConfig(ctx, "") + _, err = ucLoggingCopy.GenerateOtelConfig(ctx, "", "") return err == nil } diff --git a/confgenerator/files.go b/confgenerator/files.go index 5ed4be6eff..23afc6b715 100644 --- a/confgenerator/files.go +++ b/confgenerator/files.go @@ -59,7 +59,7 @@ func (uc *UnifiedConfig) GenerateFilesFromConfig(ctx context.Context, service, l } } case "otel": - otelConfig, err := uc.GenerateOtelConfig(ctx, outDir) + otelConfig, err := uc.GenerateOtelConfig(ctx, outDir, stateDir) if err != nil { return fmt.Errorf("can't parse configuration: %w", err) } diff --git a/confgenerator/logging_receivers.go b/confgenerator/logging_receivers.go index 6bece3f0b3..dc9ed58ce4 100644 --- a/confgenerator/logging_receivers.go +++ b/confgenerator/logging_receivers.go @@ -207,6 +207,9 @@ func (r LoggingReceiverFilesMixin) Pipelines(ctx context.Context) ([]otel.Receiv "preserve_leading_whitespaces": true, "preserve_trailing_whitespaces": true, } + if !r.TransformationTest { + receiver_config["storage"] = fileStorageExtensionID() + } if i := r.WildcardRefreshInterval; i != nil { receiver_config["poll_interval"] = i.String() } @@ -606,7 +609,7 @@ func (r LoggingReceiverWindowsEventLog) Pipelines(ctx context.Context) ([]otel.R "start_at": "beginning", "poll_interval": "1s", "ignore_channel_errors": true, - // TODO: Configure storage + "storage": fileStorageExtensionID(), } var p []otel.Component @@ -966,6 +969,7 @@ func (r LoggingReceiverSystemd) Pipelines(ctx context.Context) ([]otel.ReceiverP receiver_config := map[string]any{ "start_at": "beginning", "priority": "debug", + "storage": fileStorageExtensionID(), } modify_fields_processors, err := LoggingProcessorModifyFields{ diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml index e00dd34e4e..60b142591e 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -818,6 +822,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -832,6 +837,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -870,6 +876,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml index 36d3e400df..4eeb40e63a 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -789,6 +793,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -803,6 +808,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -839,6 +845,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml index e9cfb7c108..47d1bea779 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1180,6 +1184,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1223,16 +1228,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1266,6 +1274,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml index e9cfb7c108..47d1bea779 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_exclude_logs/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1180,6 +1184,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1223,16 +1228,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1266,6 +1274,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml index 96803db406..6d3b1aad38 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -791,6 +795,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -805,6 +810,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -843,6 +849,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml index 0c10a951c4..fdaab4b9d1 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -762,6 +766,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -776,6 +781,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -812,6 +818,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml index b955271d73..67c1f0c230 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1153,6 +1157,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1196,16 +1201,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1239,6 +1247,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml index b955271d73..67c1f0c230 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1153,6 +1157,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1196,16 +1201,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1239,6 +1247,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml index 0806e44a90..dd72cb8121 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -718,6 +722,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -760,6 +765,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml index c81f504e6d..7efd16bb22 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -689,6 +693,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -729,6 +734,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml index 66ab65f1dc..81c1487e28 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1113,16 +1117,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1156,6 +1163,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml index 66ab65f1dc..81c1487e28 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_modify_fields_ruby_regex/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1113,16 +1117,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1156,6 +1163,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml index baca164dcb..6b2df0f2a0 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -758,6 +762,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -772,6 +777,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -810,6 +816,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml index 4854afdaa0..5cb6a14083 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -729,6 +733,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -743,6 +748,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -779,6 +785,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml index 1a47ab8591..f8a93ab7b0 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1120,6 +1124,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1163,16 +1168,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1206,6 +1214,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml index 1a47ab8591..f8a93ab7b0 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_json/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1120,6 +1124,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1163,16 +1168,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1206,6 +1214,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index fe1b71d191..0b468b9f80 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -729,6 +733,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -767,6 +772,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index 03f6c74119..513c76c6a9 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -700,6 +704,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -736,6 +741,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index 75604f1bf0..daae670389 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1230,16 +1234,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1273,6 +1280,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index 75604f1bf0..daae670389 100644 --- a/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1230,16 +1234,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1273,6 +1280,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index 2562f7a162..1e3f37d65b 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -703,6 +707,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -717,6 +722,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -755,6 +761,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml index b6d7a860f1..cc5d171a09 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -674,6 +678,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -688,6 +693,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -724,6 +730,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 0f5b174c8e..a16f377dc0 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1065,6 +1069,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1108,16 +1113,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1151,6 +1159,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml index 0f5b174c8e..a16f377dc0 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1065,6 +1069,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1108,16 +1113,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1151,6 +1159,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml index 6619db4fec..f37c208300 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -793,6 +797,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -807,6 +812,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -845,6 +851,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml index 527357b492..3a4a5bb0f5 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -764,6 +768,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -778,6 +783,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -814,6 +820,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml index b553a41f8a..d50ae7c331 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1155,6 +1159,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1198,16 +1203,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1241,6 +1249,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml index b553a41f8a..d50ae7c331 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_kafka/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1155,6 +1159,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1198,16 +1203,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1241,6 +1249,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml index baabb8c923..9d01c0b415 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1305,6 +1309,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__general: exclude: [] include: @@ -1318,6 +1323,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__slow: exclude: [] include: @@ -1331,6 +1337,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -1345,6 +1352,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1383,6 +1391,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml index 94e2e26971..fc39517e65 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1276,6 +1280,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__general: exclude: [] include: @@ -1289,6 +1294,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__slow: exclude: [] include: @@ -1302,6 +1308,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -1316,6 +1323,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1352,6 +1360,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml index 7570ba6f32..c37c5d7777 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1667,6 +1671,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__general: exclude: [] include: @@ -1680,6 +1685,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__slow: exclude: [] include: @@ -1693,6 +1699,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1736,16 +1743,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1779,6 +1789,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml index 7570ba6f32..c37c5d7777 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_mysql/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1667,6 +1671,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__general: exclude: [] include: @@ -1680,6 +1685,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/mysql__slow: exclude: [] include: @@ -1693,6 +1699,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1736,16 +1743,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1779,6 +1789,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml index dfbec29a17..1f2843d045 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -951,6 +955,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/nginx__error: exclude: [] include: @@ -964,6 +969,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -978,6 +984,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1016,6 +1023,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml index 553b9ff114..4d012b6244 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -922,6 +926,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/nginx__error: exclude: [] include: @@ -935,6 +940,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/syslog: exclude: [] include: @@ -949,6 +955,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -985,6 +992,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml index bd359b30b8..4fbf3e4d68 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1313,6 +1317,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/nginx__error: exclude: [] include: @@ -1326,6 +1331,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1369,16 +1375,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1412,6 +1421,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml index bd359b30b8..4fbf3e4d68 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_nginx/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1313,6 +1317,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage filelog/nginx__error: exclude: [] include: @@ -1326,6 +1331,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -1369,16 +1375,19 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1412,6 +1421,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml index a181caee42..6c915eaad0 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -871,6 +875,8 @@ receivers: udp: listen_address: 2.2.2.2:2222 service: + extensions: + - file_storage pipelines: logs/logs_pipeline1_test__syslog__source__id__tcp: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml index 98ce7a60bf..1b5a3788bb 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -840,6 +844,8 @@ receivers: udp: listen_address: 2.2.2.2:2222 service: + extensions: + - file_storage pipelines: logs/logs_pipeline1_test__syslog__source__id__tcp: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml index 42606dd135..fcf5b2ef8c 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -953,6 +957,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_pipeline1_test__syslog__source__id__tcp: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml index 42606dd135..fcf5b2ef8c 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -953,6 +957,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_pipeline1_test__syslog__source__id__tcp: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml index db194d4ca9..4bbc35e8a8 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux-gpu/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -739,6 +743,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -757,6 +762,7 @@ receivers: journald/systemd__logs: priority: debug start_at: beginning + storage: file_storage nvml/hostmetrics_1: collection_interval: 60s otlpjsonfile/ops_agent: @@ -780,6 +786,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml index 7ae80a4e0d..82b7fecde0 100644 --- a/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-otel-receiver_systemd/golden/linux/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=linux;ShortName=linux_platform;ShortVersion=linux_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -710,6 +714,7 @@ receivers: preserve_leading_whitespaces: true preserve_trailing_whitespaces: true start_at: beginning + storage: file_storage hostmetrics/hostmetrics: collection_interval: 60s scrapers: @@ -728,6 +733,7 @@ receivers: journald/systemd__logs: priority: debug start_at: beginning + storage: file_storage otlpjsonfile/ops_agent: include: - enabled_receivers_otlp.json @@ -749,6 +755,8 @@ receivers: - targets: - 0.0.0.0:20201 service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_syslog: exporters: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml index 7782e9715f..446e79eb06 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1473,31 +1477,37 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_1: channel: System ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_2: channel: Microsoft-Windows-User Control Panel/Operational ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1531,6 +1541,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml index 7782e9715f..446e79eb06 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1473,31 +1477,37 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_1: channel: System ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_2: channel: Microsoft-Windows-User Control Panel/Operational ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1531,6 +1541,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml index e0f1829722..ef8a8cf363 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1175,28 +1179,33 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2: channel: Application ignore_channel_errors: true include_log_record_original: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_1: channel: System ignore_channel_errors: true include_log_record_original: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1230,6 +1239,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml index e0f1829722..ef8a8cf363 100644 --- a/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-otel-logging-receiver_winlog2_xml/golden/windows/otel.yaml @@ -15,6 +15,10 @@ exporters: service_resource_labels: true skip_create_descriptor: true user_agent: Google-Cloud-Ops-Agent-Metrics/latest (BuildDistro=build_distro;Platform=windows;ShortName=win_platform;ShortVersion=win_platform_version) +extensions: + file_storage: + create_directory: true + directory: file_storage processors: agentmetrics/hostmetrics_0: blank_label_metrics: @@ -1175,28 +1179,33 @@ receivers: ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_1: channel: Application ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/windows__event__log_2: channel: Security ignore_channel_errors: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2: channel: Application ignore_channel_errors: true include_log_record_original: true poll_interval: 1s start_at: beginning + storage: file_storage windowseventlog/winlog2_1: channel: System ignore_channel_errors: true include_log_record_original: true poll_interval: 1s start_at: beginning + storage: file_storage windowsperfcounters/iis: collection_interval: 60s perfcounters: @@ -1230,6 +1239,8 @@ receivers: - _Total object: SQLServer:Databases service: + extensions: + - file_storage pipelines: logs/logs_default__pipeline_windows__event__log: exporters: diff --git a/dev-docs/dev.md b/dev-docs/dev.md index 4936bddd0e..d96f81287b 100644 --- a/dev-docs/dev.md +++ b/dev-docs/dev.md @@ -820,6 +820,7 @@ Config file - Fluent Bit - Main config. Only present when the systemd fluent-bit Config file - Fluent Bit - Parsers config. Only present when the systemd fluent-bit unit is running. | `/var/run/google-cloud-ops-agent-fluent-bit/fluent_bit_parser.conf` Config file - OT Metrics Agent | `/var/run/google-cloud-ops-agent-opentelemetry-collector/otel.yaml` Buffer files - Fluent Bit | `/var/lib/google-cloud-ops-agent/fluent-bit/buffers/` +Bookmark files - OTel Collector | `/var/lib/google-cloud-ops-agent/opentelemetry-collector/file_storage/` #### Windows @@ -834,6 +835,7 @@ Config file - Fluent Bit - Main config | `C:\ProgramData\Google\Cloud Operati Config file - Fluent Bit - Parsers config | `C:\ProgramData\Google\Cloud Operations\Ops Agent\generated_configs\fluentbit\fluent_bit_parser.conf` Config file - OpenTelemetry | `C:\ProgramData\Google\Cloud Operations\Ops Agent\generated_configs\otel\otel.yaml` Buffer files - Fluent Bit | `C:\ProgramData\Google\Cloud Operations\Ops Agent\run\buffers` +Bookmark files - OTel Collector | `C:\ProgramData\Google\Cloud Operations\Ops Agent\run\file_storage` ### Check logs diff --git a/systemd/google-cloud-ops-agent-opentelemetry-collector.service b/systemd/google-cloud-ops-agent-opentelemetry-collector.service index b51d1c1bbc..b4cd4a14eb 100644 --- a/systemd/google-cloud-ops-agent-opentelemetry-collector.service +++ b/systemd/google-cloud-ops-agent-opentelemetry-collector.service @@ -23,7 +23,7 @@ RuntimeDirectory=google-cloud-ops-agent-opentelemetry-collector StateDirectory=google-cloud-ops-agent/opentelemetry-collector LogsDirectory=google-cloud-ops-agent Type=simple -ExecStartPre=@PREFIX@/libexec/google_cloud_ops_agent_engine -service=otel -in @SYSCONFDIR@/google-cloud-ops-agent/config.yaml -logs ${LOGS_DIRECTORY} +ExecStartPre=@PREFIX@/libexec/google_cloud_ops_agent_engine -service=otel -in @SYSCONFDIR@/google-cloud-ops-agent/config.yaml -logs ${LOGS_DIRECTORY} -state ${STATE_DIRECTORY} ExecStart=@PREFIX@/subagents/opentelemetry-collector/otelopscol --config=${RUNTIME_DIRECTORY}/otel.yaml --feature-gates=receiver.prometheusreceiver.RemoveStartTimeAdjustment Restart=always # For debugging: