Merge pull request #23508 from michael-redpanda/CORE-7718-metadata

CORE-7718 metadata

Author: michael-redpanda

src/v/config/configuration.cc

@@ -3273,6 +3273,15 @@ configuration::configuration()
       "Path to RPK binary",
       {.needs_restart = needs_restart::no, .visibility = visibility::tunable},
       "/usr/bin/rpk")
+  , debug_bundle_storage_dir(
+      *this,
+      "debug_bundle_storage_dir",
+      "Path to the debug bundle storage directory. Note: Changing this path "
+      "does not clean up existing debug bundles. If not set, the debug bundle "
+      "is stored in the Redpanda data directory specified in the redpanda.yaml "
+      "broker configuration file.",
+      {.needs_restart = needs_restart::no, .visibility = visibility::user},
+      std::nullopt)
   , oidc_discovery_url(
       *this,
       "oidc_discovery_url",

src/v/config/configuration.h

@@ -662,6 +662,7 @@ struct configuration final : public config_store {
     property<bool> cpu_profiler_enabled;
     bounded_property<std::chrono::milliseconds> cpu_profiler_sample_period_ms;
     property<std::filesystem::path> rpk_path;
+    property<std::optional<std::filesystem::path>> debug_bundle_storage_dir;
 
     // oidc authentication
     property<ss::sstring> oidc_discovery_url;

src/v/debug_bundle/BUILD

@@ -4,36 +4,76 @@ redpanda_cc_library(
     name = "debug_bundle",
     srcs = [
         "debug_bundle_service.cc",
-        "error.cc",
-        "types.cc",
     ],
     hdrs = [
         "debug_bundle_service.h",
-        "error.h",
         "fwd.h",
-        "types.h",
     ],
     implementation_deps = [
+        ":metadata",
+        ":utils",
+        "//src/v/bytes:iostream",
+        "//src/v/crypto",
         "//src/v/ssx:future_util",
-        "//src/v/strings:string_switch",
         "//src/v/utils:external_process",
         "@boost//:algorithm",
+        "@re2",
     ],
     include_prefix = "debug_bundle",
     visibility = ["//visibility:public"],
     deps = [
+        ":error",
+        ":types",
         "//src/v/base",
         "//src/v/config",
         "//src/v/container:fragmented_vector",
+        "//src/v/storage",
+        "//src/v/utils:mutex",
+        "@fmt",
+        "@seastar",
+    ],
+)
+
+redpanda_cc_library(
+    name = "error",
+    srcs = [
+        "error.cc",
+    ],
+    hdrs = [
+        "error.h",
+    ],
+    include_prefix = "debug_bundle",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/v/base",
+    ],
+)
+
+redpanda_cc_library(
+    name = "types",
+    srcs = [
+        "types.cc",
+    ],
+    hdrs = [
+        "types.h",
+    ],
+    implementation_deps = [
+        ":error",
+        "//src/v/strings:string_switch",
+        "@re2",
+    ],
+    include_prefix = "debug_bundle",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//src/v/base",
+        "//src/v/container:fragmented_vector",
         "//src/v/model",
         "//src/v/security",
-        "//src/v/utils:mutex",
         "//src/v/utils:named_type",
         "//src/v/utils:uuid",
         "@abseil-cpp//absl/container:btree",
         "@abseil-cpp//absl/strings",
         "@fmt",
-        "@re2",
         "@seastar",
     ],
 )
@@ -52,3 +92,48 @@ redpanda_cc_library(
         "//src/v/reflection:type_traits",
     ],
 )
+
+redpanda_cc_library(
+    name = "metadata",
+    hdrs = [
+        "metadata.h",
+    ],
+    implementation_deps = [
+        "//src/v/serde:vector",
+    ],
+    include_prefix = "debug_bundle",
+    visibility = ["//src/v/debug_bundle/tests:__subpackages__"],
+    deps = [
+        ":types",
+        "//src/v/bytes",
+        "//src/v/container:fragmented_vector",
+        "//src/v/serde",
+        "//src/v/serde:bytes",
+        "//src/v/serde:named_type",
+        "//src/v/serde:uuid",
+        "//src/v/serde:variant",
+        "//src/v/utils:uuid",
+        "@seastar",
+    ],
+)
+
+redpanda_cc_library(
+    name = "utils",
+    srcs = [
+        "utils.cc",
+    ],
+    hdrs = [
+        "utils.h",
+    ],
+    implementation_deps = [
+        "//src/v/base",
+        "//src/v/crypto",
+        "//src/v/ssx:future_util",
+        "@seastar",
+    ],
+    include_prefix = "debug_bundle",
+    visibility = ["//src/v/debug_bundle/tests:__subpackages__"],
+    deps = [
+        "//src/v/bytes",
+    ],
+)

src/v/debug_bundle/CMakeLists.txt

@@ -4,6 +4,7 @@ v_cc_library(
       debug_bundle_service.cc
       error.cc
       types.cc
+      utils.cc
     DEPS
       v::config
       v::utils