diff options
| author | Nicolas Fort <nicolasfort1988@gmail.com> | 2022-05-11 16:41:21 +0000 | 
|---|---|---|
| committer | Nicolas Fort <nicolasfort1988@gmail.com> | 2022-05-11 16:41:21 +0000 | 
| commit | 1ca645d1a499441abb74c549e7e1fbd03087097d (patch) | |
| tree | 9057243e8ff6c3450b7b91496672732c117d3b57 /interface-definitions | |
| parent | 432fd1b5e7b5a1e5b8503bf0dcd106369e323dc7 (diff) | |
| download | vyos-1x-1ca645d1a499441abb74c549e7e1fbd03087097d.tar.gz vyos-1x-1ca645d1a499441abb74c549e7e1fbd03087097d.zip | |
Firewall: T3907: add log-level options in firewall
Diffstat (limited to 'interface-definitions')
3 files changed, 86 insertions, 22 deletions
| diff --git a/interface-definitions/include/firewall/common-rule.xml.i b/interface-definitions/include/firewall/common-rule.xml.i index 2a5137dbf..0b8838872 100644 --- a/interface-definitions/include/firewall/common-rule.xml.i +++ b/interface-definitions/include/firewall/common-rule.xml.i @@ -76,25 +76,7 @@      </leafNode>    </children>  </node> -<leafNode name="log"> -  <properties> -    <help>Option to log packets matching rule</help> -    <completionHelp> -      <list>enable disable</list> -    </completionHelp> -    <valueHelp> -      <format>enable</format> -      <description>Enable log</description> -    </valueHelp> -    <valueHelp> -      <format>disable</format> -      <description>Disable log</description> -    </valueHelp> -    <constraint> -      <regex>(enable|disable)</regex> -    </constraint> -  </properties> -</leafNode> +#include <include/firewall/rule-log-level.xml.i>  <node name="connection-status">    <properties>      <help>Connection status</help> diff --git a/interface-definitions/include/firewall/name-default-log.xml.i b/interface-definitions/include/firewall/name-default-log.xml.i index 979395146..c3f6f0171 100644 --- a/interface-definitions/include/firewall/name-default-log.xml.i +++ b/interface-definitions/include/firewall/name-default-log.xml.i @@ -1,8 +1,45 @@  <!-- include start from firewall/name-default-log.xml.i -->  <leafNode name="enable-default-log">    <properties> -    <help>Option to log packets hitting default-action</help> -    <valueless/> +    <help>Option to log packets matching default-action</help> +    <completionHelp> +      <list>emerg alert crit err warn notice info debug</list> +    </completionHelp> +    <valueHelp> +      <format>emerg</format> +      <description>Emerg log level</description> +    </valueHelp> +    <valueHelp> +      <format>alert</format> +      <description>Alert log level</description> +    </valueHelp> +    <valueHelp> +      <format>crit</format> +      <description>Critical log level</description> +    </valueHelp> +    <valueHelp> +      <format>err</format> +      <description>Error log level</description> +    </valueHelp> +    <valueHelp> +      <format>warn</format> +      <description>Warning log level</description> +    </valueHelp> +    <valueHelp> +      <format>notice</format> +      <description>Notice log level</description> +    </valueHelp> +    <valueHelp> +      <format>info</format> +      <description>Info log level</description> +    </valueHelp> +    <valueHelp> +      <format>debug</format> +      <description>Debug log level</description> +    </valueHelp> +    <constraint> +      <regex>(emerg|alert|crit|err|warn|notice|info|debug)</regex> +    </constraint>    </properties>  </leafNode> -<!-- include end --> +<!-- include end -->
\ No newline at end of file diff --git a/interface-definitions/include/firewall/rule-log-level.xml.i b/interface-definitions/include/firewall/rule-log-level.xml.i new file mode 100644 index 000000000..4842b73ca --- /dev/null +++ b/interface-definitions/include/firewall/rule-log-level.xml.i @@ -0,0 +1,45 @@ +<!-- include start from firewall/common-rule.xml.i --> +<leafNode name="log"> +  <properties> +    <help>Option to log packets matching rule</help> +    <completionHelp> +      <list>emerg alert crit err warn notice info debug</list> +    </completionHelp> +    <valueHelp> +      <format>emerg</format> +      <description>Emerg log level</description> +    </valueHelp> +    <valueHelp> +      <format>alert</format> +      <description>Alert log level</description> +    </valueHelp> +    <valueHelp> +      <format>crit</format> +      <description>Critical log level</description> +    </valueHelp> +    <valueHelp> +      <format>err</format> +      <description>Error log level</description> +    </valueHelp> +    <valueHelp> +      <format>warn</format> +      <description>Warning log level</description> +    </valueHelp> +    <valueHelp> +      <format>notice</format> +      <description>Notice log level</description> +    </valueHelp> +    <valueHelp> +      <format>info</format> +      <description>Info log level</description> +    </valueHelp> +    <valueHelp> +      <format>debug</format> +      <description>Debug log level</description> +    </valueHelp> +    <constraint> +      <regex>(emerg|alert|crit|err|warn|notice|info|debug)</regex> +    </constraint> +  </properties> +</leafNode> +<!-- include end -->
\ No newline at end of file | 
