From ca2baffbfc14fba077c7c70d849c02b9c69c9e1f Mon Sep 17 00:00:00 2001 From: Noriko Hosoi Date: Fri, 16 Oct 2020 11:08:00 -0700 Subject: [PATCH 6/7] Replacing prop_op with property_op and prop_value with property_value. (cherry picked from commit 1c951e6acef886548029151dbca9d002f20ef425) --- README.md | 20 +++++++++---------- roles/rsyslog/templates/output_files.j2 | 2 +- roles/rsyslog/templates/output_forwards.j2 | 2 +- .../rsyslog/templates/output_remote_files.j2 | 2 +- tests/tests_basics_files2.yml | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 4352ee7..d94ec04 100644 --- a/README.md +++ b/README.md @@ -184,8 +184,8 @@ This is a schematic logging configuration to show log messages from input_nameA - `severity`: Severity in selector; default to `*`. - `exclude`: Exclude list used in selector; default to none. - `property`: Property in property-based filter; no default - - `prop_op`: Operation in property-based filter; In case of not `!`, put the `prop_op` value in quotes; default to `contains` - - `prop_value`: Value in property-based filter; default to `error` + - `property_op`: Operation in property-based filter; In case of not `!`, put the `property_op` value in quotes; default to `contains` + - `property_value`: Value in property-based filter; default to `error` - `path`: Path to the output file. Selector options and property-based filter options are exclusive. If Property-based filter options are defined, selector options will be ignored. @@ -208,8 +208,8 @@ This is a schematic logging configuration to show log messages from input_nameA - `severity`: Severity in selector; default to `*`. - `exclude`: Exclude list used in selector; default to none. - `property`: Property in property-based filter; no default - - `prop_op`: Operation in property-based filter; In case of not `!`, put the `prop_op` value in quotes; default to `contains` - - `prop_value`: Value in property-based filter; default to `error` + - `property_op`: Operation in property-based filter; In case of not `!`, put the `property_op` value in quotes; default to `contains` + - `property_value`: Value in property-based filter; default to `error` - `target`: Target host (fqdn). **Required**. - `udp_port`: UDP port number. Default to `514`. - `tcp_port`: TCP port number. Default to `514`. @@ -225,8 +225,8 @@ This is a schematic logging configuration to show log messages from input_nameA - `severity`: Severity in selector; default to `*`. - `exclude`: Exclude list used in selector; default to none. - `property`: Property in property-based filter; no default - - `prop_op`: Operation in property-based filter; In case of not `!`, put the `prop_op` value in quotes; default to `contains` - - `prop_value`: Value in property-based filter; default to `error` + - `property_op`: Operation in property-based filter; In case of not `!`, put the `property_op` value in quotes; default to `contains` + - `property_value`: Value in property-based filter; default to `error` - `async_writing`: If set to `true`, the files are written asynchronously. Allowed value is `true` or `false`. Default to `false`. - `client_count`: Count of client logging system supported this rsyslog server. Default to `10`. - `io_buffer_size`: Buffer size used to write output data. Default to `65536` bytes. @@ -481,14 +481,14 @@ The following playbook generates the same logging configuration files. - name: files_output0 type: files property: msg - prop_op: contains - prop_value: error + property_op: contains + property_value: error path: /var/log/errors.log - name: files_output1 type: files property: msg - prop_op: "!contains" - prop_value: error + property_op: "!contains" + property_value: error path: /var/log/others.log logging_flows: - name: flow0 diff --git a/roles/rsyslog/templates/output_files.j2 b/roles/rsyslog/templates/output_files.j2 index e15e4cd..40f5b90 100644 --- a/roles/rsyslog/templates/output_files.j2 +++ b/roles/rsyslog/templates/output_files.j2 @@ -1,7 +1,7 @@ {% if item.path is defined %} ruleset(name="{{ item.name }}") { {% if item.property | d() %} - :{{ item.property }}, {{ item.prop_op | d('contains') }}, "{{ item.prop_value | d('error') }}" {{ item.path }} + :{{ item.property }}, {{ item.property_op | d('contains') }}, "{{ item.property_value | d('error') }}" {{ item.path }} {% elif item.exclude | d([]) %} {{ item.facility | d('*') }}.{{ item.severity | d('*') }};{{ item.exclude | join(';') }} {{ item.path }} {% else %} diff --git a/roles/rsyslog/templates/output_forwards.j2 b/roles/rsyslog/templates/output_forwards.j2 index 35030b4..87d7a09 100644 --- a/roles/rsyslog/templates/output_forwards.j2 +++ b/roles/rsyslog/templates/output_forwards.j2 @@ -10,7 +10,7 @@ {% endif %} ruleset(name="{{ item.name }}") { {% if item.property | d() %} - :{{ item.property }}, {{ item.prop_op | d('contains') }}, "{{ item.prop_value | d('error') }}" action(name="{{ item.name }}" + :{{ item.property }}, {{ item.property_op | d('contains') }}, "{{ item.property_value | d('error') }}" action(name="{{ item.name }}" {% elif item.exclude | d([]) %} {{ item.facility | d('*') }}.{{ item.severity | d('*') }};{{ item.exclude | join(';') }} action(name="{{ item.name }}" {% else %} diff --git a/roles/rsyslog/templates/output_remote_files.j2 b/roles/rsyslog/templates/output_remote_files.j2 index aaf547e..84317f2 100644 --- a/roles/rsyslog/templates/output_remote_files.j2 +++ b/roles/rsyslog/templates/output_remote_files.j2 @@ -18,7 +18,7 @@ ruleset(name="{{ item.name }}" queue.workerThreads="{{ logging_server_threads }}") { # Store remote logs in separate logfiles {% if item.property | d() %} - :{{ item.property }}, {{ item.prop_op | d('contains') }}, "{{ item.prop_value | d('error') }}" action(name="{{ item.name }}" type="omfile" DynaFile="{{ item.name }}_template" DynaFileCacheSize="{{ item.client_count | d(10) }}" ioBufferSize="{{ item.io_buffer_size | d('65536') }}" asyncWriting="{{ 'on' if item.async_writing | d(false) | bool else 'off' }}") + :{{ item.property }}, {{ item.property_op | d('contains') }}, "{{ item.property_value | d('error') }}" action(name="{{ item.name }}" type="omfile" DynaFile="{{ item.name }}_template" DynaFileCacheSize="{{ item.client_count | d(10) }}" ioBufferSize="{{ item.io_buffer_size | d('65536') }}" asyncWriting="{{ 'on' if item.async_writing | d(false) | bool else 'off' }}") {% elif item.exclude | d([]) %} {{ item.facility | d('*') }}.{{ item.severity | d('*') }};{{ item.exclude | join(';') }} action(name="{{ item.name }}" type="omfile" DynaFile="{{ item.name }}_template" DynaFileCacheSize="{{ item.client_count | d(10) }}" ioBufferSize="{{ item.io_buffer_size | d('65536') }}" asyncWriting="{{ 'on' if item.async_writing | d(false) | bool else 'off' }}") {% else %} diff --git a/tests/tests_basics_files2.yml b/tests/tests_basics_files2.yml index b1a0f62..9f69ed5 100644 --- a/tests/tests_basics_files2.yml +++ b/tests/tests_basics_files2.yml @@ -52,14 +52,14 @@ - name: files_output3 type: files property: msg - prop_op: contains - prop_value: property_based_filter_test + property_op: contains + property_value: property_based_filter_test path: "{{ __prop_based_log0 }}" - name: files_output4 type: files property: msg - prop_op: "!contains" - prop_value: property_based_filter_test + property_op: "!contains" + property_value: property_based_filter_test path: "{{ __prop_based_log1 }}" logging_inputs: - name: basic_input -- 2.26.2