Merge #153381

153381: cli: add changefeed file group to default logging configuration r=dhartunian a=andyyang890

Fixes #153382

Release note (ops change): A new `changefeed` file group that collects
changefeed logs has been added to the default logging configuration.

Co-authored-by: Andy Yang <[email protected]>

Author: craig[bot]

pkg/cli/log_flags.go

@@ -463,14 +463,15 @@ func addPredefinedLogFiles(c *logconfig.Config) {
 const predefinedLogFiles = `
 sinks:
  file-groups:
-  kv-distribution:        { channels: KV_DISTRIBUTION }
   default:
     channels:
       INFO: [DEV, OPS]
       WARNING: all except [DEV, OPS]
-  health:                 { channels: HEALTH  }
+  changefeed:             { channels: CHANGEFEED }
+  health:                 { channels: HEALTH }
+  kv-distribution:        { channels: KV_DISTRIBUTION }
   pebble:                 { channels: STORAGE }
-  security:               { channels: [PRIVILEGES, USER_ADMIN], auditable: true  }
+  security:               { channels: [PRIVILEGES, USER_ADMIN], auditable: true }
   sql-auth:               { channels: SESSIONS, auditable: true }
   sql-audit:              { channels: SENSITIVE_ACCESS, auditable: true }
   sql-exec:               { channels: SQL_EXEC }

pkg/cli/testdata/logflags

@@ -16,7 +16,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -55,7 +56,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -164,7 +166,8 @@ config: {<stdFileDefaults(/pathA/logs)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/pathA/logs,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -205,7 +208,8 @@ config: {<stdFileDefaults(/mypath)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/mypath,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -247,7 +251,8 @@ config: {<stdFileDefaults(/pathA/logs)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/pathA/logs,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -294,7 +299,8 @@ config: {<stdFileDefaults(/mypath)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/mypath,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -334,7 +340,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -375,7 +382,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -426,7 +434,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -500,7 +509,8 @@ config: {<stdFileDefaults(/mypath)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/mypath,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -542,7 +552,8 @@ config: {<stdFileDefaults(/pathA)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],/pathA,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -604,7 +615,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,
@@ -644,7 +656,8 @@ config: {<stdFileDefaults(<defaultLogDir>)>,
 <fluentDefaults>,
 <httpDefaults>,
 <otlpDefaults>,
-sinks: {file-groups: {default: <fileCfg(INFO: [DEV,
+sinks: {file-groups: {changefeed: <fileCfg(INFO: [CHANGEFEED],<defaultLogDir>,true,crdb-v2)>,
+default: <fileCfg(INFO: [DEV,
 OPS],
 WARNING: [HEALTH,
 STORAGE,

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

@@ -31,6 +31,8 @@ sinks:
       channels:
         INFO: [DEV, OPS]
         WARNING: all except [DEV, OPS]
+    changefeed:
+      channels: [CHANGEFEED]
     health:
       channels: [HEALTH]
     kv-distribution:
@@ -48,6 +50,8 @@ sinks:
       auditable: false
     sql-exec:
       channels: [SQL_EXEC]
+    sql-schema:
+      channels: [SQL_SCHEMA]
     sql-slow:
       channels: [SQL_PERF]
     sql-slow-internal-only: