Ottomata has submitted this change and it was merged.
Change subject: Remove unused role::logging::kafkatee::webrequest::fundraising
class
......................................................................
Remove unused role::logging::kafkatee::webrequest::fundraising class
Change-Id: I62f8944d4095e69d21f9c030bd51c12c2d6bb4e6
---
M manifests/role/logging.pp
1 file changed, 0 insertions(+), 92 deletions(-)
Approvals:
Ottomata: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index 889e98f..40afca8 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -248,95 +248,3 @@
type => 'pipe',
}
}
-
-# This does not inherit from role::logging::kafkatee::webrequest
-# because we need to use a custom output format, and don't need
-# all webrequest sources.
-class role::logging::kafkatee::webrequest::fundraising {
- require role::analytics::kafka::config
-
- # The fundraising outputs use udp-filter
- require misc::udp2log::udp_filter
-
-
- # Install kafkatee configured to consume from
- # the Analytics Kafka cluster. The webrequest logs are
- # in json, so we output them in the format they are received.
- class { '::kafkatee':
- kafka_brokers =>
$role::analytics::kafka::config::brokers_array,
- # convert the json logs into the old udp2log tsv format.
- output_encoding => 'string',
- output_format => '%{hostname} %{sequence} %{dt}
%{time_firstbyte} %{ip} %{cache_status}/%{http_status}
%{response_size} %{http_method}
http://%{uri_host}%{uri_path}%{uri_query} - %{content_type}
%{referer} %{x_forwarded_for} %{user_agent} %{accept_language}
%{x_analytics}',
- }
- include kafkatee::monitoring
-
- # TODO: Do we need all topics for ops debugging of webrequest logs?
-
- # Fundraising logs only need mobile and text as inputs.
- # Setting offset to 'end' instead of 'stored', only
- # because that is how udp2log worked, and I don't want to
- # cause any weirdness with downstream consumers if an instance
- # starts up late and consumes older data.
- kafkatee::input { 'kafka-webrequest_mobile':
- topic => 'webrequest_mobile',
- partitions => '0-11',
- options => { 'encoding' => 'json' },
- offset => 'end',
- }
- kafkatee::input { 'kafka-webrequest_text':
- topic => 'webrequest_text',
- partitions => '0-11',
- options => { 'encoding' => 'json' },
- offset => 'end',
- }
-
- # Declare packaged rsyslog config to ensure it isn't purged.
- file { '/etc/rsyslog.d/75-kafkatee.conf':
- ensure => file,
- require => Class['::kafkatee'],
- }
-
- # Temporarly use a different log directory than udp2log, while we run
- # both kafkatee and udp2log side by side so that FR techs can
- # validate that we can use kafkatee instead of udp2log.
- $log_directory = '/a/log/fundraising-kafkatee'
- file { $log_directory:
- ensure => 'directory',
- owner => 'kafkatee',
- group => 'kafkatee',
- require => Class['::kafkatee'],
- }
-
- # if the logs in $log_directory should be rotated
- # then configure a logrotate.d script to do so.
- file { '/etc/logrotate.d/kafkatee-fundraising':
- mode => '0444',
- owner => 'root',
- group => 'root',
- content => template('kafkatee/logrotate_fundraising.erb'),
- }
-
-
- kafkatee::output { 'fundraising-landingpages':
- destination => "/usr/bin/udp-filter -F '\t' -d
wikimediafoundation.org,donate.wikimedia.org >>
${log_directory}/landingpages.tsv.log",
- type => 'pipe',
- }
-
- kafkatee::output { 'fundraising-bannerImpressions':
- destination => "/usr/bin/udp-filter -F '\t' -p
Special:RecordImpression >>
${log_directory}/bannerImpressions-sampled100.tsv.log",
- sample => 100,
- type => 'pipe',
- }
-
- kafkatee::output { 'fundraising-beaconImpressions':
- destination => "/usr/bin/udp-filter -F '\t' -p beacon/impression >>
${log_directory}/beaconImpressions-sampled100.tsv.log",
- sample => 100,
- type => 'pipe',
- }
-
- kafkatee::output { 'fundraising-bannerRequests':
- destination => "/usr/bin/udp-filter -F '\t' -p Special:BannerRandom >>
${log_directory}/bannerRequests-sampled100.tsv.log",
- sample => 100,
- type => 'pipe',
- }
-}
--
To view, visit https://gerrit.wikimedia.org/r/260082
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I62f8944d4095e69d21f9c030bd51c12c2d6bb4e6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
Gerrit-Reviewer: Jgreen <[email protected]>
Gerrit-Reviewer: Ottomata <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
