diff --git a/pkg/cli/testdata/zip/partial1 b/pkg/cli/testdata/zip/partial1 index b6fe846f7c9c..b647bcae2a59 100644 --- a/pkg/cli/testdata/zip/partial1 +++ b/pkg/cli/testdata/zip/partial1 @@ -42,6 +42,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done diff --git a/pkg/cli/testdata/zip/partial1_excluded b/pkg/cli/testdata/zip/partial1_excluded index e1a87744aea6..0b34e4242ecd 100644 --- a/pkg/cli/testdata/zip/partial1_excluded +++ b/pkg/cli/testdata/zip/partial1_excluded @@ -42,6 +42,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done diff --git a/pkg/cli/testdata/zip/partial2 b/pkg/cli/testdata/zip/partial2 index 57553123608e..ffeffece24d5 100644 --- a/pkg/cli/testdata/zip/partial2 +++ b/pkg/cli/testdata/zip/partial2 @@ -42,6 +42,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done diff --git a/pkg/cli/testdata/zip/testzip b/pkg/cli/testdata/zip/testzip index 5e398b54cb04..4d8442ca3858 100644 --- a/pkg/cli/testdata/zip/testzip +++ b/pkg/cli/testdata/zip/testzip @@ -42,6 +42,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done diff --git a/pkg/cli/testdata/zip/testzip_concurrent b/pkg/cli/testdata/zip/testzip_concurrent index e5985000318c..4b0e44797615 100644 --- a/pkg/cli/testdata/zip/testzip_concurrent +++ b/pkg/cli/testdata/zip/testzip_concurrent @@ -146,6 +146,9 @@ zip [cluster] retrieving SQL data for system.external_connections... [cluster] retrieving SQL data for system.external_connections: done [cluster] retrieving SQL data for system.external_connections: writing output: debug/system.external_connections.txt... +[cluster] retrieving SQL data for system.job_info... +[cluster] retrieving SQL data for system.job_info: done +[cluster] retrieving SQL data for system.job_info: writing output: debug/system.job_info.txt... [cluster] retrieving SQL data for system.jobs... [cluster] retrieving SQL data for system.jobs: done [cluster] retrieving SQL data for system.jobs: writing output: debug/system.jobs.txt... diff --git a/pkg/cli/testdata/zip/testzip_shared_process_tenant b/pkg/cli/testdata/zip/testzip_shared_process_tenant index 439a7595c088..ead2b34b595c 100644 --- a/pkg/cli/testdata/zip/testzip_shared_process_tenant +++ b/pkg/cli/testdata/zip/testzip_shared_process_tenant @@ -42,6 +42,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done @@ -231,6 +232,7 @@ debug zip --concurrency=1 --cpu-profile-duration=1s /dev/null [cluster] retrieving SQL data for system.descriptor... writing output: debug/tenants/test-tenant/system.descriptor.txt... done [cluster] retrieving SQL data for system.eventlog... writing output: debug/tenants/test-tenant/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/tenants/test-tenant/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/tenants/test-tenant/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/tenants/test-tenant/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/tenants/test-tenant/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/tenants/test-tenant/system.locations.txt... done diff --git a/pkg/cli/testdata/zip/testzip_tenant_separate_process b/pkg/cli/testdata/zip/testzip_tenant_separate_process index 4c404d18628f..a4ae5a89cc24 100644 --- a/pkg/cli/testdata/zip/testzip_tenant_separate_process +++ b/pkg/cli/testdata/zip/testzip_tenant_separate_process @@ -50,6 +50,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.eventlog... writing output: debug/system.eventlog.txt... done [cluster] retrieving SQL data for system.external_connections... writing output: debug/system.external_connections.txt... done +[cluster] retrieving SQL data for system.job_info... writing output: debug/system.job_info.txt... done [cluster] retrieving SQL data for system.jobs... writing output: debug/system.jobs.txt... done [cluster] retrieving SQL data for system.lease... writing output: debug/system.lease.txt... done [cluster] retrieving SQL data for system.locations... writing output: debug/system.locations.txt... done diff --git a/pkg/cli/zip_table_registry.go b/pkg/cli/zip_table_registry.go index 5141bd324489..04268fea149b 100644 --- a/pkg/cli/zip_table_registry.go +++ b/pkg/cli/zip_table_registry.go @@ -994,6 +994,18 @@ var zipSystemTables = DebugZipTableRegistry{ to_hex(progress) AS hex_progress FROM system.jobs`, }, + "system.job_info": { + // `value` column may contain customer info, such as URI params + // containing access keys, encryption salts, etc. + customQueryUnredacted: `SELECT *, + to_hex(value) AS hex_value + FROM system.job_info`, + customQueryRedacted: `SELECT job_id, + info_key, + written, + 'redacted' AS value + FROM system.job_info`, + }, "system.lease": { nonSensitiveCols: NonSensitiveColumns{ `"descID"`,