Skip to content

Sync conflict applying upstream commit 84a9bd44 #554

@github-actions

Description

@github-actions

⚠️ A conflict occurred while applying upstream commit 84a9bd448d7de7c35f1ab06333da115d89c82f02.

The changes are blocking the sync and must be resolved before continuing.

Cookbooks involved: fb_syslog

Conflict Details

### cookbooks/fb_syslog/templates/default/rsyslog.conf.erb

# rsyslog v5 configuration file

# This rsyslog.conf was generated by Chef. To make changes, see
# fb_syslog/README.md

# For more information see /usr/share/doc/rsyslog-*/rsyslog_conf.html
# If you experience problems, see http://www.rsyslog.com/doc/troubleshoot.html

# Use FQDN for hostname field
$PreserveFQDN on

#### MODULES ####
# Provides support for local system logging (e.g. via logger command)
module(load="imuxsock")
<% if node.centos? && !node.centos6? -%>
$OmitLocalLogging off
<% end -%>
# Provides kernel logging support (previously done by rklogd)
<% if node['fb_syslog']['enable_imklog_permitnonkernelfacility'] -%>
module(load="imklog" permitnonkernelfacility="on")
<% else %>
module(load="imklog")
<% end -%>
<% if node['fb_syslog']['rsyslog_use_omprog'] -%>
# Provides logging to external programs.
module(load="omprog")
<% end -%>
<% if node['fb_syslog']['rsyslog_server'] -%>
# UDP / TCP reception
module(load="imtcp")
<<<<<<< HEAD
input(type="imtcp" port="514")
module(load="imudp")
input(type="imudp" port="514")
=======
module(load="imudp")
<% unless node['fb_syslog']['rsyslog_server_force_no_listen'] %>
input(type="imtcp" port="514")
input(type="imudp" port="514")
<% end %>
>>>>>>> 84a9bd44 (lint fb_syslog; delete uncontrolled files (#208))

<% if node['fb_syslog']['rsyslog_server_address'] -%>
$UDPServerAddress <%= node['fb_syslog']['rsyslog_server_address'] %>
<% end -%>

<%   non_ruleset_ports = node['fb_syslog']['rsyslog_nonruleset_ports'].to_hash %>
<%   non_ruleset_ports.each do |proto, ports| -%>
<%     if proto == 'udp' -%>
<%       ports.each do |port| -%>
$UDPServerRun <%= port %>
<%       end -%>
<%     elsif proto == 'tcp' -%>
<%       ports.each do |port| -%>
$InputTCPServerRun <%= port %>
<%       end -%>
<%     end -%>
<%   end -%>
<% end -%>
<% if node['fb_syslog']['rsyslog_stats_logging'] -%>
# Provides periodic output of rsyslog internal counters
module(load="impstats" severity="7" resetCounters="on")
## Stats logging
syslog.=debug  /var/log/rsyslog-stats.log
<% end -%>

#### GLOBAL DIRECTIVES ####

# Use default timestamp format
$ActionFileDefaultTemplate RSYSLOG_TraditionalFileFormat

<% if node['fb_syslog']['rsyslog_escape_cchars'] -%>
# Escape non-printable control characters in messages entering syslog
$EscapeControlCharactersOnReceive on
<% end -%>
<% unless node['fb_syslog']['rsyslog_additional_sockets'].empty? %>
# Additional sockets
$InputUnixListenSocketCreatePath on
<%   node['fb_syslog']['rsyslog_additional_sockets'].each do |sock| %>
$AddUnixListenSocket <%= sock %>
<%   end %>

<% end %>
# File syncing capability is disabled by default. This feature is usually not required,
# not useful and an extreme performance hit
#$ActionFileEnableSync on

<% unless node['fb_syslog']['rsyslog_early_lines'].empty? %>
<%   node['fb_syslog']['rsyslog_early_lines'].each do |line| %>
<%=    line %>
<%   end %>

<% end %>
<% if node['fb_syslog']['include_rsyslog_d_config'] -%>
# Include all configuration files in /etc/rsyslog.d/
$IncludeConfig /etc/rsyslog.d/*.conf

<% end -%>
<% node['fb_syslog']['syslog-entries'].to_hash.each_value do |entry| -%>

... (truncated)

Action required: Please resolve the conflicts and push the changes.

Metadata

Metadata

Assignees

No one assigned

    Labels

    Type

    No type

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions