Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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
1 change: 0 additions & 1 deletion comp/dogstatsd/server/impl/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,6 @@ func (s *dsdServer) start(context.Context) error {
}

if len(socketStreamPath) > 0 {
s.log.Warnf("dogstatsd_stream_socket is not yet supported, run it at your own risk")
unixListener, err := listeners.NewUDSStreamListener(packetsChannel, sharedPacketPoolManager, sharedUDSOobPoolManager, s.config, s.tCapture, s.wmeta, s.pidMap, s.listernersTelemetry, s.packetsTelemetry, s.telemetry)
if err != nil {
s.log.Errorf("Can't init listener: %s", err.Error())
Expand Down
13 changes: 11 additions & 2 deletions pkg/config/config_template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2492,15 +2492,24 @@ api_key:

## @param dogstatsd_socket - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
## @env DD_DOGSTATSD_SOCKET - string - optional - default: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}
## Listen for Dogstatsd metrics on a Unix Socket (*nix only).
## Listen for Dogstatsd metrics on a Unix domain socket (*nix only).
## Set to a valid and existing filesystem path to enable.
## Set to "" to disable this feature.
##
## Please note that UDS receiver is not available in Windows.
## Enabling this setting may result in unexpected behavior.
#
# dogstatsd_socket: {{ if (or (eq .OS "linux") (eq .OS "aix")) }}"/var/run/datadog/dsd.socket"{{else}}""{{end}}

## @param dogstatsd_stream_socket - string - optional - default: ""
## @env DD_DOGSTATSD_STREAM_SOCKET - string - optional - default: ""
## Listen for Dogstatsd metrics on a Unix domain socket using stream mode (SOCK_STREAM, *nix only).
## Set to a valid and existing filesystem path to enable.
## Set to "" to disable this feature.
##
## Please note that this is not available in Windows.
#
# dogstatsd_stream_socket: ""

## @param dogstatsd_origin_detection - boolean - optional - default: false
## @env DD_DOGSTATSD_ORIGIN_DETECTION - boolean - optional - default: false
## When using Unix Socket, DogStatsD can tag metrics with container metadata.
Expand Down
22 changes: 15 additions & 7 deletions pkg/config/schema/yaml/core_schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2215,18 +2215,31 @@ properties:
type: string
visibility: public
description: |-
Listen for Dogstatsd metrics on a Unix Socket (*nix only).
Listen for Dogstatsd metrics on a Unix domain socket (*nix only).
Set to a valid and existing filesystem path to enable.
Set to "" to disable this feature.

Please note that UDS receiver is not available in Windows.
Enabling this setting may result in unexpected behavior.
tags:
- template_section:Dogstatsd
platform_default:
linux: /var/run/datadog/dsd.socket
aix: /var/run/datadog/dsd.socket
other: ''
dogstatsd_stream_socket:
node_type: setting
type: string
default: ''
visibility: public
description: |-
Listen for Dogstatsd metrics on a Unix domain socket using stream mode (SOCK_STREAM, *nix only).
Set to a valid and existing filesystem path to enable.
Set to "" to disable this feature.

Please note that this is not available in Windows.
tags:
- template_section:Dogstatsd
comment: 'Experimental || Notice: empty means feature disabled'

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove this comment then ?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yes. Good spot.

dogstatsd_origin_detection:
node_type: setting
type: boolean
Expand Down Expand Up @@ -7989,11 +8002,6 @@ properties:
node_type: setting
type: boolean
default: false
dogstatsd_stream_socket:
node_type: setting
type: string
default: ''
comment: 'Experimental || Notice: empty means feature disabled'
dogstatsd_string_interner_size:
node_type: setting
type: integer
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Each section from every release note are combined when the
# CHANGELOG.rst is rendered. So the text needs to be worded so that
# it does not depend on any information only available in another
# section. This may mean repeating some details, but each section
# must be readable independently of the other.
#
# Each section note must be formatted as reStructuredText.
---
enhancements:
- |
The ``dogstatsd_stream_socket`` configuration option, which lets DogStatsD
listen for metrics on a Unix domain socket using stream mode (``SOCK_STREAM``),
is now considered stable.
Loading