Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
9853e81
Minor tweaks and full backend test
todvora Apr 3, 2026
b4a97e0
Avoid creating unnecessary executor
todvora Apr 3, 2026
509e183
Parallelize information collection
todvora Apr 3, 2026
dca5bed
timestamp cleanup
todvora Apr 3, 2026
ce0b060
Code simplification
todvora Apr 3, 2026
45e5431
Better datanode log transfer
todvora Apr 3, 2026
34c2a80
Prevent thread blocking, run all tasks in parallel. Run the test agai…
todvora Apr 3, 2026
1c3cd41
more parallelism for tasks, decreases bundle build time
todvora Apr 3, 2026
e8ac420
Code cleanup
todvora Apr 3, 2026
370fa7c
private constants
todvora Apr 3, 2026
e38e66c
increase call timeout to 30s
todvora Apr 3, 2026
5618d64
better threading model
todvora Apr 3, 2026
975833f
better closing of zip entries
todvora Apr 3, 2026
7478d95
Add buffering for zip writing
todvora Apr 3, 2026
49d2800
code cleanup and readability
todvora Apr 3, 2026
5425a22
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 7, 2026
496f838
Added test to verify valid content of the support bundle
todvora Apr 7, 2026
b05c6aa
added changelog
todvora Apr 7, 2026
3d2eefb
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 7, 2026
ffada39
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 8, 2026
e6c416e
Merge branch 'master' into feature/support-bundle-tweaks
patrickmann Apr 9, 2026
1e5662d
failure tolerant future handling for cluster and datanode infos
todvora Apr 9, 2026
2f4f246
Added support for errors during bundle creation
todvora Apr 9, 2026
039ab13
code cleanup
todvora Apr 9, 2026
7a2d834
safer future error handling, added node call errors
todvora Apr 9, 2026
8a302ef
fixed test
todvora Apr 10, 2026
ee423a4
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 10, 2026
108af82
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 13, 2026
d9aebb6
Fix datanode logs in test instances
todvora Apr 13, 2026
b9ef0a9
Use selfsigned startup for support bundle ITs
todvora Apr 14, 2026
9c458c7
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 14, 2026
4063561
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 16, 2026
214a6d5
fix leaked resource in IT
todvora Apr 16, 2026
fcedce3
code cleanup
todvora Apr 16, 2026
e48d943
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 16, 2026
0979b05
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 20, 2026
8a65e3b
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 20, 2026
223476f
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 21, 2026
f5690f5
safer stream handling for support bundle
todvora Apr 21, 2026
64e78b3
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 21, 2026
b834c6e
debug logging
todvora Apr 21, 2026
c974158
rename paths
todvora Apr 21, 2026
cb435a8
fix path traversal test
todvora Apr 21, 2026
a003dde
url encoding enabled in test
todvora Apr 22, 2026
c3c7361
url encoding enabled in test
todvora Apr 22, 2026
1d5194b
fix encoding
todvora Apr 22, 2026
08f6c1f
removed failing test
todvora Apr 22, 2026
d9c3fa8
Merge branch 'master' into feature/support-bundle-tweaks
todvora Apr 22, 2026
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
5 changes: 5 additions & 0 deletions changelog/unreleased/pr-25555.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
type = "c"
message = "Support bundle improvements and fixes - parallelism, memory consumption, resource and error handling"

issues = ["graylog-plugin-enterprise#13625"]
pulls = ["25555"]
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,20 @@
*/
package org.graylog.datanode.rest;

import jakarta.inject.Inject;
import jakarta.ws.rs.GET;
import jakarta.ws.rs.InternalServerErrorException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.StreamingOutput;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.core.Appender;
import org.apache.logging.log4j.core.LoggerContext;
import org.apache.logging.log4j.core.config.Configuration;
import org.graylog.datanode.opensearch.OpensearchProcess;

import jakarta.inject.Inject;

import jakarta.ws.rs.GET;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.core.MediaType;
import org.graylog.datanode.rest.config.OnlyInSecuredNode;
import org.graylog2.log4j.MemoryAppender;

Expand Down Expand Up @@ -63,8 +61,8 @@ public List<String> getOpensearchStderr() {
}

@GET
@OnlyInSecuredNode
Comment thread
moesterheld marked this conversation as resolved.
@Produces(MediaType.TEXT_PLAIN)
@OnlyInSecuredNode
@Path("/internal")
public Response getOpensearchInternal() {
final Appender appender = getAppender(MEMORY_APPENDER_NAME);
Expand Down
Loading
Loading