Ottomata has submitted this change and it was merged. Change subject: Specify kafkatee::input parameters manually, resource defaults wasn't working ......................................................................
Specify kafkatee::input parameters manually, resource defaults wasn't working Change-Id: I7bcb9fdc425c9b734671a21bc42b3b58ec0507ba --- M manifests/role/logging.pp 1 file changed, 20 insertions(+), 8 deletions(-) Approvals: Ottomata: Looks good to me, approved jenkins-bot: Verified diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp index cf55234..2ebde8d 100644 --- a/manifests/role/logging.pp +++ b/manifests/role/logging.pp @@ -315,30 +315,42 @@ } include kafkatee::monitoring - # Set defaults for all webrequest kafkatee inputs - Kafktee::Input { - partitions => '0-11', - options => { 'encoding' => 'json' }, - offset => 'stored', - } - # TODO: Do we need all topics for ops debugging of webrequest logs? - # include all webrequest topics + # Include all webrequest topics as inputs. + # Note: we used offset => 'end' rather than 'stored' + # because we don't need to backfill these files from + # buffered kafka data if kafkatee goes down. + # These are just logs for ops debugging. kafkatee::input { 'kafka-webrequest_bits': topic => 'webrequest_bits', + partitions => '0-11', + options => { 'encoding' => 'json' }, + offset => 'end', } kafkatee::input { 'kafka-webrequest_misc': topic => 'webrequest_misc', + partitions => '0-11', + options => { 'encoding' => 'json' }, + offset => 'end', } 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', } kafkatee::input { 'kafka-webrequest_upload': topic => 'webrequest_upload', + partitions => '0-11', + options => { 'encoding' => 'json' }, + offset => 'end', } # Declare packaged rsyslog config to ensure it isn't purged. -- To view, visit https://gerrit.wikimedia.org/r/207795 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7bcb9fdc425c9b734671a21bc42b3b58ec0507ba Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: Ottomata <o...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits