Skip to content

Commit c99f3ee

Browse files
tstacktstack
committed
[scripts] remove btresolver
1 parent 6e897cf commit c99f3ee

7 files changed

Lines changed: 73 additions & 146 deletions

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ add_custom_command(
366366
list(APPEND GEN_SRCS builtin-scripts.h builtin-scripts.cc)
367367

368368
set(BUILTIN_SH_SCRIPTS
369-
scripts/com.vmware.btresolver.py
370369
scripts/dump-pid.sh
371370
scripts/pcap_log-converter.sh
372371
scripts/zookeeper.sql

‎src/root-config.json‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,6 @@
3030
"convert-zoned-to-local": true
3131
},
3232
"annotations": {
33-
"com.vmware.vmacore.backtrace": {
34-
"description": "Convert a vmacore backtrace into human-readable text",
35-
"condition": ":log_body LIKE '%[context]%[/context]%'",
36-
"handler": "com.vmware.btresolver.py"
37-
},
3833
"org.postgresql.statement-error": {
3934
"description": "statement error",
4035
"condition": ":log_level COLLATE loglevel >= 'error' AND :log_body LIKE '% at character %' AND :log_format IN ('postgres_log', 'vpostgres_log')",

‎src/scripts/com.vmware.btresolver.py‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎src/scripts/scripts.am‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ BUILTIN_LNAVSCRIPTS = \
2424
$()
2525

2626
BUILTIN_SHSCRIPTS = \
27-
$(srcdir)/scripts/com.vmware.btresolver.py \
2827
$(srcdir)/scripts/dump-pid.sh \
2928
$(srcdir)/scripts/otel_collector_log-converter.sh \
3029
$(srcdir)/scripts/pcap_log-converter.sh \

‎test/expected/Makefile.am‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,8 @@ dist_noinst_DATA = \
396396
test_demux.sh_7fe671a697d452ffc56a49ddb605538b23fe744e.out \
397397
test_demux.sh_ac2a283ce1a4a3d99b0a9de4e9b72bbd9637cf61.err \
398398
test_demux.sh_ac2a283ce1a4a3d99b0a9de4e9b72bbd9637cf61.out \
399+
test_demux.sh_af12fa086853bd5eb8967d8df7cf24fd0337b815.err \
400+
test_demux.sh_af12fa086853bd5eb8967d8df7cf24fd0337b815.out \
399401
test_demux.sh_b640a3b46494e680a84cf042514ed465e39d8f38.err \
400402
test_demux.sh_b640a3b46494e680a84cf042514ed465e39d8f38.out \
401403
test_demux.sh_babab3536a2fc7c2a99847fa355b50d40a51763d.err \

‎test/expected/test_cli.sh_0b3639753916f71254e8c9cce4ebb8bfd9978d3e.out‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9718,11 +9718,6 @@
97189718

97199719
},
97209720
"annotations": {
9721-
"com.vmware.vmacore.backtrace": {
9722-
"description": "Convert a vmacore backtrace into human-readable text",
9723-
"condition": ":log_body LIKE '%[context]%[/context]%'",
9724-
"handler": "com.vmware.btresolver.py"
9725-
},
97269721
"org.lnav.test": {
97279722
"description": "test annotation",
97289723
"condition": ":c_ip IS NOT NULL AND $TEST_ANNO = '1'",

‎test/expected/test_cli.sh_cc06341dd560f927512e92c7c0985ed8b25827ae.out‎

Lines changed: 71 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -14,85 +14,82 @@
1414
/global/keymap_def_text_view -> default-keymap.json:10
1515
/global/keymap_def_time_offset -> default-keymap.json:17
1616
/global/keymap_def_zoom -> default-keymap.json:12
17-
/log/annotations/com.vmware.vmacore.backtrace/condition -> root-config.json:35
18-
/log/annotations/com.vmware.vmacore.backtrace/description -> root-config.json:34
19-
/log/annotations/com.vmware.vmacore.backtrace/handler -> root-config.json:36
2017
/log/annotations/org.lnav.test/condition -> {test_dir}/configs/installed/anno-test.json:7
2118
/log/annotations/org.lnav.test/description -> {test_dir}/configs/installed/anno-test.json:6
2219
/log/annotations/org.lnav.test/handler -> {test_dir}/configs/installed/anno-test.json:8
23-
/log/annotations/org.postgresql.statement-error/condition -> root-config.json:40
24-
/log/annotations/org.postgresql.statement-error/description -> root-config.json:39
25-
/log/annotations/org.postgresql.statement-error/handler -> root-config.json:41
20+
/log/annotations/org.postgresql.statement-error/condition -> root-config.json:35
21+
/log/annotations/org.postgresql.statement-error/description -> root-config.json:34
22+
/log/annotations/org.postgresql.statement-error/handler -> root-config.json:36
2623
/log/date-time/convert-zoned-to-local -> root-config.json:30
27-
/log/demux-json/graylog/body -> root-config.json:62
28-
/log/demux-json/graylog/enabled -> root-config.json:59
29-
/log/demux-json/graylog/mux_id -> root-config.json:61
30-
/log/demux-json/graylog/timestamp -> root-config.json:60
31-
/log/demux/container-with-type/enabled -> root-config.json:53
32-
/log/demux/container-with-type/pattern -> root-config.json:54
33-
/log/demux/container/pattern -> root-config.json:46
34-
/log/demux/recv-with-pod/control-pattern -> root-config.json:49
35-
/log/demux/recv-with-pod/pattern -> root-config.json:50
36-
/tuning/archive-manager/cache-ttl -> root-config.json:69
37-
/tuning/archive-manager/min-free-space -> root-config.json:68
38-
/tuning/clipboard/impls/MacOS/find/read -> root-config.json:97
39-
/tuning/clipboard/impls/MacOS/find/write -> root-config.json:96
40-
/tuning/clipboard/impls/MacOS/general/read -> root-config.json:93
41-
/tuning/clipboard/impls/MacOS/general/write -> root-config.json:92
42-
/tuning/clipboard/impls/MacOS/test -> root-config.json:90
43-
/tuning/clipboard/impls/NeoVim/general/read -> root-config.json:125
44-
/tuning/clipboard/impls/NeoVim/general/write -> root-config.json:124
45-
/tuning/clipboard/impls/NeoVim/test -> root-config.json:122
46-
/tuning/clipboard/impls/Wayland/general/read -> root-config.json:104
47-
/tuning/clipboard/impls/Wayland/general/write -> root-config.json:103
48-
/tuning/clipboard/impls/Wayland/test -> root-config.json:101
49-
/tuning/clipboard/impls/Windows/general/write -> root-config.json:131
50-
/tuning/clipboard/impls/Windows/test -> root-config.json:129
51-
/tuning/clipboard/impls/X11-xclip/general/read -> root-config.json:111
52-
/tuning/clipboard/impls/X11-xclip/general/write -> root-config.json:110
53-
/tuning/clipboard/impls/X11-xclip/test -> root-config.json:108
54-
/tuning/clipboard/impls/tmux/general/read -> root-config.json:118
55-
/tuning/clipboard/impls/tmux/general/write -> root-config.json:117
56-
/tuning/clipboard/impls/tmux/test -> root-config.json:115
57-
/tuning/external-editor/impls/CLion/command -> root-config.json:159
58-
/tuning/external-editor/impls/CLion/config-dir -> root-config.json:157
59-
/tuning/external-editor/impls/CLion/test -> root-config.json:158
60-
/tuning/external-editor/impls/IntelliJ/command -> root-config.json:154
61-
/tuning/external-editor/impls/IntelliJ/config-dir -> root-config.json:151
62-
/tuning/external-editor/impls/IntelliJ/prefers -> root-config.json:152
63-
/tuning/external-editor/impls/IntelliJ/test -> root-config.json:153
64-
/tuning/external-editor/impls/RustRover/command -> root-config.json:165
65-
/tuning/external-editor/impls/RustRover/config-dir -> root-config.json:162
66-
/tuning/external-editor/impls/RustRover/prefers -> root-config.json:163
67-
/tuning/external-editor/impls/RustRover/test -> root-config.json:164
68-
/tuning/external-editor/impls/VSCode.app/command -> root-config.json:175
69-
/tuning/external-editor/impls/VSCode.app/config-dir -> root-config.json:173
70-
/tuning/external-editor/impls/VSCode.app/test -> root-config.json:174
71-
/tuning/external-editor/impls/VSCode/command -> root-config.json:170
72-
/tuning/external-editor/impls/VSCode/config-dir -> root-config.json:168
73-
/tuning/external-editor/impls/VSCode/test -> root-config.json:169
74-
/tuning/external-editor/impls/zzz.MacOS/command -> root-config.json:179
75-
/tuning/external-editor/impls/zzz.MacOS/test -> root-config.json:178
76-
/tuning/external-opener/impls/MacOS/command -> root-config.json:140
77-
/tuning/external-opener/impls/MacOS/test -> root-config.json:139
78-
/tuning/external-opener/impls/XDG/command -> root-config.json:144
79-
/tuning/external-opener/impls/XDG/test -> root-config.json:143
80-
/tuning/piper/max-size -> root-config.json:83
81-
/tuning/piper/rotations -> root-config.json:84
82-
/tuning/piper/ttl -> root-config.json:85
83-
/tuning/remote/ssh/command -> root-config.json:73
84-
/tuning/remote/ssh/config/BatchMode -> root-config.json:75
85-
/tuning/remote/ssh/config/ConnectTimeout -> root-config.json:76
86-
/tuning/remote/ssh/start-command -> root-config.json:78
87-
/tuning/remote/ssh/transfer-command -> root-config.json:79
88-
/tuning/textfile/max-unformatted-line-length -> root-config.json:184
89-
/tuning/url-scheme/docker-compose/handler -> root-config.json:191
90-
/tuning/url-scheme/docker/handler -> root-config.json:188
24+
/log/demux-json/graylog/body -> root-config.json:57
25+
/log/demux-json/graylog/enabled -> root-config.json:54
26+
/log/demux-json/graylog/mux_id -> root-config.json:56
27+
/log/demux-json/graylog/timestamp -> root-config.json:55
28+
/log/demux/container-with-type/enabled -> root-config.json:48
29+
/log/demux/container-with-type/pattern -> root-config.json:49
30+
/log/demux/container/pattern -> root-config.json:41
31+
/log/demux/recv-with-pod/control-pattern -> root-config.json:44
32+
/log/demux/recv-with-pod/pattern -> root-config.json:45
33+
/tuning/archive-manager/cache-ttl -> root-config.json:64
34+
/tuning/archive-manager/min-free-space -> root-config.json:63
35+
/tuning/clipboard/impls/MacOS/find/read -> root-config.json:92
36+
/tuning/clipboard/impls/MacOS/find/write -> root-config.json:91
37+
/tuning/clipboard/impls/MacOS/general/read -> root-config.json:88
38+
/tuning/clipboard/impls/MacOS/general/write -> root-config.json:87
39+
/tuning/clipboard/impls/MacOS/test -> root-config.json:85
40+
/tuning/clipboard/impls/NeoVim/general/read -> root-config.json:120
41+
/tuning/clipboard/impls/NeoVim/general/write -> root-config.json:119
42+
/tuning/clipboard/impls/NeoVim/test -> root-config.json:117
43+
/tuning/clipboard/impls/Wayland/general/read -> root-config.json:99
44+
/tuning/clipboard/impls/Wayland/general/write -> root-config.json:98
45+
/tuning/clipboard/impls/Wayland/test -> root-config.json:96
46+
/tuning/clipboard/impls/Windows/general/write -> root-config.json:126
47+
/tuning/clipboard/impls/Windows/test -> root-config.json:124
48+
/tuning/clipboard/impls/X11-xclip/general/read -> root-config.json:106
49+
/tuning/clipboard/impls/X11-xclip/general/write -> root-config.json:105
50+
/tuning/clipboard/impls/X11-xclip/test -> root-config.json:103
51+
/tuning/clipboard/impls/tmux/general/read -> root-config.json:113
52+
/tuning/clipboard/impls/tmux/general/write -> root-config.json:112
53+
/tuning/clipboard/impls/tmux/test -> root-config.json:110
54+
/tuning/external-editor/impls/CLion/command -> root-config.json:154
55+
/tuning/external-editor/impls/CLion/config-dir -> root-config.json:152
56+
/tuning/external-editor/impls/CLion/test -> root-config.json:153
57+
/tuning/external-editor/impls/IntelliJ/command -> root-config.json:149
58+
/tuning/external-editor/impls/IntelliJ/config-dir -> root-config.json:146
59+
/tuning/external-editor/impls/IntelliJ/prefers -> root-config.json:147
60+
/tuning/external-editor/impls/IntelliJ/test -> root-config.json:148
61+
/tuning/external-editor/impls/RustRover/command -> root-config.json:160
62+
/tuning/external-editor/impls/RustRover/config-dir -> root-config.json:157
63+
/tuning/external-editor/impls/RustRover/prefers -> root-config.json:158
64+
/tuning/external-editor/impls/RustRover/test -> root-config.json:159
65+
/tuning/external-editor/impls/VSCode.app/command -> root-config.json:170
66+
/tuning/external-editor/impls/VSCode.app/config-dir -> root-config.json:168
67+
/tuning/external-editor/impls/VSCode.app/test -> root-config.json:169
68+
/tuning/external-editor/impls/VSCode/command -> root-config.json:165
69+
/tuning/external-editor/impls/VSCode/config-dir -> root-config.json:163
70+
/tuning/external-editor/impls/VSCode/test -> root-config.json:164
71+
/tuning/external-editor/impls/zzz.MacOS/command -> root-config.json:174
72+
/tuning/external-editor/impls/zzz.MacOS/test -> root-config.json:173
73+
/tuning/external-opener/impls/MacOS/command -> root-config.json:135
74+
/tuning/external-opener/impls/MacOS/test -> root-config.json:134
75+
/tuning/external-opener/impls/XDG/command -> root-config.json:139
76+
/tuning/external-opener/impls/XDG/test -> root-config.json:138
77+
/tuning/piper/max-size -> root-config.json:78
78+
/tuning/piper/rotations -> root-config.json:79
79+
/tuning/piper/ttl -> root-config.json:80
80+
/tuning/remote/ssh/command -> root-config.json:68
81+
/tuning/remote/ssh/config/BatchMode -> root-config.json:70
82+
/tuning/remote/ssh/config/ConnectTimeout -> root-config.json:71
83+
/tuning/remote/ssh/start-command -> root-config.json:73
84+
/tuning/remote/ssh/transfer-command -> root-config.json:74
85+
/tuning/textfile/max-unformatted-line-length -> root-config.json:179
86+
/tuning/url-scheme/docker-compose/handler -> root-config.json:186
87+
/tuning/url-scheme/docker/handler -> root-config.json:183
9188
/tuning/url-scheme/hw/handler -> {test_dir}/configs/installed/hw-url-handler.json:6
92-
/tuning/url-scheme/journald/handler -> root-config.json:194
93-
/tuning/url-scheme/piper/handler -> root-config.json:197
94-
/tuning/url-scheme/podman/handler -> root-config.json:200
95-
/tuning/url-scheme/strace/handler -> root-config.json:203
89+
/tuning/url-scheme/journald/handler -> root-config.json:189
90+
/tuning/url-scheme/piper/handler -> root-config.json:192
91+
/tuning/url-scheme/podman/handler -> root-config.json:195
92+
/tuning/url-scheme/strace/handler -> root-config.json:198
9693
/ui/clock-format -> root-config.json:11
9794
/ui/default-colors -> root-config.json:13
9895
/ui/dim-text -> root-config.json:12

0 commit comments

Comments
 (0)