diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-07 04:48:35 +0000 |
| commit | 207df6fc406e81bfeebdff7f404bd242ff3f099f (patch) | |
| tree | a1a796b056909dd0a04ffec163db9363a8757808 /test/formats/jsontest | |
| parent | Releasing progress-linux version 0.11.2-1~progress7.99u1. (diff) | |
| download | lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.tar.xz lnav-207df6fc406e81bfeebdff7f404bd242ff3f099f.zip | |
Merging upstream version 0.12.2.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'test/formats/jsontest')
| -rw-r--r-- | test/formats/jsontest/format.json | 13 | ||||
| -rw-r--r-- | test/formats/jsontest/lnav-logstash.json | 56 | ||||
| -rw-r--r-- | test/formats/jsontest/rewrite-user.lnav | 3 |
3 files changed, 47 insertions, 25 deletions
diff --git a/test/formats/jsontest/format.json b/test/formats/jsontest/format.json index 333b8a9..63148ea 100644 --- a/test/formats/jsontest/format.json +++ b/test/formats/jsontest/format.json @@ -15,6 +15,15 @@ "field": "lvl", "auto-width": true }, + { + "field": "logger", + "prefix": " <", + "suffix": ">", + "min-width": 20, + "max-width": 20, + "overflow": "abbrev", + "default-value": "" + }, " ", { "field": "msg" @@ -33,6 +42,10 @@ "obj": { "kind": "json" }, + "logger": { + "kind": "string", + "identifier": true + }, "lvl": { "kind": "string", "hidden": true diff --git a/test/formats/jsontest/lnav-logstash.json b/test/formats/jsontest/lnav-logstash.json index 27f9239..b821168 100644 --- a/test/formats/jsontest/lnav-logstash.json +++ b/test/formats/jsontest/lnav-logstash.json @@ -7,40 +7,48 @@ "json": true, "hide-extra": false, "file-pattern": "\\.clog.*", - "multiline": false, "line-format": [ - { "field" : "@timestamp" }, + { + "field": "@timestamp" + }, " ", - { "field" : "ipaddress" }, + { + "field": "ipaddress" + }, " ", - { "field" : "message" }, + { + "field": "message" + }, " ", - { "field" : "stack_trace", "default-value" : "" } + { + "field": "stack_trace", + "default-value": "" + } ], - "timestamp-field" : "@timestamp", - "body-field" : "message", - "level-field" : "level", - "level" : { - "trace" : "TRACE", - "debug" : "DEBUG", - "info" : "INFO", - "error" : "ERROR", - "warning" : "WARN" + "timestamp-field": "@timestamp", + "body-field": "message", + "level-field": "level", + "level": { + "trace": "TRACE", + "debug": "DEBUG", + "info": "INFO", + "error": "ERROR", + "warning": "WARN" }, - "value" : { - "logger_name" : { - "kind" : "string", - "identifier" : true + "value": { + "logger_name": { + "kind": "string", + "identifier": true }, - "ipaddress" : { - "kind" : "string", - "identifier" : true + "ipaddress": { + "kind": "string", + "identifier": true }, - "level_value" : { + "level_value": { "hidden": true }, - "stack_trace" : { - "kind" : "string" + "stack_trace": { + "kind": "string" } } } diff --git a/test/formats/jsontest/rewrite-user.lnav b/test/formats/jsontest/rewrite-user.lnav index e34aa78..56ff500 100644 --- a/test/formats/jsontest/rewrite-user.lnav +++ b/test/formats/jsontest/rewrite-user.lnav @@ -1,2 +1,3 @@ -;SELECT 'mailto:' || :user +;SELECT 'mailto:' || :user AS mt +:echo $mt |