Compilation results for clouddumps1002.wikimedia.org: System changes detected

You can retrieve this result from host.json.

Catalog differences

Summary

Total Resources:	3735
Resources added:	0
Resources removed:	0
Resources modified:	4
Change percentage:	0.11%

Resources modified

File[/etc/rsyslog.d/30-output-kafka.conf]

Content differences:

--- /etc/rsyslog.d/30-output-kafka.conf.orig
+++ /etc/rsyslog.d/30-output-kafka.conf
@@ -58,7 +58,10 @@
         # Event Platform events carry a 'meta.stream' field. Produce these only to
         # the '<datacenter>.<meta.stream>' topic (T291645). Logstash consumes this
         # topic via an explicit kafka input rather than the 'rsyslog-*' pattern.
+        # We also need to unset the $!msg field here, which is left over from the
+        # failed mmjsonparse_kafka_raw parsing attempt.
         if ($!meta!stream != "") then {
+            unset $!msg;
             action(type="omkafka"
                    name="omkafka_event_platform"
                    broker=["kafka-logging1001.eqiad.wmnet:9093","kafka-logging1002.eqiad.wmnet:9093","kafka-logging1003.eqiad.wmnet:9093","kafka-logging1004.eqiad.wmnet:9093","kafka-logging1005.eqiad.wmnet:9093"]

Nginx::Site[xmldumps]

File[/etc/nginx/sites-available/xmldumps]

Content differences:

--- /etc/nginx/sites-available/xmldumps.orig
+++ /etc/nginx/sites-available/xmldumps
@@ -97,8 +97,10 @@
    # The 'dumps_http' tag wil match with an entry in /etc/rsyslog.lookup.d/lookup_table_output.json
    # so these logs will be sent to the kafka-logging cluster. nginx only permits
    # alphanumeric characters and underscores in the syslog tag, so we cannot use a hyphen.
+   # We also require the 'nohostname' option, otherwise the hostname is prepended to the message and
+   # this is where rsyslog expects to find the tag, or programname.
    access_log /var/log/nginx/access.log; # duplicate of the standard configuration in the http block.
-   access_log syslog:server=unix:/dev/log,facility=local7,tag=dumps_http,severity=info ecs_json;
+   access_log syslog:server=unix:/dev/log,nohostname,facility=local7,tag=dumps_http,severity=info ecs_json;
 
    add_header Server 'clouddumps1002.wikimedia.org' always;

Rsyslog::Conf[output_kafka]

Compilation results for clouddumps1002.wikimedia.org: System changes detected

Catalog differences

Summary

Resources modified

Relevant files