cli: add system.settings to debug zip

This is handy to figure out whether a setting was explicitly set.
It may not be as elegant as annotating crdb_internal.cluster_settings,
but it is simple, backwards compatible, and something.

Release note (ops change): cockroach debug zip will now include the raw
system.settings table. This table makes it possible to determine whether
a cluster settings has been explicitly set.

pkg/cli/testdata/zip/partial1

@@ -22,6 +22,7 @@ debug zip --concurrency=1 --cpu-profile-duration=0s /dev/null
 [cluster] retrieving SQL data for system.descriptor... writing output: debug/system.descriptor.txt... done
 [cluster] retrieving SQL data for system.namespace... writing output: debug/system.namespace.txt... done
 [cluster] retrieving SQL data for system.scheduled_jobs... writing output: debug/system.scheduled_jobs.txt... done
+[cluster] retrieving SQL data for system.settings... writing output: debug/system.settings.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_statements... writing output: debug/crdb_internal.create_statements.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_type_statements... writing output: debug/crdb_internal.create_type_statements.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done

pkg/cli/testdata/zip/partial1_excluded

@@ -22,6 +22,7 @@ debug zip /dev/null --concurrency=1 --exclude-nodes=2 --cpu-profile-duration=0
 [cluster] retrieving SQL data for system.descriptor... writing output: debug/system.descriptor.txt... done
 [cluster] retrieving SQL data for system.namespace... writing output: debug/system.namespace.txt... done
 [cluster] retrieving SQL data for system.scheduled_jobs... writing output: debug/system.scheduled_jobs.txt... done
+[cluster] retrieving SQL data for system.settings... writing output: debug/system.settings.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_statements... writing output: debug/crdb_internal.create_statements.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_type_statements... writing output: debug/crdb_internal.create_type_statements.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done

pkg/cli/testdata/zip/partial2

@@ -22,6 +22,7 @@ debug zip --concurrency=1 --cpu-profile-duration=0 /dev/null
 [cluster] retrieving SQL data for system.descriptor... writing output: debug/system.descriptor.txt... done
 [cluster] retrieving SQL data for system.namespace... writing output: debug/system.namespace.txt... done
 [cluster] retrieving SQL data for system.scheduled_jobs... writing output: debug/system.scheduled_jobs.txt... done
+[cluster] retrieving SQL data for system.settings... writing output: debug/system.settings.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_statements... writing output: debug/crdb_internal.create_statements.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_type_statements... writing output: debug/crdb_internal.create_type_statements.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done

pkg/cli/testdata/zip/testzip

@@ -22,6 +22,7 @@ debug zip --concurrency=1 --cpu-profile-duration=1s /dev/null
 [cluster] retrieving SQL data for system.descriptor... writing output: debug/system.descriptor.txt... done
 [cluster] retrieving SQL data for system.namespace... writing output: debug/system.namespace.txt... done
 [cluster] retrieving SQL data for system.scheduled_jobs... writing output: debug/system.scheduled_jobs.txt... done
+[cluster] retrieving SQL data for system.settings... writing output: debug/system.settings.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_statements... writing output: debug/crdb_internal.create_statements.txt... done
 [cluster] retrieving SQL data for "".crdb_internal.create_type_statements... writing output: debug/crdb_internal.create_type_statements.txt... done
 [cluster] retrieving SQL data for crdb_internal.kv_node_liveness... writing output: debug/crdb_internal.kv_node_liveness.txt... done

pkg/cli/testdata/zip/testzip_concurrent

@@ -115,6 +115,9 @@ zip
 [cluster] retrieving SQL data for system.scheduled_jobs...
 [cluster] retrieving SQL data for system.scheduled_jobs: done
 [cluster] retrieving SQL data for system.scheduled_jobs: writing output: debug/system.scheduled_jobs.txt...
+[cluster] retrieving SQL data for system.settings...
+[cluster] retrieving SQL data for system.settings: done
+[cluster] retrieving SQL data for system.settings: writing output: debug/system.settings.txt...
 [cluster] retrieving the node status to get the SQL address...
 [cluster] retrieving the node status to get the SQL address: ...
 [cluster] using SQL address: ...

pkg/cli/zip.go

@@ -50,6 +50,7 @@ var customQuery = map[string]string{
 		") SELECT * FROM spans, LATERAL crdb_internal.payloads_for_span(span_id)",
 	"system.jobs":       "SELECT *, to_hex(payload) AS hex_payload, to_hex(progress) AS hex_progress FROM system.jobs",
 	"system.descriptor": "SELECT *, to_hex(descriptor) AS hex_descriptor FROM system.descriptor",
+	"system.settings":   "SELECT *, to_hex(value::bytes) as hex_value FROM system.settings",
 }
 
 type debugZipContext struct {

pkg/cli/zip_cluster_wide.go

@@ -86,6 +86,7 @@ var debugZipTablesPerCluster = []string{
 	"system.descriptor", // descriptors also contain job-like mutation state.
 	"system.namespace",
 	"system.scheduled_jobs",
+	"system.settings", // get the raw settings to determine what's explicitly set.
 
 	// The synthetic SQL CREATE statements for all tables.
 	// Note the "". to collect across all databases.

pkg/cli/zip_test.go

@@ -104,6 +104,7 @@ ORDER BY name ASC`)
 		"system.descriptor",
 		"system.namespace",
 		"system.scheduled_jobs",
+		"system.settings",
 	)
 	sort.Strings(tables)