Add ability to skip cqlsh, and config collection, commands

Using noCqlsh and skipConfig environment variables Also fix cassandraNodes variable when using collector.hosts
datastax · Sep 16, 2024 · 15579e3 · 15579e3
1 parent e5823a8
commit 15579e3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/ds-collector/ds-collector b/ds-collector/ds-collector
@@ -1013,6 +1013,7 @@ get_infos() {
     while read -u10 hostName; do
       if [[ "$hostName" != \#* ]] && [ "$hostName" ]; then
         get_info
+        cassandraNodes="${cassandraNodes} ${hostName}"
       fi
     done 10< $hostFile
   elif [[ ${runOnSingleNode} != "true" ]] && [[ "$hostName" != \#* ]] && [ "$hostName" ]; then

diff --git a/ds-collector/rust-commands/collect-info.rs b/ds-collector/rust-commands/collect-info.rs
@@ -337,7 +337,7 @@ const COMMANDS: &[Cmd<'static>] = &[
         args: "{cqlsh_host} {cqlsh_port} {cqlsh_opts} -f {artifact_dir}/execute_schema.cql",
         file: "schema.cql",
         optional: false,
-        skip_flags: "",
+        skip_flags: "noCqlsh",
         use_stdout: true,
         use_sudo: false,
         use_timeout: false,
@@ -348,7 +348,7 @@ const COMMANDS: &[Cmd<'static>] = &[
         args: "{cqlsh_host} {cqlsh_port} {cqlsh_opts} -f {artifact_dir}/execute_metadata.cql",
         file: "driver/metadata.txt",
         optional: true,
-        skip_flags: "",
+        skip_flags: "noCqlsh",
         use_stdout: true,
         use_sudo: false,
         use_timeout: false,
@@ -778,7 +778,7 @@ const COMMANDS: &[Cmd<'static>] = &[
         args: "{config_home} {artifact_dir}/conf",
         file: "",
         optional: false,
-        skip_flags: "",
+        skip_flags: "skipConfig",
         use_stdout: true,
         use_sudo: false,
         use_timeout: false,