Jstenval has uploaded a new change for review. https://gerrit.wikimedia.org/r/282466
Change subject: Simplification of Cassandra Logstash filtering ...................................................................... Simplification of Cassandra Logstash filtering Implementing additivity in logback.xml configuration. and at the same time removing dependency jar files added in T128787. Bug:T130861 Change-Id: I5bc55904e707cc914106e56d0d4c3cbb80484e8f --- M modules/cassandra/manifests/logging.pp M modules/cassandra/templates/logback.xml.erb 2 files changed, 9 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/282466/1 diff --git a/modules/cassandra/manifests/logging.pp b/modules/cassandra/manifests/logging.pp index 574690b..d5c4925 100644 --- a/modules/cassandra/manifests/logging.pp +++ b/modules/cassandra/manifests/logging.pp @@ -39,15 +39,10 @@ require => Package['cassandra/logstash-logback-encoder'], } - file { '/usr/share/cassandra/lib/commons-compiler-2.7.8.jar': - ensure => 'link', - target => '/srv/deployment/cassandra/logstash-logback-encoder/lib/commons-compiler-2.7.8.jar', - require => Package['cassandra/logstash-logback-encoder'], - } - - file { '/usr/share/cassandra/lib/janino-2.7.8.jar': - ensure => 'link', - target => '/srv/deployment/cassandra/logstash-logback-encoder/lib/janino-2.7.8.jar', - require => Package['cassandra/logstash-logback-encoder'], + # removes unnecessary dependencies, deprecates T128787; the following code can be removed once it's run on each node + # note! the source dependency jar files needs to be removed from somewhere (maybe trebuchet?? I don't know where) + $useless = ['/usr/share/cassandra/lib/commons-compiler-2.7.8.jar', '/usr/share/cassandra/lib/janino-2.7.8.jar'] + file { $useless: + ensure => 'absent', } } diff --git a/modules/cassandra/templates/logback.xml.erb b/modules/cassandra/templates/logback.xml.erb index 7d89169..4862814 100644 --- a/modules/cassandra/templates/logback.xml.erb +++ b/modules/cassandra/templates/logback.xml.erb @@ -51,13 +51,6 @@ <host><%= @logstash_host %></host> <port><%= @logstash_port %></port> <customFields>{"program":"cassandra", "cluster":"<%= @cluster_name %>"}</customFields> - <filter class="ch.qos.logback.core.filter.EvaluatorFilter"> - <evaluator> - <expression>return logger.equals("org.apache.cassandra.utils.StatusLogger");</expression> - </evaluator> - <OnMismatch>NEUTRAL</OnMismatch> - <OnMatch>DENY</OnMatch> - </filter> </appender> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> @@ -79,5 +72,9 @@ <appender-ref ref="UDP" /> </root> + <logger name="org.apache.cassandra.utils.StatusLogger" additivity="false"> + <appender-ref ref="STDOUT"/> + <appender-ref ref="FILE" /> + </logger> <logger name="com.thinkaurelius.thrift" level="ERROR"/> </configuration> -- To view, visit https://gerrit.wikimedia.org/r/282466 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bc55904e707cc914106e56d0d4c3cbb80484e8f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Jstenval <jan.stenv...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits