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

Jump to bottom

Use the correct socket for system probe on Windows #833

Merged
merged 3 commits into from
Jan 5, 2022
Merged

Use the correct socket for system probe on Windows #833

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9889530
Update default.rb
julien-lebot Dec 30, 2021
d3899ca
Fix style offense
julien-lebot Dec 30, 2021
23d350f
Address review comments
julien-lebot Jan 4, 2022
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
10 changes: 9 additions & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,15 @@
# the NPM module of system probe will still run.
default['datadog']['system_probe']['enabled'] = false
# sysprobe_socket defines the unix socket location
default['datadog']['system_probe']['sysprobe_socket'] = '/opt/datadog-agent/run/sysprobe.sock'
default['datadog']['system_probe']['sysprobe_socket'] =
if platform_family?('windows')
# might be //opt/datadog-agent/run/sysprobe.sock
# note the //
Copy link

Choose a reason for hiding this comment

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

the // comment should probably be in the else clause.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The comment was for myself since I hesitated between localhost:3333 and //opt/datadog-agent/run/sysprobe.sock. I found the // syntax here and thought it might apply here, so I'll just remove the comment.

'localhost:3333'
else
'/opt/datadog-agent/run/sysprobe.sock'
end

# debug_port is the http port for expvar, it is disabled if set to 0
default['datadog']['system_probe']['debug_port'] = 0
default['datadog']['system_probe']['bpf_debug'] = false
Expand Down