1 files changed, 9 insertions, 0 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
index 59ab17af8d6..b6783efb25b 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/CommandLineOptions.java
@@ -25,6 +25,7 @@ public class CommandLineOptions {
     private static final String BUCKET_OPTION = "bucket";
     private static final String GID_OPTION = "gid";
     private static final String DOCUMENT_OPTION = "document";
+    private static final String BUCKET_SPACE_OPTION = "bucketspace";
 
     private final Options options = createOptions();
 
@@ -51,6 +52,13 @@ public class CommandLineOptions {
                 .longOpt(ROUTE_OPTION)
                 .build());
 
+        options.addOption(Option.builder("s")
+                .hasArg(true)
+                .desc("Stat buckets within the given bucket space. If not provided, 'default' is used.")
+                .argName("space")
+                .longOpt(BUCKET_SPACE_OPTION)
+                .build());
+
         // A group of mutually exclusive options for user, group, bucket, gid and document.
         OptionGroup optionGroup = new OptionGroup();
         optionGroup.setRequired(false);
@@ -109,6 +117,7 @@ public class CommandLineOptions {
             builder.setHelp(cl.hasOption(HELP_OPTION));
             builder.setDumpData(cl.hasOption(DUMP_OPTION));
             builder.setRoute(cl.getOptionValue(ROUTE_OPTION, "default"));
+            builder.setBucketSpace(cl.getOptionValue(BUCKET_SPACE_OPTION, "default"));
 
             if (cl.hasOption(USER_OPTION)) {
                 builder.setSelectionType(ClientParameters.SelectionType.USER);