Elukey has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370659 )
Change subject: role::cache::kafka::webrequest: force Kafka protocol to 0.9.0.1 ...................................................................... role::cache::kafka::webrequest: force Kafka protocol to 0.9.0.1 Also adds missing documentation in statsv/eventlogging roles. Bug: T172681 Change-Id: Id50fc9d0bbd5c161fb2fec0fc77fd6bf23362e7f --- M modules/role/manifests/cache/kafka/eventlogging.pp M modules/role/manifests/cache/kafka/statsv.pp M modules/role/manifests/cache/kafka/webrequest.pp 3 files changed, 13 insertions(+), 2 deletions(-) Approvals: Elukey: Verified; Looks good to me, approved diff --git a/modules/role/manifests/cache/kafka/eventlogging.pp b/modules/role/manifests/cache/kafka/eventlogging.pp index fbd2a00..937df62 100644 --- a/modules/role/manifests/cache/kafka/eventlogging.pp +++ b/modules/role/manifests/cache/kafka/eventlogging.pp @@ -13,6 +13,9 @@ # [*varnish_svc_name*] # The name of the init unit for the above. # Default 'varnish-frontend' +# [*kafka_protocol_version*] +# Kafka API version to use, needed for brokers < 0.10 +# https://issues.apache.org/jira/browse/KAFKA-3547 # class role::cache::kafka::eventlogging( $varnish_name = 'frontend', diff --git a/modules/role/manifests/cache/kafka/statsv.pp b/modules/role/manifests/cache/kafka/statsv.pp index 6843229..5552c60 100644 --- a/modules/role/manifests/cache/kafka/statsv.pp +++ b/modules/role/manifests/cache/kafka/statsv.pp @@ -13,6 +13,9 @@ # [*varnish_svc_name*] # The name of the init unit for the above. # Default 'varnish-frontend' +# [*kafka_protocol_version*] +# Kafka API version to use, needed for brokers < 0.10 +# https://issues.apache.org/jira/browse/KAFKA-3547 # class role::cache::kafka::statsv( $varnish_name = 'frontend', diff --git a/modules/role/manifests/cache/kafka/webrequest.pp b/modules/role/manifests/cache/kafka/webrequest.pp index a446d7b..6af96f7 100644 --- a/modules/role/manifests/cache/kafka/webrequest.pp +++ b/modules/role/manifests/cache/kafka/webrequest.pp @@ -13,11 +13,15 @@ # [*varnish_svc_name*] # The name of the init unit for the above. # Default 'varnish-frontend' +# [*kafka_protocol_version*] +# Kafka API version to use, needed for brokers < 0.10 +# https://issues.apache.org/jira/browse/KAFKA-3547 # class role::cache::kafka::webrequest( $topic, - $varnish_name = 'frontend', - $varnish_svc_name = 'varnish-frontend' + $varnish_name = 'frontend', + $varnish_svc_name = 'varnish-frontend', + $kafka_protocol_version = '0.9.0.1', ) inherits role::cache::kafka { # Background task: T136314 @@ -113,6 +117,7 @@ # stats will be fresh when polled from gmetad. log_statistics_interval => 15, conf_template => $conf_template, + force_protocol_version => $kafka_protocol_version, } include ::standard -- To view, visit https://gerrit.wikimedia.org/r/370659 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id50fc9d0bbd5c161fb2fec0fc77fd6bf23362e7f Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: BBlack <bbl...@wikimedia.org> Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org> Gerrit-Reviewer: Ema <e...@wikimedia.org> Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org> Gerrit-Reviewer: Ottomata <ao...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
