Skip to content

fix: Fix conditional/code path for vendor_product_by_source parsing #2457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adri8n wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: Fix conditional/code path for vendor_product_by_source parsing #2457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8524395
Fix conditional/code path for vendor_product_by_source parsing
adri8n May 12, 2024
74e0236
Merge branch 'main' into parser-vendorProductBySource
mstopa-splunk Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions package/etc/conf.d/sources/source_syslog/plugin.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,12 +221,13 @@ source s_{{ port_id }} {
rewrite {
set('$(lowercase "$HOST")' value(HOST));
};
{%- if not vendor or not product %}
{%- if use_vpscache == True %}
{%- if ( (not vendor or not product) and
(use_vpscache == True) ) %}
if {
parser(p_vpst_cache);
};
{%- endif %}
{%- if vendor and product %}
if {
parser(vendor_product_by_source);
};
Expand Down Expand Up @@ -428,12 +429,13 @@ source s_{{ port_id }} {
rewrite {
set('$(lowercase "$HOST")' value(HOST));
};
{%- if not vendor or not product %}
{%- if use_vpscache == True %}
{%- if ( (not vendor or not product) and
(use_vpscache == True) ) %}
if {
parser(p_vpst_cache);
};
{%- endif %}
{%- if vendor and product %}
if {
parser(vendor_product_by_source);
};
Expand Down Expand Up @@ -481,4 +483,4 @@ source s_{{ port_id }} {
};
};
{%- endif %}
};
};