diff options
| author | opswill <will@nixops.org> | 2025-06-17 23:02:07 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-17 17:02:07 +0200 |
| commit | 5ae3924234f9ffaa2ffda7e9fc52c2b3518a85e2 (patch) | |
| tree | 9b29119041ad674eece28e789fdd52e1836ace33 /interface-definitions | |
| parent | 8f0d339cbb5a4ae78785def134685c13ae27219e (diff) | |
| download | vyos-1x-5ae3924234f9ffaa2ffda7e9fc52c2b3518a85e2.tar.gz vyos-1x-5ae3924234f9ffaa2ffda7e9fc52c2b3518a85e2.zip | |
container: T7473: fix show/monitor container log failed when log-driver is journald
Diffstat (limited to 'interface-definitions')
| -rw-r--r-- | interface-definitions/container.xml.in | 43 | ||||
| -rw-r--r-- | interface-definitions/include/version/container-version.xml.i | 2 |
2 files changed, 25 insertions, 20 deletions
diff --git a/interface-definitions/container.xml.in b/interface-definitions/container.xml.in index 434bf7528..f20fd7690 100644 --- a/interface-definitions/container.xml.in +++ b/interface-definitions/container.xml.in @@ -532,6 +532,30 @@ </leafNode> </children> </tagNode> + <leafNode name="log-driver"> + <properties> + <help>Configure container log driver</help> + <completionHelp> + <list>k8s-file journald none</list> + </completionHelp> + <valueHelp> + <format>k8s-file</format> + <description>Logs to plain-text file</description> + </valueHelp> + <valueHelp> + <format>journald</format> + <description>Logs to systemd's journal</description> + </valueHelp> + <valueHelp> + <format>none</format> + <description>Disable logging for the container</description> + </valueHelp> + <constraint> + <regex>(k8s-file|journald|none)</regex> + </constraint> + </properties> + <defaultValue>journald</defaultValue> + </leafNode> </children> </tagNode> <tagNode name="network"> @@ -627,25 +651,6 @@ </node> </children> </tagNode> - <leafNode name="log-driver"> - <properties> - <help>Configure container log driver</help> - <completionHelp> - <list>k8s-file journald</list> - </completionHelp> - <valueHelp> - <format>k8s-file</format> - <description>Logs to plain-text json file</description> - </valueHelp> - <valueHelp> - <format>journald</format> - <description>Logs to systemd's journal</description> - </valueHelp> - <constraint> - <regex>(k8s-file|journald)</regex> - </constraint> - </properties> - </leafNode> </children> </node> </interfaceDefinition> diff --git a/interface-definitions/include/version/container-version.xml.i b/interface-definitions/include/version/container-version.xml.i index ed6e942cd..046bacfdc 100644 --- a/interface-definitions/include/version/container-version.xml.i +++ b/interface-definitions/include/version/container-version.xml.i @@ -1,3 +1,3 @@ <!-- include start from include/version/container-version.xml.i --> -<syntaxVersion component='container' version='2'></syntaxVersion> +<syntaxVersion component='container' version='3'></syntaxVersion> <!-- include end --> |