Commit 518c44c
committed
fix(logs): recognize the IOS timestamp options Cisco documents
Cisco documents the IOS header as
seq no:timestamp: %facility-severity-MNEMONIC:description
where everything before the '%' varies with "service timestamps log
[datetime|uptime] [msec] [localtime] [show-timezone]". Three of those options
produced a header the parser could not read.
show-timezone appends the zone name directly after the seconds, which lands in
the TAG position:
<187>Mar 1 18:46:11 UTC: %LINK-3-UPDOWN: Interface Serial0 up
That parsed without error and set APP-NAME to "UTC", so every device sharing a
timezone would route under a service named after it -- a misattribution with
nothing to signal it, which is the failure this package is most concerned with.
Absorb the zone into the TIMESTAMP instead. The test is narrow on purpose: two
to five uppercase letters, terminated by a colon, and only when a Cisco
mnemonic follows. Without that last condition a short uppercase TAG such as
"GW: session opened" would be swallowed.
msec appends fractional seconds, which is the shape Cisco's own Embedded
Syslog Manager guide prints ("Mar 18 14:52:10.039:%LINK-5-CHANGED: ..."). The
timestamp matched only its 15-byte prefix, leaving the parse to fail on the
'.'; the message survived, since the wrapper always transmits the raw line, but
it lost its sub-second precision, was flagged as a parse error, and had any
CEF or LEEF payload inside it discarded. Accept the fraction on all four BSD
layouts, as isoTimestampLen already did on the ISO ones.
Cisco defines a leading '*' as meaning the clock never synchronized to a
reliable source. Step over it so the header behind it parses. The marker is not
kept in the TIMESTAMP, where it would defeat any downstream time parse; it
stays visible in the content, which is transmitted verbatim.
Uptime timestamps ("00:00:46:", "1w2d:") are deliberately left alone. They are
time since reboot rather than wall clock, so there is nothing to extract and
passing the line to MSG is already correct.
benchstat over eight runs: geomean +0.01%, allocations unchanged. Parse_BSD
alone shows +4.7% that I could not attribute -- ParseBSDLine exercises nearly
the same path at +0.8% -- and it is likely code layout.1 parent 461135d commit 518c44c
2 files changed
Lines changed: 277 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
218 | 223 | | |
219 | 224 | | |
220 | 225 | | |
| |||
444 | 449 | | |
445 | 450 | | |
446 | 451 | | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
447 | 464 | | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
448 | 475 | | |
449 | 476 | | |
450 | 477 | | |
| |||
787 | 814 | | |
788 | 815 | | |
789 | 816 | | |
| 817 | + | |
790 | 818 | | |
791 | | - | |
792 | | - | |
| 819 | + | |
| 820 | + | |
793 | 821 | | |
| 822 | + | |
| 823 | + | |
| 824 | + | |
| 825 | + | |
| 826 | + | |
| 827 | + | |
| 828 | + | |
| 829 | + | |
| 830 | + | |
| 831 | + | |
| 832 | + | |
| 833 | + | |
| 834 | + | |
| 835 | + | |
| 836 | + | |
| 837 | + | |
| 838 | + | |
| 839 | + | |
| 840 | + | |
| 841 | + | |
| 842 | + | |
| 843 | + | |
| 844 | + | |
| 845 | + | |
| 846 | + | |
| 847 | + | |
| 848 | + | |
| 849 | + | |
| 850 | + | |
| 851 | + | |
| 852 | + | |
| 853 | + | |
| 854 | + | |
794 | 855 | | |
795 | 856 | | |
796 | | - | |
| 857 | + | |
| 858 | + | |
| 859 | + | |
| 860 | + | |
| 861 | + | |
| 862 | + | |
| 863 | + | |
| 864 | + | |
| 865 | + | |
| 866 | + | |
| 867 | + | |
| 868 | + | |
| 869 | + | |
| 870 | + | |
| 871 | + | |
| 872 | + | |
| 873 | + | |
| 874 | + | |
| 875 | + | |
| 876 | + | |
| 877 | + | |
| 878 | + | |
| 879 | + | |
| 880 | + | |
| 881 | + | |
| 882 | + | |
| 883 | + | |
797 | 884 | | |
798 | 885 | | |
799 | | - | |
800 | | - | |
801 | | - | |
802 | | - | |
803 | | - | |
804 | | - | |
805 | | - | |
806 | | - | |
807 | | - | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
| 889 | + | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
| 900 | + | |
808 | 901 | | |
809 | 902 | | |
810 | 903 | | |
| |||
Lines changed: 172 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
210 | 210 | | |
211 | 211 | | |
212 | 212 | | |
| 213 | + | |
| 214 | + | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
| 234 | + | |
| 235 | + | |
| 236 | + | |
| 237 | + | |
| 238 | + | |
| 239 | + | |
| 240 | + | |
| 241 | + | |
| 242 | + | |
| 243 | + | |
| 244 | + | |
| 245 | + | |
| 246 | + | |
| 247 | + | |
| 248 | + | |
| 249 | + | |
| 250 | + | |
| 251 | + | |
| 252 | + | |
| 253 | + | |
| 254 | + | |
| 255 | + | |
| 256 | + | |
| 257 | + | |
| 258 | + | |
| 259 | + | |
| 260 | + | |
| 261 | + | |
| 262 | + | |
| 263 | + | |
| 264 | + | |
| 265 | + | |
| 266 | + | |
| 267 | + | |
| 268 | + | |
| 269 | + | |
| 270 | + | |
| 271 | + | |
| 272 | + | |
213 | 273 | | |
214 | 274 | | |
215 | 275 | | |
| |||
231 | 291 | | |
232 | 292 | | |
233 | 293 | | |
| 294 | + | |
| 295 | + | |
| 296 | + | |
| 297 | + | |
| 298 | + | |
| 299 | + | |
| 300 | + | |
| 301 | + | |
| 302 | + | |
| 303 | + | |
| 304 | + | |
| 305 | + | |
| 306 | + | |
| 307 | + | |
| 308 | + | |
| 309 | + | |
| 310 | + | |
| 311 | + | |
| 312 | + | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
| 322 | + | |
| 323 | + | |
| 324 | + | |
| 325 | + | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + | |
| 351 | + | |
| 352 | + | |
| 353 | + | |
| 354 | + | |
| 355 | + | |
| 356 | + | |
| 357 | + | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
| 362 | + | |
| 363 | + | |
| 364 | + | |
| 365 | + | |
| 366 | + | |
| 367 | + | |
| 368 | + | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
234 | 375 | | |
235 | 376 | | |
236 | 377 | | |
| |||
519 | 660 | | |
520 | 661 | | |
521 | 662 | | |
| 663 | + | |
| 664 | + | |
| 665 | + | |
| 666 | + | |
| 667 | + | |
| 668 | + | |
| 669 | + | |
| 670 | + | |
| 671 | + | |
522 | 672 | | |
523 | 673 | | |
524 | 674 | | |
525 | 675 | | |
526 | 676 | | |
| 677 | + | |
| 678 | + | |
| 679 | + | |
| 680 | + | |
| 681 | + | |
| 682 | + | |
| 683 | + | |
| 684 | + | |
| 685 | + | |
| 686 | + | |
| 687 | + | |
| 688 | + | |
| 689 | + | |
| 690 | + | |
| 691 | + | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
0 commit comments