Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

set default address for all parsed receivers #3333

Merged
merged 2 commits into from
Oct 7, 2024
Merged

set default address for all parsed receivers #3333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63f5d1c
set default address for all parsed receivers
frzifus Oct 7, 2024
7ffe1c2
internal/components: move default address
frzifus Oct 7, 2024
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
16 changes: 16 additions & 0 deletions .chloggen/add_all_receiver_defaults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# One of 'breaking', 'deprecation', 'new_component', 'enhancement', 'bug_fix'
change_type: enhancement

# The name of the component, or a single word describing the area of concern, (e.g. collector, target allocator, auto-instrumentation, opamp, github action)
component: collector

# A brief description of the change. Surround your text with quotes ("") if it needs to start with a backtick (`).
note: set default address for all parsed receivers

# One or more tracking issues related to the change
issues: [3126]

# (Optional) One or more lines of additional information to render under the primary note.
# These lines will be padded with 2 spaces and then inserted directly into the document.
# Use pipe (|) for multiline entries.
subtext:
22 changes: 22 additions & 0 deletions internal/components/receivers/helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,81 +61,103 @@ var (
MustBuild(),
components.NewMultiPortReceiverBuilder("skywalking").
AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 11800).
WithDefaultRecAddress("0.0.0.0").
frzifus marked this conversation as resolved.
Show resolved Hide resolved
WithTargetPort(11800).
WithAppProtocol(&components.GrpcProtocol)).
AddPortMapping(components.NewProtocolBuilder(components.HttpProtocol, 12800).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(12800).
WithAppProtocol(&components.HttpProtocol)).
MustBuild(),
components.NewMultiPortReceiverBuilder("jaeger").
AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 14250).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(14250).
WithProtocol(corev1.ProtocolTCP).
WithAppProtocol(&components.GrpcProtocol)).
AddPortMapping(components.NewProtocolBuilder("thrift_http", 14268).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(14268).
WithProtocol(corev1.ProtocolTCP).
WithAppProtocol(&components.HttpProtocol)).
AddPortMapping(components.NewProtocolBuilder("thrift_compact", 6831).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(6831).
WithProtocol(corev1.ProtocolUDP)).
AddPortMapping(components.NewProtocolBuilder("thrift_binary", 6832).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(6832).
WithProtocol(corev1.ProtocolUDP)).
MustBuild(),
components.NewMultiPortReceiverBuilder("loki").
AddPortMapping(components.NewProtocolBuilder(components.GrpcProtocol, 9095).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(9095).
WithAppProtocol(&components.GrpcProtocol)).
AddPortMapping(components.NewProtocolBuilder(components.HttpProtocol, 3100).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(3100).
WithAppProtocol(&components.HttpProtocol)).
MustBuild(),
components.NewSinglePortParserBuilder("awsxray", 2000).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(2000).
WithProtocol(corev1.ProtocolUDP).
MustBuild(),
components.NewSinglePortParserBuilder("carbon", 2003).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(2003).
MustBuild(),
components.NewSinglePortParserBuilder("collectd", 8081).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(8081).
MustBuild(),
components.NewSinglePortParserBuilder("fluentforward", 8006).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(8006).
MustBuild(),
components.NewSinglePortParserBuilder("influxdb", 8086).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(8086).
MustBuild(),
components.NewSinglePortParserBuilder("opencensus", 55678).
WithAppProtocol(nil).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(55678).
MustBuild(),
components.NewSinglePortParserBuilder("sapm", 7276).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(7276).
MustBuild(),
components.NewSinglePortParserBuilder("signalfx", 9943).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(9943).
MustBuild(),
components.NewSinglePortParserBuilder("splunk_hec", 8088).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(8088).
MustBuild(),
components.NewSinglePortParserBuilder("statsd", 8125).
WithDefaultRecAddress("0.0.0.0").
WithProtocol(corev1.ProtocolUDP).
WithTargetPort(8125).
MustBuild(),
components.NewSinglePortParserBuilder("tcplog", components.UnsetPort).
WithDefaultRecAddress("0.0.0.0").
WithProtocol(corev1.ProtocolTCP).
MustBuild(),
components.NewSinglePortParserBuilder("udplog", components.UnsetPort).
WithDefaultRecAddress("0.0.0.0").
WithProtocol(corev1.ProtocolUDP).
MustBuild(),
components.NewSinglePortParserBuilder("wavefront", 2003).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(2003).
MustBuild(),
components.NewSinglePortParserBuilder("zipkin", 9411).
WithAppProtocol(&components.HttpProtocol).
WithProtocol(corev1.ProtocolTCP).
WithDefaultRecAddress("0.0.0.0").
WithTargetPort(3100).
MustBuild(),
NewScraperParser("prometheus"),
Expand Down
4 changes: 2 additions & 2 deletions tests/e2e/smoke-targetallocator/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ data:
jaeger:
protocols:
grpc:
endpoint: :14250
endpoint: 0.0.0.0:14250
prometheus:
config:
global:
Expand All @@ -52,4 +52,4 @@ data:
- jaeger
kind: ConfigMap
metadata:
name: stateful-collector-a65c7bf4
name: stateful-collector-57180221
2 changes: 1 addition & 1 deletion tests/e2e/statefulset-features/00-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
items:
- key: collector.yaml
path: collector.yaml
name: stateful-collector-1e082e0e
name: stateful-collector-4b08af22
name: otc-internal
- emptyDir: {}
name: testvolume
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/statefulset-features/01-assert.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
items:
- key: collector.yaml
path: collector.yaml
name: stateful-collector-1e082e0e
name: stateful-collector-4b08af22
name: otc-internal
- emptyDir: {}
name: testvolume
Expand Down
Loading