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

[backport] [7.43.x] Upgrade JMXFetch to 0.47.6 #16366

Closed
wants to merge 6 commits into from
Closed

[backport] [7.43.x] Upgrade JMXFetch to 0.47.6 #16366

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7a19cd0
Upgrades JMXFetch to 0.47.6
scottopell Mar 30, 2023
3ce9fef
Adds config option to control jmxfetch statsd client blocking mode
scottopell Mar 30, 2023
f30881e
Update releasenotes/notes/jmxfetch-0.47.6-5bd54d911d7a28c5.yaml
scottopell Mar 30, 2023
6ce42d5
Exposes two more jmxfetch statsd client config settings, socket buffe…
scottopell Mar 31, 2023
c526906
Updates jmxfetch cli arg names
scottopell Mar 31, 2023
ad34b33
Update JMXFetch to 0.47.7
scottopell Apr 3, 2023
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: 1 addition & 0 deletions pkg/config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -814,6 +814,7 @@ func InitConfig(config Config) {
// this is an internal setting and will not be documented in the config template.
// the queue size is the no. of elements (metrics, event, service checks) it can hold.
config.BindEnvAndSetDefault("jmx_statsd_client_queue_size", 4096)
config.BindEnvAndSetDefault("jmx_statsd_client_use_non_blocking", false)

// Go_expvar server port
config.BindEnvAndSetDefault("expvar_port", "5000")
Expand Down
4 changes: 4 additions & 0 deletions pkg/jmxfetch/jmxfetch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ func (j *JMXFetch) Start(manage bool) error {
subprocessArgs = append(subprocessArgs, "--statsd_telemetry")
}

if config.Datadog.GetBool("jmx_statsd_client_use_non_blocking") {
subprocessArgs = append(subprocessArgs, "--statsd-nonblocking")
}

if config.Datadog.GetBool("log_format_rfc3339") {
subprocessArgs = append(subprocessArgs, "--log_format_rfc3339")
}
Expand Down
18 changes: 9 additions & 9 deletions release.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"INTEGRATIONS_CORE_VERSION": "7.43.x",
"OMNIBUS_SOFTWARE_VERSION": "7.43.x",
"OMNIBUS_RUBY_VERSION": "7.43.x",
"JMXFETCH_VERSION": "0.47.2",
"JMXFETCH_HASH": "92f9c744fe00c13c6401829b9eb50f44c5843ae9d1a14f7618531bdf0187e44f",
"JMXFETCH_VERSION": "0.47.6",
"JMXFETCH_HASH": "27943c0011f5005ad60a093092a934b644f228a19854582e9c317f8f483e707d",
"MACOS_BUILD_VERSION": "7.43.x",
"WINDOWS_DDNPM_DRIVER": "release-signed",
"WINDOWS_DDNPM_VERSION": "2.3.0",
Expand All @@ -20,8 +20,8 @@
"INTEGRATIONS_CORE_VERSION": "7.43.x",
"OMNIBUS_SOFTWARE_VERSION": "7.43.x",
"OMNIBUS_RUBY_VERSION": "7.43.x",
"JMXFETCH_VERSION": "0.47.2",
"JMXFETCH_HASH": "92f9c744fe00c13c6401829b9eb50f44c5843ae9d1a14f7618531bdf0187e44f",
"JMXFETCH_VERSION": "0.47.6",
"JMXFETCH_HASH": "27943c0011f5005ad60a093092a934b644f228a19854582e9c317f8f483e707d",
"MACOS_BUILD_VERSION": "7.43.x",
"WINDOWS_DDNPM_DRIVER": "release-signed",
"WINDOWS_DDNPM_VERSION": "2.3.0",
Expand All @@ -32,8 +32,8 @@
"INTEGRATIONS_CORE_VERSION": "7.43.1",
"OMNIBUS_SOFTWARE_VERSION": "7.43.0",
"OMNIBUS_RUBY_VERSION": "7.43.0",
"JMXFETCH_VERSION": "0.47.2",
"JMXFETCH_HASH": "92f9c744fe00c13c6401829b9eb50f44c5843ae9d1a14f7618531bdf0187e44f",
"JMXFETCH_VERSION": "0.47.6",
"JMXFETCH_HASH": "27943c0011f5005ad60a093092a934b644f228a19854582e9c317f8f483e707d",
"SECURITY_AGENT_POLICIES_VERSION": "v0.43.1",
"MACOS_BUILD_VERSION": "6.43.0",
"WINDOWS_DDNPM_DRIVER": "release-signed",
Expand All @@ -44,8 +44,8 @@
"INTEGRATIONS_CORE_VERSION": "7.43.1",
"OMNIBUS_SOFTWARE_VERSION": "7.43.0",
"OMNIBUS_RUBY_VERSION": "7.43.0",
"JMXFETCH_VERSION": "0.47.2",
"JMXFETCH_HASH": "92f9c744fe00c13c6401829b9eb50f44c5843ae9d1a14f7618531bdf0187e44f",
"JMXFETCH_VERSION": "0.47.6",
"JMXFETCH_HASH": "27943c0011f5005ad60a093092a934b644f228a19854582e9c317f8f483e707d",
"SECURITY_AGENT_POLICIES_VERSION": "v0.43.1",
"MACOS_BUILD_VERSION": "7.43.0",
"WINDOWS_DDNPM_DRIVER": "release-signed",
Expand Down Expand Up @@ -82,4 +82,4 @@
"dca-1.9.0": {
"SECURITY_AGENT_POLICIES_VERSION": "v0.3"
}
}
}
12 changes: 12 additions & 0 deletions releasenotes/notes/jmxfetch-0.47.6-5bd54d911d7a28c5.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# 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:
- |
JMXFetch upgraded to ``0.47.6`` which contains security,
scottopell marked this conversation as resolved.
Show resolved Hide resolved
performance, and bug fixes. See JMXFetch changelog for more.