From 30c8beeb2e199347fc6bae763fbc2ae393dfba08 Mon Sep 17 00:00:00 2001 From: Tim Stack Date: Tue, 30 Apr 2024 23:47:03 -0700 Subject: [PATCH] [demux] add a demuxer for container with type --- src/root-config.json | 3 + ...3639753916f71254e8c9cce4ebb8bfd9978d3e.out | 3 + ...06341dd560f927512e92c7c0985ed8b25827ae.out | 69 ++++++++++--------- 3 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/root-config.json b/src/root-config.json index c7918fe2..bf6cd618 100644 --- a/src/root-config.json +++ b/src/root-config.json @@ -30,6 +30,9 @@ }, "recv-with-pod": { "pattern": "^(?\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[+\\-]\\d{2}:\\d{2})) source=[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]* (?.*) kubernetes_host=(?[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]*) kubernetes_pod_name=(?[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]*)" + }, + "container-with-type": { + "pattern": "^(?[a-zA-Z][\\w\\-]{3,}) (?[a-zA-Z][\\w\\-]{3,}) (?.*)" } } }, diff --git a/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out b/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out index 95c25953..472bf4df 100644 --- a/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out +++ b/test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out @@ -5246,6 +5246,9 @@ "container": { "pattern": "^(?:\\x1b\\[\\d*K)?(?[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]*)\\s+\\| (?\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}.\\d{9}Z )?(?.*)" }, + "container-with-type": { + "pattern": "^(?[a-zA-Z][\\w\\-]{3,}) (?[a-zA-Z][\\w\\-]{3,}) (?.*)" + }, "recv-with-pod": { "pattern": "^(?\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}(?:Z|[+\\-]\\d{2}:\\d{2})) source=[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]* (?.*) kubernetes_host=(?[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]*) kubernetes_pod_name=(?[a-zA-Z0-9][a-zA-Z0-9_\\.\\-]*)" } diff --git a/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out b/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out index d0fcb1ff..dda8e7bb 100644 --- a/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out +++ b/test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out @@ -19,43 +19,44 @@ /log/annotations/org.lnav.test/description -> {test_dir}/configs/installed/anno-test.json:6 /log/annotations/org.lnav.test/handler -> {test_dir}/configs/installed/anno-test.json:8 /log/date-time/convert-zoned-to-local -> root-config.json:18 +/log/demux/container-with-type/pattern -> root-config.json:35 /log/demux/container/pattern -> root-config.json:29 /log/demux/recv-with-pod/pattern -> root-config.json:32 -/tuning/archive-manager/cache-ttl -> root-config.json:39 -/tuning/archive-manager/min-free-space -> root-config.json:38 -/tuning/clipboard/impls/MacOS/find/read -> root-config.json:67 -/tuning/clipboard/impls/MacOS/find/write -> root-config.json:66 -/tuning/clipboard/impls/MacOS/general/read -> root-config.json:63 -/tuning/clipboard/impls/MacOS/general/write -> root-config.json:62 -/tuning/clipboard/impls/MacOS/test -> root-config.json:60 -/tuning/clipboard/impls/NeoVim/general/read -> root-config.json:95 -/tuning/clipboard/impls/NeoVim/general/write -> root-config.json:94 -/tuning/clipboard/impls/NeoVim/test -> root-config.json:92 -/tuning/clipboard/impls/Wayland/general/read -> root-config.json:74 -/tuning/clipboard/impls/Wayland/general/write -> root-config.json:73 -/tuning/clipboard/impls/Wayland/test -> root-config.json:71 -/tuning/clipboard/impls/Windows/general/write -> root-config.json:101 -/tuning/clipboard/impls/Windows/test -> root-config.json:99 -/tuning/clipboard/impls/X11-xclip/general/read -> root-config.json:81 -/tuning/clipboard/impls/X11-xclip/general/write -> root-config.json:80 -/tuning/clipboard/impls/X11-xclip/test -> root-config.json:78 -/tuning/clipboard/impls/tmux/general/read -> root-config.json:88 -/tuning/clipboard/impls/tmux/general/write -> root-config.json:87 -/tuning/clipboard/impls/tmux/test -> root-config.json:85 -/tuning/piper/max-size -> root-config.json:53 -/tuning/piper/rotations -> root-config.json:54 -/tuning/piper/ttl -> root-config.json:55 -/tuning/remote/ssh/command -> root-config.json:43 -/tuning/remote/ssh/config/BatchMode -> root-config.json:45 -/tuning/remote/ssh/config/ConnectTimeout -> root-config.json:46 -/tuning/remote/ssh/start-command -> root-config.json:48 -/tuning/remote/ssh/transfer-command -> root-config.json:49 -/tuning/url-scheme/docker-compose/handler -> root-config.json:111 -/tuning/url-scheme/docker/handler -> root-config.json:108 +/tuning/archive-manager/cache-ttl -> root-config.json:42 +/tuning/archive-manager/min-free-space -> root-config.json:41 +/tuning/clipboard/impls/MacOS/find/read -> root-config.json:70 +/tuning/clipboard/impls/MacOS/find/write -> root-config.json:69 +/tuning/clipboard/impls/MacOS/general/read -> root-config.json:66 +/tuning/clipboard/impls/MacOS/general/write -> root-config.json:65 +/tuning/clipboard/impls/MacOS/test -> root-config.json:63 +/tuning/clipboard/impls/NeoVim/general/read -> root-config.json:98 +/tuning/clipboard/impls/NeoVim/general/write -> root-config.json:97 +/tuning/clipboard/impls/NeoVim/test -> root-config.json:95 +/tuning/clipboard/impls/Wayland/general/read -> root-config.json:77 +/tuning/clipboard/impls/Wayland/general/write -> root-config.json:76 +/tuning/clipboard/impls/Wayland/test -> root-config.json:74 +/tuning/clipboard/impls/Windows/general/write -> root-config.json:104 +/tuning/clipboard/impls/Windows/test -> root-config.json:102 +/tuning/clipboard/impls/X11-xclip/general/read -> root-config.json:84 +/tuning/clipboard/impls/X11-xclip/general/write -> root-config.json:83 +/tuning/clipboard/impls/X11-xclip/test -> root-config.json:81 +/tuning/clipboard/impls/tmux/general/read -> root-config.json:91 +/tuning/clipboard/impls/tmux/general/write -> root-config.json:90 +/tuning/clipboard/impls/tmux/test -> root-config.json:88 +/tuning/piper/max-size -> root-config.json:56 +/tuning/piper/rotations -> root-config.json:57 +/tuning/piper/ttl -> root-config.json:58 +/tuning/remote/ssh/command -> root-config.json:46 +/tuning/remote/ssh/config/BatchMode -> root-config.json:48 +/tuning/remote/ssh/config/ConnectTimeout -> root-config.json:49 +/tuning/remote/ssh/start-command -> root-config.json:51 +/tuning/remote/ssh/transfer-command -> root-config.json:52 +/tuning/url-scheme/docker-compose/handler -> root-config.json:114 +/tuning/url-scheme/docker/handler -> root-config.json:111 /tuning/url-scheme/hw/handler -> {test_dir}/configs/installed/hw-url-handler.json:6 -/tuning/url-scheme/journald/handler -> root-config.json:114 -/tuning/url-scheme/piper/handler -> root-config.json:117 -/tuning/url-scheme/podman/handler -> root-config.json:120 +/tuning/url-scheme/journald/handler -> root-config.json:117 +/tuning/url-scheme/piper/handler -> root-config.json:120 +/tuning/url-scheme/podman/handler -> root-config.json:123 /ui/clock-format -> root-config.json:4 /ui/default-colors -> root-config.json:6 /ui/dim-text -> root-config.json:5