diff options
| author | Viacheslav Hletenko <v.gletenko@vyos.io> | 2026-06-23 17:44:36 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-23 17:44:36 +0300 |
| commit | 4e74f21299c77a35115a61908a2c84e390e1f0d1 (patch) | |
| tree | 08674007fdcc1eb2ca43c7bdba4efdc36965c21b | |
| parent | 94f4ac3e938ac8aa11f2e4375ae3e9bd01963e8b (diff) | |
| parent | b133a93a0f9c0ac103cfdb96b71d61dd9df0912f (diff) | |
| download | vyos-1x-4e74f21299c77a35115a61908a2c84e390e1f0d1.tar.gz vyos-1x-4e74f21299c77a35115a61908a2c84e390e1f0d1.zip | |
Merge pull request #5288 from c-po/mon-log-level
T9009: op-mode: extend "monitor log" with filter level
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | op-mode-definitions/monitor-log.xml.in | 13 |
2 files changed, 11 insertions, 4 deletions
diff --git a/debian/control b/debian/control index ac05c06c4..6984e93d6 100644 --- a/debian/control +++ b/debian/control @@ -121,8 +121,6 @@ Depends: tuned, beep, wide-dhcpv6-client, -# Generic colorizer - grc, # The package "whois" contains both a whois database client # that end users can find useful, # and the "mkpasswd" utility we use for generating hashed passwords diff --git a/op-mode-definitions/monitor-log.xml.in b/op-mode-definitions/monitor-log.xml.in index fe9fa0051..7bf4fc907 100644 --- a/op-mode-definitions/monitor-log.xml.in +++ b/op-mode-definitions/monitor-log.xml.in @@ -9,13 +9,13 @@ <properties> <help>Monitor last lines of messages file</help> </properties> - <command>bash -c 'SYSTEMD_COLORS=false journalctl --no-hostname --follow --boot'</command> + <command>SYSTEMD_COLORS=false journalctl --no-hostname --follow --boot</command> <children> <node name="color"> <properties> <help>Output log in a colored fashion</help> </properties> - <command>bash -c 'SYSTEMD_COLORS=false grc journalctl --no-hostname --follow --boot'</command> + <command>SYSTEMD_COLORS=true journalctl --no-hostname --follow --boot</command> </node> <leafNode name="certbot"> <properties> @@ -111,6 +111,15 @@ </node> </children> </node> + <tagNode name="level"> + <properties> + <help>Monitor log and filter messages by minimum priority level (includes all higher severities)</help> + <completionHelp> + <list>emerg alert crit err warning notice info debug</list> + </completionHelp> + </properties> + <command>SYSTEMD_COLORS=false journalctl --no-hostname --follow --boot -p $4</command> + </tagNode> <leafNode name="flow-accounting"> <properties> <help>Monitor last lines of flow-accounting log</help> |