Skip to content
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.

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

ncm-syslogng: Fix wrapping and indentation in pan #1781

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Changes from all commits
Commits
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
21 changes: 12 additions & 9 deletions ncm-syslogng/src/main/pan/components/syslogng/schema.pan
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,15 @@ declaration template components/syslogng/schema;
include 'quattor/schema';

# Convenience definitions
type filterstring = string with
exists("/software/components/syslogng/filters/" + SELF) || error("No filters with name " + SELF);
type srcstring = string with
exists ("/software/components/syslogng/sources/" + SELF) || error ("No sources with name " + SELF);
type dststring = string with
exists ("/software/components/syslogng/destinations/" + SELF) || error ("No destinations with name " + SELF);
type filterstring = string with exists("/software/components/syslogng/filters/" + SELF) || error(
"No filters with name '%s'", SELF,
);
type srcstring = string with exists("/software/components/syslogng/sources/" + SELF) || error(
"No sources with name '%s'", SELF,
);
type dststring = string with exists("/software/components/syslogng/destinations/" + SELF) || error(
"No destinations with name '%s'", SELF,
);

type prioritystring = string with match (SELF, "^(emerg|alert|crit|err|warning|notice|info|debug)$");

Expand Down Expand Up @@ -77,7 +80,7 @@ type structure_syslogng_network_dest = {
include structure_syslogng_sock_dest
"localip" ? type_ip
"localport" ? long
# "destport" : long = 514
# "destport" : long = 514
"spoof_source" ? boolean
"ip_ttl" ? long
"ip_tos" ? long
Expand Down Expand Up @@ -219,7 +222,7 @@ type structure_syslogng_options = {
"time_reopen" : long = 60
"time_reap" : long = 60
"time_sleep" : long = 0
# "marq_freq" : long = 1200
# "marq_freq" : long = 1200
"stats_freq" : long = 600
"log_fifo_size" : long = 100
"chain_hostnames" : boolean = true
Expand All @@ -238,7 +241,7 @@ type structure_syslogng_options = {
"dns_cache" : boolean = true
"dns_cache_size" : long = 1007
"dns_cache_expire" : long = 3600
# "dns_cache_expire_time_failed" : long = 60
# "dns_cache_expire_time_failed" : long = 60
"dns_cache_hosts" ? string
"log_msg_size" : long = 8192
"use_fqdn" : boolean = false
Expand Down
Loading