diff --git a/confgenerator/agentmetrics.go b/confgenerator/agentmetrics.go index 6ea3434372..fc277b355f 100644 --- a/confgenerator/agentmetrics.go +++ b/confgenerator/agentmetrics.go @@ -218,20 +218,14 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component { // Format fluentbit and otel logging metrics before aggregation. otel.MetricsTransform( otel.RenameMetric("fluentbit_stackdriver_retried_records_total", "fluentbit_log_entry_retry_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.RenameLabel("status", "response_code"), otel.AggregateLabels("sum", "response_code"), ), otel.DuplicateMetric("otelcol_exporter_send_failed_log_records", "otel_log_entry_retry_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.AddLabel("response_code", "400"), otel.AggregateLabels("sum", "response_code"), ), otel.RenameMetric("fluentbit_stackdriver_requests_total", "fluentbit_request_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.RenameLabel("status", "response_code"), otel.AggregateLabels("sum", "response_code"), ), @@ -242,20 +236,14 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component { otel.AggregateLabels("sum", "response_code"), ), otel.RenameMetric("fluentbit_stackdriver_proc_records_total", "fluentbit_log_entry_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.RenameLabel("status", "response_code"), otel.AggregateLabels("sum", "response_code"), ), otel.RenameMetric("otelcol_exporter_sent_log_records", "otel_log_entry_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.AddLabel("response_code", "200"), otel.AggregateLabels("sum", "response_code"), ), otel.RenameMetric("otelcol_exporter_send_failed_log_records", "otel_log_entry_count", - // change data type from double -> int64 - otel.ToggleScalarDataType, otel.AddLabel("response_code", "400"), otel.AggregateLabels("sum", "response_code"), ), @@ -297,6 +285,23 @@ func (r AgentSelfMetrics) LoggingMetricsPipelineProcessors() []otel.Component { // DeltaToCumulative keeps in memory information of previous delta points // to generate a valid cumulative monotonic metric. otel.DeltaToCumulative(), + otel.MetricStartTime(), + // Transfrom from double -> int64 after we apply the metricstarttime processor + // This prevents us from hitting b/ + otel.MetricsTransform( + otel.UpdateMetric("agent/log_entry_retry_count", + // change data type from double -> int64 + otel.ToggleScalarDataType, + ), + otel.UpdateMetric("agent/request_count", + // change data type from double -> int64 + otel.ToggleScalarDataType, + ), + otel.UpdateMetric("agent/log_entry_count", + // change data type from double -> int64 + otel.ToggleScalarDataType, + ), + ), // The processor "interval" outputs the last point in each 1 minute interval. otel.Interval("1m"), otel.MetricsTransform(otel.AddPrefix("agent.googleapis.com")), diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml index 95df0d3cae..131f57fa05 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux-gpu/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -384,13 +386,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -402,7 +409,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -414,7 +420,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -474,7 +479,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +490,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -498,7 +501,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -519,9 +521,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -692,8 +702,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml index 834cb020ac..01271c2520 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/linux/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -360,13 +362,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -378,7 +385,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -390,7 +396,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +455,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +466,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -474,7 +477,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -495,9 +497,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -658,8 +668,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml index f4e96d1075..c9216ce5e0 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -668,8 +678,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml index f4e96d1075..c9216ce5e0 100644 --- a/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -668,8 +678,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml index 0877ae9951..b11a77317b 100644 --- a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -722,8 +732,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml index db0bc9f3ef..b28a8515db 100644 --- a/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-custom_use_built_in_receivers/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -674,8 +684,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-quoted_map_keys/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/all-user_config_file_deleted/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux-dataproc/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml b/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/builtin/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml index 2e53b98f54..27fed15c41 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux-gpu/otel.yaml @@ -93,8 +93,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -411,13 +413,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -429,7 +436,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -441,7 +447,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -501,7 +506,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +517,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -525,7 +528,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -546,9 +548,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -780,8 +790,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml index ba6de2ec0d..4489f7c403 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/linux/otel.yaml @@ -88,8 +88,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -382,13 +384,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -400,7 +407,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -412,7 +418,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +477,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +488,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -496,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -517,9 +519,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -740,8 +750,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml index eb7a638689..3c2cb9a2ea 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows-2012/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -875,8 +885,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml index eb7a638689..3c2cb9a2ea 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp/golden/windows/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -875,8 +885,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml index 80dc3e37c5..a830158566 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -738,8 +748,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml index bcd4b8b5ff..7794c2c546 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -698,8 +708,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml index 47d04ee60a..d2d8038bfa 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -833,8 +843,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml index 47d04ee60a..d2d8038bfa 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -833,8 +843,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux-gpu/otel.yaml index d990ae1458..e8b2b46551 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux-gpu/otel.yaml @@ -92,8 +92,10 @@ processors: match_type: regexp metric_names: - "^agent\\.googleapis\\.com/gpu/utilization$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -410,13 +412,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -428,7 +435,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -440,7 +446,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +505,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -512,7 +516,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -524,7 +527,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -545,9 +547,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -746,8 +756,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux/otel.yaml index 0b71bbe6c3..59331ba6aa 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/linux/otel.yaml @@ -86,8 +86,10 @@ processors: match_type: regexp metric_names: - "^agent\\.googleapis\\.com/gpu/utilization$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -380,13 +382,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -398,7 +405,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -410,7 +416,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -470,7 +475,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -482,7 +486,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -494,7 +497,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -515,9 +517,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -705,8 +715,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows-2012/otel.yaml index d44eaa9e2d..09aa523527 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows-2012/otel.yaml @@ -103,8 +103,10 @@ processors: match_type: regexp metric_names: - "^agent\\.googleapis\\.com/gpu/utilization$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows/otel.yaml index d44eaa9e2d..09aa523527 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlecloudmonitoring_with_processor/golden/windows/otel.yaml @@ -103,8 +103,10 @@ processors: match_type: regexp metric_names: - "^agent\\.googleapis\\.com/gpu/utilization$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml index 5fddf2321e..50f3bc61a6 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux-gpu/otel.yaml @@ -93,8 +93,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -411,13 +413,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -429,7 +436,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -441,7 +447,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -501,7 +506,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +517,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -525,7 +528,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -546,9 +548,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml index 08b5dad522..f452c44e58 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/linux/otel.yaml @@ -88,8 +88,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -382,13 +384,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -400,7 +407,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -412,7 +418,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +477,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +488,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -496,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -517,9 +519,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml index 78e4e92d5a..39cbcd0ee3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows-2012/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml index 78e4e92d5a..39cbcd0ee3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_googlemanagedprometheus/golden/windows/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml index 5fddf2321e..50f3bc61a6 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux-gpu/otel.yaml @@ -93,8 +93,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -411,13 +413,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -429,7 +436,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -441,7 +447,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -501,7 +506,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +517,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -525,7 +528,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -546,9 +548,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml index 08b5dad522..f452c44e58 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/linux/otel.yaml @@ -88,8 +88,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -382,13 +384,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -400,7 +407,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -412,7 +418,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +477,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +488,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -496,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -517,9 +519,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml index 78e4e92d5a..39cbcd0ee3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows-2012/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml index 78e4e92d5a..39cbcd0ee3 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_grpcendpoint/golden/windows/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml index 2cee1f9e82..bfd1356d7b 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux-gpu/otel.yaml @@ -93,8 +93,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -411,13 +413,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -429,7 +436,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -441,7 +447,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -501,7 +506,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +517,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -525,7 +528,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -546,9 +548,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml index b8083f622e..e4e58f25ab 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/linux/otel.yaml @@ -88,8 +88,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -382,13 +384,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -400,7 +407,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -412,7 +418,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +477,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +488,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -496,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -517,9 +519,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml index f7a595a71d..de83db58dc 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows-2012/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml index f7a595a71d..de83db58dc 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_multiple_pipelines/golden/windows/otel.yaml @@ -103,8 +103,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml index d17b66535b..e7f4e794ac 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux-gpu/otel.yaml @@ -85,8 +85,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -403,13 +405,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -421,7 +428,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -433,7 +439,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -493,7 +498,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +509,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -517,7 +520,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -538,9 +540,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -731,8 +741,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml index 9bc9d8844b..eee71901c9 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/linux/otel.yaml @@ -80,8 +80,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -374,13 +376,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -392,7 +399,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -404,7 +410,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -464,7 +469,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -476,7 +480,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -488,7 +491,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -509,9 +511,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -691,8 +701,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml index 43bca3b370..1c84986026 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows-2012/otel.yaml @@ -95,8 +95,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -424,13 +426,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -442,7 +449,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -454,7 +460,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +519,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +530,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -538,7 +541,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -559,9 +561,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -826,8 +836,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml index 43bca3b370..1c84986026 100644 --- a/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/combined-receiver_otlp_no_traces/golden/windows/otel.yaml @@ -95,8 +95,10 @@ processors: - namespace - cluster - location - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -424,13 +426,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -442,7 +449,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -454,7 +460,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +519,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +530,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -538,7 +541,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -559,9 +561,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -826,8 +836,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-default-log-rotation_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_false/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/global-service_default_self_log_file_collection_true/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-custom_log_level/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-default_overrides_disable_all/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..572365afd1 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 @@ -200,8 +200,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -518,13 +520,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -536,7 +543,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -548,7 +554,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -608,7 +613,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -620,7 +624,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -632,7 +635,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -653,9 +655,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -952,8 +962,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..c62182f416 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 @@ -195,8 +195,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -489,13 +491,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -507,7 +514,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -519,7 +525,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -579,7 +584,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -591,7 +595,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -603,7 +606,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -624,9 +626,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -912,8 +922,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 8697e2214b..9b954f3c01 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 @@ -210,8 +210,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -539,13 +541,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -557,7 +564,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -569,7 +575,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -629,7 +634,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -641,7 +645,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -653,7 +656,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -674,9 +676,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1359,8 +1369,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 8697e2214b..9b954f3c01 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 @@ -210,8 +210,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -539,13 +541,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -557,7 +564,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -569,7 +575,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -629,7 +634,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -641,7 +645,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -653,7 +656,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -674,9 +676,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1359,8 +1369,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..c6aaa6bda0 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -903,8 +913,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..ad0f9d6ce6 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 877b1ce60f..9443786639 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1310,8 +1320,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 877b1ce60f..9443786639 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1310,8 +1320,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..4e5d6ddaa2 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -820,8 +830,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..c2d1c96e2c 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -780,8 +790,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 28a53de2f9..ce075d61fd 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1227,8 +1237,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 28a53de2f9..ce075d61fd 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1227,8 +1237,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..f9717db7d5 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -870,8 +880,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..c35f845e14 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -830,8 +840,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 9c97299e74..90df1f3783 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1277,8 +1287,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 9c97299e74..90df1f3783 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1277,8 +1287,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..5fd87d2985 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -819,8 +829,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..6ff26fb5f9 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -779,8 +789,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 d852f1cd4a..6a00a01cdb 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1338,8 +1348,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 d852f1cd4a..6a00a01cdb 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1338,8 +1348,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..4e228d3596 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -814,8 +824,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..a87cfb78a7 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -774,8 +784,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 e43cf1de10..fc103be327 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1221,8 +1231,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 e43cf1de10..fc103be327 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1221,8 +1231,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..2335a7d3e0 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 @@ -84,7 +84,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/kafka_0: operators: @@ -99,6 +99,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -907,8 +917,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..b7452124b9 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 @@ -79,7 +79,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/kafka_0: operators: @@ -94,6 +94,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -386,13 +388,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -404,7 +411,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -416,7 +422,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -476,7 +481,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +492,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -500,7 +503,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -521,9 +523,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -867,8 +877,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 2ccb70610e..ebabcb63c3 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 @@ -94,7 +94,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/kafka_0: operators: @@ -109,6 +109,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1314,8 +1324,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 2ccb70610e..ebabcb63c3 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 @@ -94,7 +94,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/kafka_0: operators: @@ -109,6 +109,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1314,8 +1324,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..9292e7dfba 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 @@ -84,7 +84,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/mysql__general_0: operators: @@ -112,6 +112,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -428,13 +430,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -446,7 +453,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -458,7 +464,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -518,7 +523,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -530,7 +534,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -542,7 +545,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -563,9 +565,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1470,8 +1480,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..20c3e4e3d7 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 @@ -79,7 +79,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/mysql__general_0: operators: @@ -107,6 +107,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -399,13 +401,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -417,7 +424,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -429,7 +435,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -489,7 +494,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -501,7 +505,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -513,7 +516,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -534,9 +536,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1430,8 +1440,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 7df9cdde94..2b9113d318 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 @@ -94,7 +94,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/mysql__general_0: operators: @@ -122,6 +122,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -449,13 +451,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +474,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -479,7 +485,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -539,7 +544,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -551,7 +555,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -563,7 +566,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -584,9 +586,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1877,8 +1887,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 7df9cdde94..2b9113d318 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 @@ -94,7 +94,7 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m logstransform/mysql__general_0: operators: @@ -122,6 +122,8 @@ processors: type: recombine - field: attributes.__source_identifier type: remove + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -449,13 +451,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +474,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -479,7 +485,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -539,7 +544,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -551,7 +555,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -563,7 +566,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -584,9 +586,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1877,8 +1887,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..bb3d5f29e7 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1087,8 +1097,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..bdf3b5f6a4 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1047,8 +1057,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 3d3e2d00db..a10f7eea8d 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1494,8 +1504,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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 3d3e2d00db..a10f7eea8d 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1494,8 +1504,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..4c35a9190c 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -934,8 +944,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..2d36fa0aaf 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -894,8 +904,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..b81f337126 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1029,8 +1039,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..b81f337126 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 @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1029,8 +1039,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..fdf1708389 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 @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -840,8 +850,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus 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..d81b593b3c 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 @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -800,8 +810,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-pipeline_multiple_pipelines/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_exclude_logs_contains/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_modify_fields/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_order/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_json_and_parse_regex_types/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_journald_receiver/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_not_first/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_processor_not_in_use/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_languages/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_three_processors_same_language/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_languages/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_multiline_two_processors/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-processor_parse_regex_type_on_default_pipeline/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_apache_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_cassandra_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchbase/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_couchdb/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_elasticsearch_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_log_file_path/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_refresh_interval/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_files_type_multiple_receivers/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_flink/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_conflicting_id/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_multiple_receivers_with_dot/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_forward_omitting_optional_parameters/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hadoop_refresh_interval/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_hbase/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_jetty/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_kafka_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mongodb/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_mysql_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_nginx_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_oracledb_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_postgresql_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_rabbitmq/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_redis_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_saphana_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_solr/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_syslog_type_multiple_receivers/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_systemd/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_duplicated_port_but_not_used/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tcp_omitting_optional_parameters/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_tomcat_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_varnish/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_vault/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_wildfly/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml index 354f2bd46e..48772d01eb 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml index 69d70aa955..af318dc32c 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/logging-receiver_zookeeper_custom/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml index 4cac407319..af72f6868e 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml index afb5e5c09a..be75600438 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml index b0c1828af0..866114d4e6 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml index b0c1828af0..866114d4e6 100644 --- a/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-custom_log_level/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml index 49ec86dc59..4c8caba7d0 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux-gpu/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml index 49ec86dc59..4c8caba7d0 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml index a47e65087d..c4a29eba56 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml index a47e65087d..c4a29eba56 100644 --- a/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-default_overrides_disable_all/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml index 7e69ba25e6..0b68f87cd6 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstarttime/prometheus_3: strategy: subtract_initial_point metricstransform/fluentbit_1: @@ -404,13 +406,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -422,7 +429,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -434,7 +440,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -494,7 +499,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -506,7 +510,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -518,7 +521,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -539,9 +541,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -804,8 +814,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 - transform/_global_0 receivers: diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml index 637aa315b0..6e828981c2 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstarttime/prometheus_3: strategy: subtract_initial_point metricstransform/fluentbit_1: @@ -375,13 +377,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -393,7 +400,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -405,7 +411,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -465,7 +470,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -477,7 +481,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -489,7 +492,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -510,9 +512,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -763,8 +773,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 - transform/_global_0 receivers: diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml index f674b1e655..91efa8693c 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstarttime/prometheus_3: strategy: subtract_initial_point metricstransform/fluentbit_1: @@ -425,13 +427,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -443,7 +450,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -455,7 +461,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -515,7 +520,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -527,7 +531,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -539,7 +542,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -560,9 +562,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -912,8 +922,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 - transform/_global_0 receivers: diff --git a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml index f674b1e655..91efa8693c 100644 --- a/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-exporter_prometheus_otlp/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstarttime/prometheus_3: strategy: subtract_initial_point metricstransform/fluentbit_1: @@ -425,13 +427,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -443,7 +450,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -455,7 +461,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -515,7 +520,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -527,7 +531,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -539,7 +542,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -560,9 +562,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -912,8 +922,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 - transform/_global_0 receivers: diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml index 1e98243c25..af4b6a6ab9 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -370,13 +372,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -388,7 +395,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -400,7 +406,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -460,7 +465,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +476,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -484,7 +487,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -505,9 +507,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -669,8 +679,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml index 1e98243c25..af4b6a6ab9 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/linux/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -370,13 +372,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -388,7 +395,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -400,7 +406,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -460,7 +465,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +476,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -484,7 +487,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -505,9 +507,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -669,8 +679,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml index c08a16255e..0aea563b6b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows-2012/otel.yaml @@ -101,8 +101,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -814,8 +824,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml index c08a16255e..0aea563b6b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_all_nvml_metrics_individually/golden/windows/otel.yaml @@ -101,8 +101,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -814,8 +824,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml index bc0d37f49b..f52a4914ba 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux-gpu/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -396,13 +398,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -414,7 +421,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -426,7 +432,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +491,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +502,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -510,7 +513,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -531,9 +533,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml index 12788bd032..e5ca8aaa8b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml index d20d46ac63..e95746a0ba 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml index d20d46ac63..e95746a0ba 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_individual/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml index b18bcfe103..cdf7bff998 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -708,8 +718,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml index e75c687d0b..f733376bc3 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/linux/otel.yaml @@ -73,8 +73,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -666,8 +676,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml index 14d7193390..c28b2df124 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows-2012/otel.yaml @@ -92,8 +92,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -421,13 +423,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -439,7 +446,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -451,7 +457,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +516,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +527,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -535,7 +538,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -556,9 +558,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -805,8 +815,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml index 14d7193390..c28b2df124 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_by_prefixes/golden/windows/otel.yaml @@ -92,8 +92,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -421,13 +423,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -439,7 +446,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -451,7 +457,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +516,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +527,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -535,7 +538,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -556,9 +558,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -805,8 +815,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml index e2ef199b2d..2edbaf15b0 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -708,8 +718,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml index db16ef6196..615766ef8d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/linux/otel.yaml @@ -73,8 +73,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -666,8 +676,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml index 1f4b9f2c3c..8c154c7b6b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows-2012/otel.yaml @@ -92,8 +92,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -421,13 +423,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -439,7 +446,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -451,7 +457,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +516,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +527,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -535,7 +538,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -556,9 +558,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -805,8 +815,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml index 1f4b9f2c3c..8c154c7b6b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_globs/golden/windows/otel.yaml @@ -92,8 +92,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -421,13 +423,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -439,7 +446,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -451,7 +457,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +516,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +527,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -535,7 +538,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -556,9 +558,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -805,8 +815,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml index b9d900bfbf..1bd947ed65 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux-gpu/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -396,13 +398,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -414,7 +421,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -426,7 +432,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +491,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +502,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -510,7 +513,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -531,9 +533,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml index 836de74341..debd2691a8 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml index ed66a5c81c..aede543485 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml index ed66a5c81c..aede543485 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_metrics_type_filter_with_special_chars/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml index 6cc4da3d73..64654d845b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux-gpu/otel.yaml @@ -95,8 +95,10 @@ processors: metric_names: - "^workload\\.googleapis\\.com/otlp\\.test\\.gauge$$" - "^workload\\.googleapis\\.com/otlp\\.test\\.prefix.*$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -413,13 +415,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -431,7 +438,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -443,7 +449,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -503,7 +508,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -515,7 +519,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -527,7 +530,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -548,9 +550,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -749,8 +759,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml index b250c41994..aeb96b79a0 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/linux/otel.yaml @@ -88,8 +88,10 @@ processors: metric_names: - "^workload\\.googleapis\\.com/otlp\\.test\\.gauge$$" - "^workload\\.googleapis\\.com/otlp\\.test\\.prefix.*$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -382,13 +384,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -400,7 +407,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -412,7 +418,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -472,7 +477,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +488,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -496,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -517,9 +519,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -707,8 +717,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml index 5e406e1075..344f67b55d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows-2012/otel.yaml @@ -107,8 +107,10 @@ processors: metric_names: - "^workload\\.googleapis\\.com/otlp\\.test\\.gauge$$" - "^workload\\.googleapis\\.com/otlp\\.test\\.prefix.*$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -846,8 +856,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml index 5e406e1075..344f67b55d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_exclude_workload_metrics/golden/windows/otel.yaml @@ -107,8 +107,10 @@ processors: metric_names: - "^workload\\.googleapis\\.com/otlp\\.test\\.gauge$$" - "^workload\\.googleapis\\.com/otlp\\.test\\.prefix.*$$" - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -846,8 +856,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml index 16a684e828..baa5412c9b 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux-gpu/otel.yaml @@ -102,8 +102,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -420,13 +422,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -438,7 +445,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -450,7 +456,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +515,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +526,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -534,7 +537,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -555,9 +557,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -734,8 +744,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml index 007c2afd06..03ddc9787c 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/linux/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -378,13 +380,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -396,7 +403,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -408,7 +414,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +473,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -480,7 +484,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -492,7 +495,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -513,9 +515,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -679,8 +689,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml index 3b7c4f9cf9..4b727ee95d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows-2012/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -385,13 +387,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -403,7 +410,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -415,7 +421,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +480,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -487,7 +491,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -499,7 +502,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -520,9 +522,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -689,8 +699,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml index 3b7c4f9cf9..4b727ee95d 100644 --- a/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_three_exclude_metrics_processors_not_disable_nvml/golden/windows/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -385,13 +387,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -403,7 +410,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -415,7 +421,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +480,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -487,7 +491,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -499,7 +502,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -520,9 +522,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -689,8 +699,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml index 3bd2e02ba2..653d910750 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux-gpu/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -720,8 +730,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml index eedf7c6d9b..6524892abe 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/linux/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -372,13 +374,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -390,7 +397,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -402,7 +408,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +467,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -474,7 +478,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -486,7 +489,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -507,9 +509,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -672,8 +682,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml index 0618af2178..9803939b5c 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows-2012/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -682,8 +692,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml index 0618af2178..9803939b5c 100644 --- a/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-processor_two_exclude_metrics_processors/golden/windows/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -682,8 +692,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml index 95df0d3cae..131f57fa05 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux-gpu/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -384,13 +386,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -402,7 +409,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -414,7 +420,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -474,7 +479,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +490,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -498,7 +501,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -519,9 +521,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -692,8 +702,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml index 834cb020ac..01271c2520 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/linux/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -360,13 +362,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -378,7 +385,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -390,7 +396,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +455,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +466,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -474,7 +477,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -495,9 +497,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -658,8 +668,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml index f4e96d1075..c9216ce5e0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows-2012/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -668,8 +678,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml index f4e96d1075..c9216ce5e0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver-no-collection_interval/golden/windows/otel.yaml @@ -66,8 +66,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -367,13 +369,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -385,7 +392,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -397,7 +403,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +462,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +473,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -481,7 +484,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -502,9 +504,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -668,8 +678,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml index cf2bad9fff..cc5db879e0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml index e2645f894c..e46cace7ed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml index ac41ae6b3f..12d34b2ecd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml index ac41ae6b3f..12d34b2ecd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml index cf2bad9fff..cc5db879e0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml index e2645f894c..e46cace7ed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml index ac41ae6b3f..12d34b2ecd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml index ac41ae6b3f..12d34b2ecd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_activemq_no_jvm/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/activemq_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml index bd2cc31ec0..dce1ea29f9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/aerospike_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -756,8 +766,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml index 4d7ef7c17c..2b0b9789b9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/aerospike_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -716,8 +726,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml index 5016222586..9638838361 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/aerospike_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -851,8 +861,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml index 5016222586..9638838361 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_aerospike/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/aerospike_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -851,8 +861,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml index 320a753bb6..c812a0adeb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux-gpu/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -414,13 +416,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -432,7 +439,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -444,7 +450,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +509,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -516,7 +520,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -528,7 +531,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -549,9 +551,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -758,8 +768,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml index f89a232c02..0a9d738a11 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/linux/otel.yaml @@ -85,8 +85,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -385,13 +387,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -403,7 +410,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -415,7 +421,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +480,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -487,7 +491,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -499,7 +502,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -520,9 +522,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -718,8 +728,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml index afdbc7a22a..6156bfb338 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows-2012/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -435,13 +437,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -453,7 +460,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -465,7 +471,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +530,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +541,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -549,7 +552,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -570,9 +572,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml index afdbc7a22a..6156bfb338 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache/golden/windows/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -435,13 +437,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -453,7 +460,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -465,7 +471,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +530,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +541,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -549,7 +552,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -570,9 +572,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml index 90c24256cb..73618dac2a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux-gpu/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -414,13 +416,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -432,7 +439,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -444,7 +450,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +509,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -516,7 +520,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -528,7 +531,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -549,9 +551,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -758,8 +768,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml index 2abdf2f09b..96decb191c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/linux/otel.yaml @@ -85,8 +85,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -385,13 +387,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -403,7 +410,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -415,7 +421,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +480,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -487,7 +491,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -499,7 +502,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -520,9 +522,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -718,8 +728,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml index a1b0914128..3a027a84e4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows-2012/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -435,13 +437,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -453,7 +460,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -465,7 +471,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +530,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +541,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -549,7 +552,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -570,9 +572,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml index a1b0914128..3a027a84e4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_apache_custom/golden/windows/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/apache_2: transforms: - action: update @@ -435,13 +437,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -453,7 +460,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -465,7 +471,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +530,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +541,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -549,7 +552,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -570,9 +572,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml index 1f8c09a978..c33731f82d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml index 6ea2ce8a88..ac16fb406a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml index 82ccab0354..ed8fe01ef6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml index 82ccab0354..ed8fe01ef6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml index 790c663c48..6fb637a535 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml index 97e57bc1db..7b0eecaeb4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml index 5ed8f6ccaa..aae4abbcd7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml index 5ed8f6ccaa..aae4abbcd7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_cassandra_custom/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/cassandra_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml index 69b42ab0b5..c25b3c799f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux-gpu/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchbase_2: transforms: - action: update @@ -498,13 +500,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -516,7 +523,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -528,7 +534,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -588,7 +593,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -600,7 +604,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -612,7 +615,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -633,9 +635,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -875,8 +885,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml index 331f224b3f..5ade65fa83 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/linux/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchbase_2: transforms: - action: update @@ -469,13 +471,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -487,7 +494,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -499,7 +505,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -559,7 +564,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -571,7 +575,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -583,7 +586,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -604,9 +606,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -835,8 +845,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml index 1dc57f03cb..1041d8e3ff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows-2012/otel.yaml @@ -104,8 +104,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchbase_2: transforms: - action: update @@ -519,13 +521,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +544,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -549,7 +555,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -609,7 +614,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -621,7 +625,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -633,7 +636,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -654,9 +656,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -970,8 +980,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml index 1dc57f03cb..1041d8e3ff 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchbase/golden/windows/otel.yaml @@ -104,8 +104,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchbase_2: transforms: - action: update @@ -519,13 +521,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -537,7 +544,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -549,7 +555,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -609,7 +614,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -621,7 +625,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -633,7 +636,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -654,9 +656,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -970,8 +980,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml index ae83643d8a..5d9b276dcf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchdb_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml index 1f4f82de9f..769c691e99 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchdb_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml index c5d1940150..0362a0bbde 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchdb_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml index c5d1940150..0362a0bbde 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_couchdb/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/couchdb_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml index 2e87dd01d2..f166b85125 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux-gpu/otel.yaml @@ -76,8 +76,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml index be700f279d..a1dc64e356 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/linux/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -365,13 +367,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -383,7 +390,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -395,7 +401,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -455,7 +460,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -467,7 +471,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -479,7 +482,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -500,9 +502,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -664,8 +674,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml index aef81893e6..8f91eef6c3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml index aef81893e6..8f91eef6c3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_custom_collection_interval/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml index 7825cd5804..f7efb6c3d6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux-gpu/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/dcgm_0: transforms: - action: update @@ -474,13 +476,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +499,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,7 +510,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -564,7 +569,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -576,7 +580,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -588,7 +591,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -609,9 +611,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -844,8 +854,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml index 96a2efeba6..fe817de2c4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm/golden/linux/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/dcgm_0: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -804,8 +814,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml index 14e8e79109..6675166db0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/dcgm_0: transforms: - action: update @@ -452,13 +454,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -470,7 +477,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -482,7 +488,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -542,7 +547,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -554,7 +558,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -566,7 +569,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -587,9 +589,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -786,8 +796,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml index 185f3f2db8..2092833ef8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_dcgm_v2/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/dcgm_0: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -746,8 +756,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml index 6975324a07..8dc5c19aa1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -789,8 +799,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml index 40ade2f3a3..77da213829 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -749,8 +759,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml index ff711f02ea..c20a35bc47 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml index ff711f02ea..c20a35bc47 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml index 11219d9a73..65210e17c3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -789,8 +799,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml index 0f8eccc92c..7a0b77fa68 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -749,8 +759,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml index 1d59f26cac..6259fa27f6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml index 1d59f26cac..6259fa27f6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_credentials/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml index 39457c672f..d3e28929c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -789,8 +799,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml index 13194eaf0c..ed7f5c0247 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -749,8 +759,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml index 73ae07385a..ef111406f1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml index 73ae07385a..ef111406f1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_custom_endpoint_http/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml index a0f7221b45..6d8d1c35ed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -789,8 +799,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml index dc70f56d68..8d6bda43df 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -749,8 +759,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml index dca33fdc8a..619d112196 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml index dca33fdc8a..619d112196 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_disable_cluster_metrics/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -884,8 +894,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml index cdad7035cc..56b3e47fc3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -811,8 +821,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml index 8489bc763d..7d39d08ef7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -771,8 +781,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml index 083be9806b..28bb14c06f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -906,8 +916,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml index 083be9806b..28bb14c06f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_no_jvm/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -906,8 +916,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml index 3dd4df2005..d91eae0bfa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux-gpu/otel.yaml @@ -88,8 +88,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -412,13 +414,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -430,7 +437,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -442,7 +448,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +507,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +518,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -526,7 +529,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -547,9 +549,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -791,8 +801,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml index bac8e68e22..16e0757e22 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/linux/otel.yaml @@ -83,8 +83,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -383,13 +385,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -401,7 +408,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -413,7 +419,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -473,7 +478,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +489,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -497,7 +500,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -518,9 +520,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -751,8 +761,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml index 5ea735c659..e838534d65 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows-2012/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -886,8 +896,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml index 5ea735c659..e838534d65 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_elasticsearch_tls_credentials/golden/windows/otel.yaml @@ -98,8 +98,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/elasticsearch_2: transforms: - action: update @@ -433,13 +435,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -451,7 +458,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -463,7 +469,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -523,7 +528,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +539,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -547,7 +550,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -568,9 +570,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -886,8 +896,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml index 5ecf59d586..544888175c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux-gpu/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml index 5ecf59d586..544888175c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml index 65a08065b9..aea3d8f046 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml index 65a08065b9..aea3d8f046 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_nvml_from_hostmetrics/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml index 65419a4108..64a6e867e9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux-gpu/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -396,13 +398,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -414,7 +421,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -426,7 +432,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +491,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +502,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -510,7 +513,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -531,9 +533,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml index 6d44244187..ac6705c487 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml index ce1583c30e..87ebc4fbed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml index ce1583c30e..87ebc4fbed 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_exclude_subset_of_nvml_metrics/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml index c417d4e1c9..b44a8a503a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/flink_1: transforms: - action: update @@ -432,13 +434,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -450,7 +457,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -462,7 +468,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -522,7 +527,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +538,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -546,7 +549,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -567,9 +569,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -780,8 +790,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml index b051e800b3..92ed770ce7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/flink_1: transforms: - action: update @@ -403,13 +405,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -421,7 +428,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -433,7 +439,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -493,7 +498,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +509,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -517,7 +520,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -538,9 +540,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -740,8 +750,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml index 209ea73659..8bec77890e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/flink_1: transforms: - action: update @@ -453,13 +455,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +478,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -483,7 +489,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -543,7 +548,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -555,7 +559,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -567,7 +570,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -588,9 +590,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -875,8 +885,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml index 209ea73659..8bec77890e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_flink/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/flink_1: transforms: - action: update @@ -453,13 +455,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +478,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -483,7 +489,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -543,7 +548,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -555,7 +559,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -567,7 +570,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -588,9 +590,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -875,8 +885,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml index 3c286320e6..b897ad1d87 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml index fc58e8601d..ddaa1d1b71 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml index 9f4896e4a2..dfe1148584 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml index 9f4896e4a2..dfe1148584 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml index b3ea845f43..f39f6ae1fb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml index 30e19ea8ab..1bf17ba513 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml index 0a10cbd8ca..fdf06e17c6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml index 0a10cbd8ca..fdf06e17c6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hadoop_no_jvm/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml index feb8988a3e..8f931c57df 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -759,8 +769,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml index c10da2cf80..53df64eb2b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -386,13 +388,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -404,7 +411,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -416,7 +422,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -476,7 +481,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +492,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -500,7 +503,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -521,9 +523,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -719,8 +729,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml index cd82c00de4..3c22b7199b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml index cd82c00de4..3c22b7199b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml index 2fd57b2b6b..8237054b53 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -759,8 +769,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml index 978bf6c865..9cd4e7645c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -386,13 +388,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -404,7 +411,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -416,7 +422,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -476,7 +481,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +492,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -500,7 +503,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -521,9 +523,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -719,8 +729,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml index d39937cfb4..293efbf325 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml index d39937cfb4..293efbf325 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_hbase_no_jvm/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -436,13 +438,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -454,7 +461,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -466,7 +472,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +531,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -538,7 +542,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -550,7 +553,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -571,9 +573,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml index 3e6a117144..7ee47d5044 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml index 93eb9d3799..c50ec5e33e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml index 72b95cc5e7..000ab77ea3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml index 72b95cc5e7..000ab77ea3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml index 5632c67a58..97b070e260 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml index 33dcd8ec07..09e00e34df 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml index 0b9bb02d25..fb7d896b6b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml index 0b9bb02d25..fb7d896b6b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jetty_no_jvm/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml index 2c7b72ef49..46149709e4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml index 174feb6138..048bba4954 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml index bf77cf05be..c24e67cfd1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml index bf77cf05be..c24e67cfd1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml index 219c6264d3..83f4377bcb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -752,8 +762,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml index 523c7675a3..f296049a9c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -712,8 +722,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml index 0205cc0c67..e71d01deb7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml index 0205cc0c67..e71d01deb7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_auth/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -847,8 +857,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml index 0f322adf25..d130fb03b5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml index 5ec6314698..44eba587f9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml index 1fbd2e1a5f..463a3c5c70 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml index 1fbd2e1a5f..463a3c5c70 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_jvm_with_endpoint/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml index cd3ac8614f..68cb23dea1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux-gpu/otel.yaml @@ -99,8 +99,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -768,8 +778,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml index d2bc3b0d0d..cf7708e332 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/linux/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -728,8 +738,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml index 75c41ddcda..0436b51ea0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows-2012/otel.yaml @@ -109,8 +109,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -444,13 +446,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +469,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -474,7 +480,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +539,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -546,7 +550,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -558,7 +561,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -579,9 +581,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml index 75c41ddcda..0436b51ea0 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka/golden/windows/otel.yaml @@ -109,8 +109,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -444,13 +446,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +469,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -474,7 +480,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +539,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -546,7 +550,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -558,7 +561,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -579,9 +581,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml index c2047dbba1..f528dc21b5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux-gpu/otel.yaml @@ -99,8 +99,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -768,8 +778,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml index e5bafb0ac8..1afc23d019 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/linux/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -394,13 +396,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -412,7 +419,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -424,7 +430,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -484,7 +489,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +500,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -508,7 +511,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -529,9 +531,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -728,8 +738,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml index 387d8b3cad..f52727e4cd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows-2012/otel.yaml @@ -109,8 +109,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -444,13 +446,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +469,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -474,7 +480,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +539,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -546,7 +550,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -558,7 +561,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -579,9 +581,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml index 387d8b3cad..f52727e4cd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_kafka_no_jvm/golden/windows/otel.yaml @@ -109,8 +109,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -444,13 +446,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -462,7 +469,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -474,7 +480,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -534,7 +539,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -546,7 +550,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -558,7 +561,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -579,9 +581,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml index 1e6ec8cbf3..eb68aa0d7d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux-gpu/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/memcached_2: transforms: - action: update @@ -744,8 +754,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml index 75c1ac82cc..719d934cba 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/linux/otel.yaml @@ -85,8 +85,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/memcached_2: transforms: - action: update @@ -704,8 +714,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml index 40e49946aa..931d0f78cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows-2012/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/memcached_2: transforms: - action: update @@ -839,8 +849,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml index 40e49946aa..931d0f78cf 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_memcached/golden/windows/otel.yaml @@ -100,8 +100,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/memcached_2: transforms: - action: update @@ -839,8 +849,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml index 0cd9ab1cd8..cb20182a7c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml index 0acffb7767..b7f57cad78 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml index 092f45def0..beb1c19b6a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml index 092f45def0..beb1c19b6a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml index 4fdf842b26..feb0be7556 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -741,8 +751,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml index 0310fd1906..16d6c3eb7d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -701,8 +711,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml index 239197f48d..93644a00cd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml index 239197f48d..93644a00cd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mongodb_unix_socket/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mongodb_1: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml index e7b503815c..9995f7de6d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mysql_1: transforms: - action: update @@ -783,8 +793,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml index b5a00033f1..af9a888729 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mysql_1: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml index 4810435c78..f2a1cc5e88 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -878,8 +888,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml index 4810435c78..f2a1cc5e88 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -878,8 +888,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml index c5ba5ddf04..86e3516c08 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mysqlmetrics_1: transforms: - action: update @@ -783,8 +793,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml index 5cdd405f49..b99acadf70 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mysqlmetrics_1: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml index 98dc24eb5c..2fd20174fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -878,8 +888,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml index 98dc24eb5c..2fd20174fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_mysql_missing_endpoint/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -878,8 +888,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml index 64e3ebd5b9..0801844df5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/nginx_1: transforms: - action: update @@ -737,8 +747,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml index e0dc49cc0d..efad04718a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/nginx_1: transforms: - action: update @@ -697,8 +707,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml index c5db0b359f..69ba2f1aa6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml index c5db0b359f..69ba2f1aa6 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml index 11f628c574..0ee4ac1ec3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/nginx_1: transforms: - action: update @@ -737,8 +747,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml index 68aafbd72c..eca6c134f7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/nginx_1: transforms: - action: update @@ -697,8 +707,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml index 5081c9ff21..83805bf9df 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml index 5081c9ff21..83805bf9df 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_nginx_custom/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml index 1b23ea1763..7340c359fb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1354,8 +1364,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml index 2f3ec3e7c5..4604bec5b9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1314,8 +1324,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml index a8d91a69ff..31d545bf92 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml index a8d91a69ff..31d545bf92 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml index 34763aa97b..a75cf09a28 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1354,8 +1364,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml index c0cf68d5fa..82e0ac7989 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1314,8 +1324,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml index a9c66d6728..e0c7dc7b09 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml index a9c66d6728..e0c7dc7b09 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_all_params/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml index ca65b4207e..288436c13f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1354,8 +1364,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml index 57f6d3ec77..ab55ceca64 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/oracledb_1: transforms: - action: update @@ -1314,8 +1324,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml index c5cf05f0c3..48f2c5295b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml index c5cf05f0c3..48f2c5295b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_oracledb_unix_socket/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1449,8 +1459,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml index 9143aee024..84194c94c1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -756,8 +766,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml index 88b390da51..3fa4885c73 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -716,8 +726,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml index 8a695f14ed..d0d07c168f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -851,8 +861,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml index 8a695f14ed..d0d07c168f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -851,8 +861,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml index 29ebb1290f..7af48f9eb8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -758,8 +768,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml index 7b3618ac20..c082122a25 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -718,8 +728,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml index e1d7f332df..2414ae95ca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml index e1d7f332df..2414ae95ca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -853,8 +863,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml index e15d32fc5a..f7e9fddbb4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -759,8 +769,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml index 3e0f822a1a..95f0748e83 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -719,8 +729,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml index baa0b05182..7ef22f6c40 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml index baa0b05182..7ef22f6c40 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_no_sni/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -854,8 +864,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml index 74b68e6b42..ae77f897aa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -762,8 +772,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml index 4019939269..ecaf3848c5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -722,8 +732,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml index b2f547ed7b..e872c9aa46 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -857,8 +867,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml index b2f547ed7b..e872c9aa46 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_postgresql_tls_with_certs/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -857,8 +867,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml index c682cee2b9..223874baeb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -774,8 +784,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml index f32bd67a83..501dee6034 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -734,8 +744,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml index 8d712061ee..921adefb15 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml index 8d712061ee..921adefb15 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml index d4829bfbeb..4a30a14f4d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -777,8 +787,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml index 6c999b08cd..23ab425ab5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -737,8 +747,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml index f9a9ca3c7f..b4584e84c4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -872,8 +882,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml index f9a9ca3c7f..b4584e84c4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_basic_auth/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -872,8 +882,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml index d5d8412a78..fca548f793 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -831,8 +841,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml index 73ca9e179f..9272cd5157 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -791,8 +801,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml index a0cebb888c..8eff5ef4bb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -926,8 +936,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml index a0cebb888c..8eff5ef4bb 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_complex/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -926,8 +936,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml index 0498511f8c..a033b9b54e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -773,8 +783,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml index c0212f64fa..a8de2dea7b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -733,8 +743,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml index 13f32db5c0..28bb61519e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -868,8 +878,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml index 13f32db5c0..28bb61519e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_default_replacement/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -868,8 +878,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml index 3b7e0f89e2..0e490b4f0f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -774,8 +784,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml index 57af3bb0e5..c5890fd9ec 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -734,8 +744,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml index e3ec6534e2..8daaec41fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml index e3ec6534e2..8daaec41fa 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_multi_replacement_regex/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml index af45c1e7e6..8b7ba8afb8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -767,8 +777,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml index 7249a113f3..c1285647d8 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -727,8 +737,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml index 343155624d..42b0372f29 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -862,8 +872,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml index 343155624d..42b0372f29 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_node_exporter/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -862,8 +872,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml index 2113111b74..1321686946 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -828,8 +838,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml index 888618bec9..6a7dc5d26a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -788,8 +798,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml index 15b0187339..edd2c43d1a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -923,8 +933,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml index 15b0187339..edd2c43d1a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_relabel/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -923,8 +933,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml index 505664cc55..e439021a6b 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -774,8 +784,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml index dddb1a6d96..adc336c821 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -734,8 +744,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml index c79f666c4b..f5d99398dd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml index c79f666c4b..f5d99398dd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_replace_using_capture_groups/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -869,8 +879,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml index f879398ca9..10e7a6dd34 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -803,8 +813,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml index 7f0787a4b2..21ecf6e552 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -763,8 +773,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml index 3f1873fb76..159f922961 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -898,8 +908,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml index 3f1873fb76..159f922961 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_scrape_interval/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -898,8 +908,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml index 79b3e944a0..798d881a57 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux-gpu/otel.yaml @@ -80,8 +80,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -398,13 +400,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -416,7 +423,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -428,7 +434,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -488,7 +493,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -500,7 +504,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -512,7 +515,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -533,9 +535,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -772,8 +782,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml index 26db1d5108..0059b98e42 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/linux/otel.yaml @@ -75,8 +75,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -369,13 +371,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -387,7 +394,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -399,7 +405,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -459,7 +464,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -471,7 +475,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -483,7 +486,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -504,9 +506,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -732,8 +742,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml index 7fe56bb42f..f0eda7bcda 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -867,8 +877,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml index 7fe56bb42f..f0eda7bcda 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_prometheus_tlx_with_certs/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -419,13 +421,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -437,7 +444,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -449,7 +455,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -509,7 +514,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -521,7 +525,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -533,7 +536,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -554,9 +556,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -867,8 +877,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml index 6dcbfa9b44..9fb3b17156 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -746,8 +756,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml index b1cf6b4c54..48faf30f38 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml index 5917a7d9e9..bf45f08f97 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -841,8 +851,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml index 5917a7d9e9..bf45f08f97 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -841,8 +851,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml index 1479e43377..ab2b22db27 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -746,8 +756,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml index 6d4d1e9b17..d87a2cb480 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml index 5cdfae63f6..c3e2d64a2d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -841,8 +851,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml index 5cdfae63f6..c3e2d64a2d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -841,8 +851,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml index ff1b4cc296..7af112a1d4 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -747,8 +757,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml index 8d6ca770df..5352fedb27 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -707,8 +717,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml index bd17768d48..bb26715b66 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml index bd17768d48..bb26715b66 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_no_sni/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml index a98f677fff..49d8f58ead 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml index f7eebdd676..956b62f961 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml index dd59becf4a..6d6bf6a823 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml index dd59becf4a..6d6bf6a823 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_rabbitmq_tls_with_certs/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml index 69e8c7903c..803c8b673e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux-gpu/otel.yaml @@ -91,8 +91,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -409,13 +411,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -427,7 +434,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -439,7 +445,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -499,7 +504,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +515,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -523,7 +526,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -544,9 +546,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -748,8 +758,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml index 6121a467d7..8d4ee43134 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/linux/otel.yaml @@ -86,8 +86,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -380,13 +382,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -398,7 +405,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -410,7 +416,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -470,7 +475,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -482,7 +486,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -494,7 +497,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -515,9 +517,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -708,8 +718,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml index 66674cb156..e9ab79a23c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows-2012/otel.yaml @@ -101,8 +101,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -843,8 +853,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml index 66674cb156..e9ab79a23c 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis/golden/windows/otel.yaml @@ -101,8 +101,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -843,8 +853,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml index 1979183b73..d2321350e9 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux-gpu/otel.yaml @@ -91,8 +91,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -409,13 +411,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -427,7 +434,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -439,7 +445,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -499,7 +504,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -511,7 +515,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -523,7 +526,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -544,9 +546,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -748,8 +758,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml index 4a4c740469..135cf46a36 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/linux/otel.yaml @@ -86,8 +86,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -380,13 +382,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -398,7 +405,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -410,7 +416,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -470,7 +475,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -482,7 +486,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -494,7 +497,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -515,9 +517,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -708,8 +718,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml index 0ef1425cd4..e1205fae43 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows-2012/otel.yaml @@ -101,8 +101,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -843,8 +853,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml index 0ef1425cd4..e1205fae43 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_redis_custom/golden/windows/otel.yaml @@ -101,8 +101,10 @@ processors: metric_names: - redis.commands - redis.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -430,13 +432,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -448,7 +455,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -460,7 +466,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +525,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -532,7 +536,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -544,7 +547,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -565,9 +567,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -843,8 +853,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml index c3a57179c9..3d0d7788f1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux-gpu/otel.yaml @@ -90,8 +90,10 @@ processors: match_type: strict metric_names: - saphana.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml index 39c9469924..a4eae63943 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/linux/otel.yaml @@ -85,8 +85,10 @@ processors: match_type: strict metric_names: - saphana.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml index 215e9ba67c..a158a4a129 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows-2012/otel.yaml @@ -100,8 +100,10 @@ processors: match_type: strict metric_names: - saphana.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml index 215e9ba67c..a158a4a129 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_saphana/golden/windows/otel.yaml @@ -100,8 +100,10 @@ processors: match_type: strict metric_names: - saphana.uptime - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml index 05c1ea690f..da92de0771 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -741,8 +751,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml index 629013ac84..4f945d314e 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -701,8 +711,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml index c21cdb639f..774000e407 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml index c21cdb639f..774000e407 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_solr/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml index 7eb00f2a3a..0cf6dcdaa7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -741,8 +751,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml index cfffcc45ad..5cb9f2de75 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -701,8 +711,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml index 5c0cc73a34..c80d03ebcd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml index 5c0cc73a34..c80d03ebcd 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml index 8deae7ffb6..ca07f2ab27 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -741,8 +751,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml index b4e310ed6b..46af1ca06a 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -701,8 +711,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml index dddfc07c9f..4eb0291145 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml index dddfc07c9f..4eb0291145 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_tomcat_custom/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -836,8 +846,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml index 8ccbdd3e6b..096f9d65c1 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -738,8 +748,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml index ad31dfab5e..edb3f014e5 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -698,8 +708,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml index 295566f391..d95fda438f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -833,8 +843,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml index 295566f391..d95fda438f 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_varnish/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -833,8 +843,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml index ed2ef7d0b5..ea39536889 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux-gpu/otel.yaml @@ -106,8 +106,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -424,13 +426,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -442,7 +449,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -454,7 +460,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +519,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +530,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -538,7 +541,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -559,9 +561,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1421,8 +1431,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml index 58becd7229..03fdee13ca 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/linux/otel.yaml @@ -101,8 +101,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -395,13 +397,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -413,7 +420,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -425,7 +431,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +490,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -497,7 +501,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -509,7 +512,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -530,9 +532,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1381,8 +1391,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml index a2df148498..668a124175 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows-2012/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1516,8 +1526,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml index a2df148498..668a124175 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault/golden/windows/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1516,8 +1526,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml index a38bf661d6..80572ba1b2 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux-gpu/otel.yaml @@ -106,8 +106,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -424,13 +426,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -442,7 +449,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -454,7 +460,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +519,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +530,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -538,7 +541,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -559,9 +561,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1421,8 +1431,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml index 4a9f66b3e9..1f32335fe3 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/linux/otel.yaml @@ -101,8 +101,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -395,13 +397,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -413,7 +420,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -425,7 +431,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +490,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -497,7 +501,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -509,7 +512,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -530,9 +532,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1381,8 +1391,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml index d022627899..91181ac6da 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows-2012/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1516,8 +1526,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml index d022627899..91181ac6da 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_tls/golden/windows/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1516,8 +1526,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml index 9fddc45e8e..647572b373 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux-gpu/otel.yaml @@ -106,8 +106,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -424,13 +426,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -442,7 +449,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -454,7 +460,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -514,7 +519,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -526,7 +530,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -538,7 +541,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -559,9 +561,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1425,8 +1435,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml index c90b9dabea..47abfa31ec 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/linux/otel.yaml @@ -101,8 +101,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -395,13 +397,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -413,7 +420,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -425,7 +431,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -485,7 +490,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -497,7 +501,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -509,7 +512,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -530,9 +532,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -1385,8 +1395,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml index 4cb1b83a33..02f8c86888 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows-2012/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1520,8 +1530,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml index 4cb1b83a33..02f8c86888 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_vault_with_token/golden/windows/otel.yaml @@ -116,8 +116,10 @@ processors: - vault.token.revoke.time - vault.token.renew.time - vault.core.leader.duration - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -445,13 +447,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +470,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -475,7 +481,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -535,7 +540,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -547,7 +551,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -559,7 +562,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -580,9 +582,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -1520,8 +1530,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml index b8614c82ae..d0dceac5ac 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml index c1f1c8eb29..59aaddcaf7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml index 73584fa21b..d59578abdc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml index 73584fa21b..d59578abdc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml index b8614c82ae..d0dceac5ac 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -743,8 +753,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml index c1f1c8eb29..59aaddcaf7 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -703,8 +713,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml index 73584fa21b..d59578abdc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml index 73584fa21b..d59578abdc 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_wildfly_with_host_port/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -838,8 +848,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml index 290fa0c0b4..5433af6c45 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -737,8 +747,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml index ecacd964c3..d3342f0648 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -697,8 +707,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml index 89eaa38e8d..0d5ec2fa5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml index 89eaa38e8d..0d5ec2fa5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml index 290fa0c0b4..5433af6c45 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -402,13 +404,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -420,7 +427,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -432,7 +438,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -492,7 +497,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -504,7 +508,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -516,7 +519,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -537,9 +539,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -737,8 +747,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml index ecacd964c3..d3342f0648 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -373,13 +375,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -391,7 +398,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -403,7 +409,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -463,7 +468,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -475,7 +479,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -487,7 +490,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -508,9 +510,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -697,8 +707,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml index 89eaa38e8d..0d5ec2fa5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml index 89eaa38e8d..0d5ec2fa5d 100644 --- a/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/metrics-receiver_zookeeper_endpoint/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -832,8 +842,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml index dee2c5b7d0..85f995564d 100644 --- a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows-2012/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -400,13 +402,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -418,7 +425,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -430,7 +436,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -490,7 +495,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +506,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -514,7 +517,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -535,9 +537,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -781,8 +791,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml index dee2c5b7d0..85f995564d 100644 --- a/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-backward_compatible_with_explicit_exporters/golden/windows/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -400,13 +402,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -418,7 +425,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -430,7 +436,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -490,7 +495,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +506,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -514,7 +517,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -535,9 +537,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -781,8 +791,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml index 3fd03047a0..8e6cc1a608 100644 --- a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -809,8 +819,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml index 3fd03047a0..8e6cc1a608 100644 --- a/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-all-custom_use_built_in_receivers/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -809,8 +819,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_active_directory_ds/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_iis/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_new_channels/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_override_builtin/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-receiver_winlog2_xml/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows-2012/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml index 73693f2412..9752f296b5 100644 --- a/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-logging-use_ansi/golden/windows/otel.yaml @@ -86,8 +86,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -415,13 +417,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -433,7 +440,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -445,7 +451,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -505,7 +510,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -517,7 +521,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -529,7 +532,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -550,9 +552,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -799,8 +809,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml index 2e60315d00..9efeac1a48 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux-gpu/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -396,13 +398,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -414,7 +421,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -426,7 +432,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +491,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +502,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -510,7 +513,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -531,9 +533,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml index 093c702a55..918918ca99 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml index dea1184509..63cb390cbd 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml index dea1184509..63cb390cbd 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_iis/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml index 4e9b90e73c..cd3e7ab314 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux-gpu/otel.yaml @@ -78,8 +78,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -396,13 +398,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -414,7 +421,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -426,7 +432,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -486,7 +491,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +502,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -510,7 +513,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -531,9 +533,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -706,8 +716,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml index 251c8bffac..35d76f3d91 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/linux/otel.yaml @@ -72,8 +72,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -366,13 +368,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -384,7 +391,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -396,7 +402,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -456,7 +461,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -468,7 +472,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -480,7 +483,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -501,9 +503,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -665,8 +675,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml index 4714d44492..f203585c9b 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows-2012/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml index 4714d44492..f203585c9b 100644 --- a/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-default_overrides_disable_mssql/golden/windows/otel.yaml @@ -89,8 +89,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -418,13 +420,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -436,7 +443,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -448,7 +454,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +513,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -520,7 +524,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -532,7 +535,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -553,9 +555,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -802,8 +812,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml index dfbbbd7bd7..d2d169c295 100644 --- a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows-2012/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -400,13 +402,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -418,7 +425,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -430,7 +436,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -490,7 +495,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +506,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -514,7 +517,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -535,9 +537,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -781,8 +791,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml index dfbbbd7bd7..d2d169c295 100644 --- a/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-pipeline_multiple_pipelines/golden/windows/otel.yaml @@ -71,8 +71,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -400,13 +402,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -418,7 +425,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -430,7 +436,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -490,7 +495,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -502,7 +506,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -514,7 +517,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -535,9 +537,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -781,8 +791,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml index 72ea2530df..429eedf4de 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/active__directory__ds_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml index 72ea2530df..429eedf4de 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_active_directory_ds/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/active__directory__ds_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -842,8 +852,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml index 4b085a468a..df43d81512 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows-2012/otel.yaml @@ -95,8 +95,10 @@ processors: - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count groupbyattrs/iis__v2_3: {} - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -439,13 +441,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +464,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -469,7 +475,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -529,7 +534,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -541,7 +545,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -553,7 +556,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -574,9 +576,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml index 4b085a468a..df43d81512 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_duplicate/golden/windows/otel.yaml @@ -95,8 +95,10 @@ processors: - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count groupbyattrs/iis__v2_3: {} - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -439,13 +441,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -457,7 +464,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -469,7 +475,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -529,7 +534,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -541,7 +545,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -553,7 +556,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -574,9 +576,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -863,8 +873,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml index 68d003be11..34c8e7ce57 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows-2012/otel.yaml @@ -90,8 +90,10 @@ processors: - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count groupbyattrs/iis_3: {} - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -406,13 +408,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -424,7 +431,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -436,7 +442,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +501,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +512,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -520,7 +523,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -541,9 +543,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -807,8 +817,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml index 68d003be11..34c8e7ce57 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_iis_v2_override/golden/windows/otel.yaml @@ -90,8 +90,10 @@ processors: - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count groupbyattrs/iis_3: {} - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -406,13 +408,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -424,7 +431,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -436,7 +442,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -496,7 +501,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -508,7 +512,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -520,7 +523,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -541,9 +543,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -807,8 +817,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml index 7e1b127743..67aabcd16f 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux-gpu/otel.yaml @@ -84,8 +84,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -408,13 +410,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -426,7 +433,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -438,7 +444,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -498,7 +503,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -510,7 +514,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -522,7 +525,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -543,9 +545,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -750,8 +760,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml index 853aa608cb..b30c7c07e4 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/linux/otel.yaml @@ -79,8 +79,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -379,13 +381,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -397,7 +404,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -409,7 +415,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -469,7 +474,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -481,7 +485,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -493,7 +496,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -514,9 +516,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/otel_3: transforms: - action: update @@ -710,8 +720,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml index 7a54e3dc19..52047a2ff1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml index 7a54e3dc19..52047a2ff1 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_jvm_missing_endpoint/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -429,13 +431,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: workload.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -447,7 +454,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -459,7 +465,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -519,7 +524,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -531,7 +535,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -543,7 +546,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -564,9 +566,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -845,8 +855,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml index 5fffdb90c8..f744405d79 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -837,8 +847,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml index 5fffdb90c8..f744405d79 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_duplicate/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -837,8 +847,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml index 95ee63a2e4..0a0cdedef2 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows-2012/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -804,8 +814,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus diff --git a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml index 95ee63a2e4..0a0cdedef2 100644 --- a/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml +++ b/confgenerator/testdata/goldens/windows-metrics-receiver_mssql_v2_override/golden/windows/otel.yaml @@ -94,8 +94,10 @@ processors: - otelcol_process_memory_rss - grpc.client.attempt.duration_count - googlecloudmonitoring/point_count - interval/loggingmetrics_7: + interval/loggingmetrics_9: interval: 1m + metricstarttime/loggingmetrics_7: + strategy: subtract_initial_point metricstransform/fluentbit_1: transforms: - action: update @@ -423,13 +425,18 @@ processors: include: ^(.*)$$ match_type: regexp new_name: agent.googleapis.com/$${1} + metricstransform/loggingmetrics_10: + transforms: + - action: update + include: ^(.*)$$ + match_type: regexp + new_name: agent.googleapis.com/$${1} metricstransform/loggingmetrics_3: transforms: - action: update include: fluentbit_stackdriver_retried_records_total new_name: fluentbit_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -441,7 +448,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_retry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -453,7 +459,6 @@ processors: include: fluentbit_stackdriver_requests_total new_name: fluentbit_request_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -513,7 +518,6 @@ processors: include: fluentbit_stackdriver_proc_records_total new_name: fluentbit_log_entry_count operations: - - action: toggle_scalar_data_type - action: update_label label: status new_label: response_code @@ -525,7 +529,6 @@ processors: include: otelcol_exporter_sent_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "200" @@ -537,7 +540,6 @@ processors: include: otelcol_exporter_send_failed_log_records new_name: otel_log_entry_count operations: - - action: toggle_scalar_data_type - action: add_label new_label: response_code new_value: "400" @@ -558,9 +560,17 @@ processors: metricstransform/loggingmetrics_8: transforms: - action: update - include: ^(.*)$$ - match_type: regexp - new_name: agent.googleapis.com/$${1} + include: agent/log_entry_retry_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/request_count + operations: + - action: toggle_scalar_data_type + - action: update + include: agent/log_entry_count + operations: + - action: toggle_scalar_data_type metricstransform/mssql_0: transforms: - action: update @@ -804,8 +814,10 @@ service: - cumulativetodelta/loggingmetrics_4 - transform/loggingmetrics_5 - deltatocumulative/loggingmetrics_6 - - interval/loggingmetrics_7 + - metricstarttime/loggingmetrics_7 - metricstransform/loggingmetrics_8 + - interval/loggingmetrics_9 + - metricstransform/loggingmetrics_10 - resourcedetection/_global_0 receivers: - prometheus/agent_prometheus