Skip to content

Commit f7554ce

Browse files
craig[bot]kyle-a-wong
craig[bot]
and
kyle-a-wong
committed
Merge #153611
153611: cli: add kv_exec file group to the default logging configuration r=kyle-a-wong a=kyle-a-wong Resolves: CRDB-54412 Epic: CRDB-53410 Release note: None Co-authored-by: Kyle Wong <[email protected]>
2 parents 4c6b4ce + c3d06bb commit f7554ce

File tree

3 files changed

+16
-0
lines changed

3 files changed

+16
-0
lines changed

‎pkg/cli/log_flags.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,7 @@ sinks:
470470
changefeed: { channels: CHANGEFEED }
471471
health: { channels: HEALTH }
472472
kv-distribution: { channels: KV_DISTRIBUTION }
473+
kv-exec: { channels: KV_EXEC }
473474
pebble: { channels: STORAGE }
474475
security: { channels: [PRIVILEGES, USER_ADMIN], auditable: true }
475476
sql-auth: { channels: SESSIONS, auditable: true }

‎pkg/cli/testdata/logflags‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ CHANGEFEED,
3535
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
3636
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
3737
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
38+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
3839
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
3940
security: <fileCfg(INFO: [USER_ADMIN,
4041
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -75,6 +76,7 @@ CHANGEFEED,
7576
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
7677
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
7778
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
79+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
7880
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
7981
security: <fileCfg(INFO: [USER_ADMIN,
8082
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -185,6 +187,7 @@ CHANGEFEED,
185187
KV_EXEC],/pathA/logs,true,crdb-v2)>,
186188
health: <fileCfg(INFO: [HEALTH],/pathA/logs,true,crdb-v2)>,
187189
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/pathA/logs,true,crdb-v2)>,
190+
kv-exec: <fileCfg(INFO: [KV_EXEC],/pathA/logs,true,crdb-v2)>,
188191
pebble: <fileCfg(INFO: [STORAGE],/pathA/logs,true,crdb-v2)>,
189192
security: <fileCfg(INFO: [USER_ADMIN,
190193
PRIVILEGES],/pathA/logs,false,crdb-v2)>,
@@ -227,6 +230,7 @@ CHANGEFEED,
227230
KV_EXEC],/mypath,true,crdb-v2)>,
228231
health: <fileCfg(INFO: [HEALTH],/mypath,true,crdb-v2)>,
229232
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/mypath,true,crdb-v2)>,
233+
kv-exec: <fileCfg(INFO: [KV_EXEC],/mypath,true,crdb-v2)>,
230234
pebble: <fileCfg(INFO: [STORAGE],/mypath,true,crdb-v2)>,
231235
security: <fileCfg(INFO: [USER_ADMIN,
232236
PRIVILEGES],/mypath,false,crdb-v2)>,
@@ -270,6 +274,7 @@ CHANGEFEED,
270274
KV_EXEC],/pathA/logs,true,crdb-v2)>,
271275
health: <fileCfg(INFO: [HEALTH],/pathA/logs,true,crdb-v2)>,
272276
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/pathA/logs,true,crdb-v2)>,
277+
kv-exec: <fileCfg(INFO: [KV_EXEC],/pathA/logs,true,crdb-v2)>,
273278
pebble: <fileCfg(INFO: [STORAGE],/pathA/logs,true,crdb-v2)>,
274279
security: <fileCfg(INFO: [USER_ADMIN,
275280
PRIVILEGES],/pathA/logs,false,crdb-v2)>,
@@ -318,6 +323,7 @@ CHANGEFEED,
318323
KV_EXEC],/mypath,true,crdb-v2)>,
319324
health: <fileCfg(INFO: [HEALTH],/mypath,true,crdb-v2)>,
320325
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/mypath,true,crdb-v2)>,
326+
kv-exec: <fileCfg(INFO: [KV_EXEC],/mypath,true,crdb-v2)>,
321327
pebble: <fileCfg(INFO: [STORAGE],/mypath,true,crdb-v2)>,
322328
security: <fileCfg(INFO: [USER_ADMIN,
323329
PRIVILEGES],/mypath,false,crdb-v2)>,
@@ -359,6 +365,7 @@ CHANGEFEED,
359365
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
360366
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
361367
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
368+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
362369
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
363370
security: <fileCfg(INFO: [USER_ADMIN,
364371
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -401,6 +408,7 @@ CHANGEFEED,
401408
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
402409
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
403410
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
411+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
404412
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
405413
security: <fileCfg(INFO: [USER_ADMIN,
406414
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -453,6 +461,7 @@ CHANGEFEED,
453461
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
454462
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
455463
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
464+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
456465
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
457466
security: <fileCfg(INFO: [USER_ADMIN,
458467
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -528,6 +537,7 @@ CHANGEFEED,
528537
KV_EXEC],/mypath,true,crdb-v2)>,
529538
health: <fileCfg(INFO: [HEALTH],/mypath,true,crdb-v2)>,
530539
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/mypath,true,crdb-v2)>,
540+
kv-exec: <fileCfg(INFO: [KV_EXEC],/mypath,true,crdb-v2)>,
531541
pebble: <fileCfg(INFO: [STORAGE],/mypath,true,crdb-v2)>,
532542
security: <fileCfg(INFO: [USER_ADMIN,
533543
PRIVILEGES],/mypath,false,crdb-v2)>,
@@ -571,6 +581,7 @@ CHANGEFEED,
571581
KV_EXEC],/pathA,true,crdb-v2)>,
572582
health: <fileCfg(INFO: [HEALTH],/pathA,true,crdb-v2)>,
573583
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],/pathA,true,crdb-v2)>,
584+
kv-exec: <fileCfg(INFO: [KV_EXEC],/pathA,true,crdb-v2)>,
574585
pebble: <fileCfg(INFO: [STORAGE],/pathA,true,crdb-v2)>,
575586
security: <fileCfg(INFO: [USER_ADMIN,
576587
PRIVILEGES],/pathA,false,crdb-v2)>,
@@ -634,6 +645,7 @@ CHANGEFEED,
634645
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
635646
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
636647
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
648+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
637649
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
638650
security: <fileCfg(INFO: [USER_ADMIN,
639651
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,
@@ -675,6 +687,7 @@ CHANGEFEED,
675687
KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
676688
health: <fileCfg(INFO: [HEALTH],<defaultLogDir>,true,crdb-v2)>,
677689
kv-distribution: <fileCfg(INFO: [KV_DISTRIBUTION],<defaultLogDir>,true,crdb-v2)>,
690+
kv-exec: <fileCfg(INFO: [KV_EXEC],<defaultLogDir>,true,crdb-v2)>,
678691
pebble: <fileCfg(INFO: [STORAGE],<defaultLogDir>,true,crdb-v2)>,
679692
security: <fileCfg(INFO: [USER_ADMIN,
680693
PRIVILEGES],<defaultLogDir>,false,crdb-v2)>,

‎pkg/roachprod/install/files/cockroachdb-logging.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ sinks:
3737
channels: [HEALTH]
3838
kv-distribution:
3939
channels: [KV_DISTRIBUTION]
40+
kv-exec:
41+
channels: [KV_EXEC]
4042
pebble:
4143
channels: [STORAGE]
4244
security:

0 commit comments

Comments
 (0)