Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ replace (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsekshyperpodreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsekshyperpodreceiver v0.0.0-20260617204523-70530ca095f9
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/awsxrayreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20260617204523-70530ca095f9
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/jmxreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20260617204523-70530ca095f9
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.0.0-20260702195205-c728dfbd69c6
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.0.0-20260617204523-70530ca095f9
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver => github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20260617204523-70530ca095f9
)
Expand Down Expand Up @@ -195,6 +196,7 @@ require (
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.124.1
github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver v0.124.1
Expand Down Expand Up @@ -619,7 +621,7 @@ require (
go.opentelemetry.io/collector/component/componentstatus v0.124.0 // indirect
go.opentelemetry.io/collector/config/configcompression v1.30.0
go.opentelemetry.io/collector/config/configgrpc v0.124.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.30.0 // indirect
go.opentelemetry.io/collector/config/confignet v1.30.0
go.opentelemetry.io/collector/config/configretry v1.30.0 // indirect
go.opentelemetry.io/collector/confmap/provider/httpprovider v1.30.0 // indirect
go.opentelemetry.io/collector/confmap/provider/yamlprovider v1.30.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,8 @@ github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayr
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/awsxrayreceiver v0.0.0-20260617204523-70530ca095f9/go.mod h1:gNDpUc9eYHKy9YqGYK8toPIo3QZKdYQFLnaVQDA32A0=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20260617204523-70530ca095f9 h1:R4Ems+YMAXLtsEZwRXw8/cf1NkrzHQsc25WPdYbUaTM=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/jmxreceiver v0.0.0-20260617204523-70530ca095f9/go.mod h1:wQV77sHJJdUMIvbJna8LjlNb0omEdiVSrwQnoVAlTMM=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.0.0-20260702195205-c728dfbd69c6 h1:TyjCXDOKL+uz9VBOxr9Zs08BgX624jPWUoU8xQ4sTrw=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/mysqlreceiver v0.0.0-20260702195205-c728dfbd69c6/go.mod h1:tnnmAnxuLxWKBG7NjOI3po8R+EAX/9cG1y7TWiQTMvA=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.0.0-20260617204523-70530ca095f9 h1:ZLP3mZHMXzUjiXxXFVI9Z5LtU25qT13Qajz84mna/LY=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/postgresqlreceiver v0.0.0-20260617204523-70530ca095f9/go.mod h1:gSxi2fY+T8mNzlaU7qOEnaXTcKfhIpijDSyeCu5GOYo=
github.com/amazon-contributing/opentelemetry-collector-contrib/receiver/prometheusreceiver v0.0.0-20260617204523-70530ca095f9 h1:p0HB9BwhUdkaI0ALIb3hYxi7oCTDsGUuGadeM3R36AM=
Expand Down
2 changes: 2 additions & 0 deletions service/defaultcomponents/components.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import (
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/journaldreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kafkareceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/kubeletstatsreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/mysqlreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/postgresqlreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/prometheusreceiver"
"github.com/open-telemetry/opentelemetry-collector-contrib/receiver/statsdreceiver"
Expand Down Expand Up @@ -116,6 +117,7 @@ func Factories() (otelcol.Factories, error) {
nopreceiver.NewFactory(),
otlpreceiver.NewFactory(),
prometheusreceiver.NewFactory(),
mysqlreceiver.NewFactory(),
postgresqlreceiver.NewFactory(),
statsdreceiver.NewFactory(),
systemmetricsreceiver.NewFactory(),
Expand Down
1 change: 1 addition & 0 deletions service/defaultcomponents/components_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ func TestComponents(t *testing.T) {
"nop",
"otlp",
"prometheus",
"mysql",
"postgresql",
"statsd",
"systemmetrics",
Expand Down
21 changes: 21 additions & 0 deletions translator/config/schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -1830,6 +1830,27 @@
"required": ["endpoint", "instance_name", "username", "password_file"],
"additionalProperties": false
}
},
"mysql": {
"type": "array",
"items": {
"type": "object",
"properties": {
"endpoint": { "type": "string" },
"instance_name": { "type": "string" },
"username": { "type": "string" },
"password_file": { "type": "string" },
"logs": {
"type": "object",
"properties": {
"file_path": { "type": "string" }
},
"additionalProperties": false
}
},
"required": ["endpoint", "instance_name", "username", "password_file"],
"additionalProperties": false
}
}
},
"additionalProperties": false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
connectors:
count/dbi_dbload:
count/dbi_dbload_postgresql:
datapoints:
metric.datapoint.count:
description: The number of data points observed.
Expand Down Expand Up @@ -79,7 +79,7 @@ connectors:
trace.span.count:
description: The number of spans observed.
forward/opentelemetry: {}
signaltometrics/dbi_topsql:
signaltometrics/dbi_topsql_postgresql:
logs:
- attributes:
- key: db.system.name
Expand Down Expand Up @@ -504,6 +504,14 @@ processors:
send_batch_max_size: 0
send_batch_size: 8192
timeout: 1m0s
batch/opentelemetry_logs:
metadata_cardinality_limit: 1000
metadata_keys:
- aws.log.group.name
- aws.log.stream.name
send_batch_max_size: 10000
send_batch_size: 10000
timeout: 15s
batch/opentelemetry_metrics:
metadata_cardinality_limit: 1000
send_batch_max_size: 1000
Expand All @@ -514,14 +522,6 @@ processors:
send_batch_max_size: 10000
send_batch_size: 10000
timeout: 15s
batch/opentelemetry_logs:
metadata_cardinality_limit: 1000
metadata_keys:
- aws.log.group.name
- aws.log.stream.name
send_batch_max_size: 10000
send_batch_size: 10000
timeout: 15s
batch/xray:
metadata_cardinality_limit: 1000
send_batch_max_size: 0
Expand Down Expand Up @@ -549,7 +549,7 @@ processors:
middleware: agenthealth/statuscode
refresh_tags_interval: 0s
refresh_volumes_interval: 0s
filter/dbi_exclude_monitor_0:
filter/dbi_exclude_monitor_postgresql_0:
error_mode: propagate
logs:
log_record:
Expand Down Expand Up @@ -837,7 +837,7 @@ processors:
os.version:
enabled: false
timeout: 2s
transform/dbi_fix_start_time:
transform/dbi_fix_start_time_postgresql:
error_mode: ignore
flatten_data: false
log_statements: []
Expand All @@ -853,7 +853,7 @@ processors:
- replace_match(datapoint.attributes["postgresql.query_id"], "", "unknown")
- replace_match(datapoint.attributes["user.name"], "", "unknown")
trace_statements: []
transform/dbi_logs_raw-events_0:
transform/dbi_logs_postgresql_raw-events_0:
error_mode: propagate
flatten_data: false
log_statements:
Expand All @@ -864,7 +864,7 @@ processors:
- set(resource.attributes["aws.log.stream.name"], Concat([resource.attributes["host.id"], "my-postgres"], "/"))
metric_statements: []
trace_statements: []
transform/dbi_logs_server-logs_0:
transform/dbi_logs_postgresql_server-logs_0:
error_mode: propagate
flatten_data: false
log_statements:
Expand All @@ -875,7 +875,7 @@ processors:
- set(resource.attributes["aws.log.stream.name"], Concat([resource.attributes["host.id"], "my-postgres"], "/"))
metric_statements: []
trace_statements: []
transform/dbi_resource_0:
transform/dbi_resource_postgresql_0:
error_mode: propagate
flatten_data: false
log_statements:
Expand All @@ -891,7 +891,7 @@ processors:
- set(resource.attributes["db.system.name"], "postgresql")
- set(resource.attributes["db.instance.name"], "my-postgres")
trace_statements: []
transform/dbi_scope_0:
transform/dbi_scope_postgresql_0:
error_mode: ignore
flatten_data: false
log_statements:
Expand Down Expand Up @@ -1505,31 +1505,31 @@ service:
pipelines:
logs/dbi_postgresql_0:
exporters:
- count/dbi_dbload
- signaltometrics/dbi_topsql
- count/dbi_dbload_postgresql
- signaltometrics/dbi_topsql_postgresql
processors:
- filter/dbi_exclude_monitor_0
- filter/dbi_exclude_monitor_postgresql_0
receivers:
- postgresql/metrics_0
logs/dbi_postgresql_rawevents_0:
exporters:
- forward/opentelemetry
processors:
- filter/dbi_exclude_monitor_0
- transform/dbi_scope_0
- filter/dbi_exclude_monitor_postgresql_0
- transform/dbi_scope_postgresql_0
- resourcedetection/opentelemetry
- transform/dbi_resource_0
- transform/dbi_logs_raw-events_0
- transform/dbi_resource_postgresql_0
- transform/dbi_logs_postgresql_raw-events_0
receivers:
- postgresql/events_0
logs/dbi_postgresql_serverlogs_0:
exporters:
- forward/opentelemetry
processors:
- transform/dbi_scope_0
- transform/dbi_scope_postgresql_0
- resourcedetection/opentelemetry
- transform/dbi_resource_0
- transform/dbi_logs_server-logs_0
- transform/dbi_resource_postgresql_0
- transform/dbi_logs_postgresql_server-logs_0
receivers:
- filelog/postgresql_0
logs/emf_logs:
Expand Down Expand Up @@ -1564,27 +1564,27 @@ service:
exporters:
- forward/opentelemetry
processors:
- transform/dbi_scope_0
- transform/dbi_resource_0
- transform/dbi_fix_start_time
- transform/dbi_scope_postgresql_0
- transform/dbi_resource_postgresql_0
- transform/dbi_fix_start_time_postgresql
receivers:
- postgresql/metrics_0
- count/dbi_dbload
- signaltometrics/dbi_topsql
- count/dbi_dbload_postgresql
- signaltometrics/dbi_topsql_postgresql
metrics/host:
exporters:
- awscloudwatch
processors:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_procstat/1917393364
- telegraf_mem
- telegraf_netstat
- telegraf_procstat/1917393364
- telegraf_processes
- telegraf_cpu
- telegraf_disk
- telegraf_swap
- telegraf_processes
- telegraf_netstat
metrics/host_metrics:
exporters:
- forward/opentelemetry
Expand All @@ -1609,8 +1609,8 @@ service:
- ec2tagger
- awsentity/resource
receivers:
- telegraf_net
- telegraf_diskio
- telegraf_net
metrics/opentelemetry:
exporters:
- otlphttp/metrics
Expand Down
Loading
Loading