--- Class[Haproxykafka].orig
+++ Class[Haproxykafka]
@@
- config => {'workers': 2, 'message_buffer': 100.0, 'sdid': 'haproxykafka@0', 'hostname': 'cp2043.codfw.wmnet', 'socket': {'path': '/var/run/haproxykafka/haproxykafka.sock', 'mode': '0622', 'user': 'haproxykafka', 'group': 'haproxykafka', 'batch_size': 25000, 'batch_deadline': '500ms'}, 'logparser': {'batch_size': 102400, 'batch_deadline': '1000ms'}, 'kafka': {'topic': 'webrequest_frontend_text', 'dlq_topic': 'webrequest_errors', 'flush_timeout': 1000, 'batch_size': 102400, 'batch_deadline': '1000ms', 'rdkafka': {'acks': 'all', 'client.id': 'cp2043', 'security.protocol': 'SSL', 'ssl.ca.location': '/etc/ssl/certs/wmf-ca-certificates.crt', 'ssl.cipher.suites': 'ECDHE-ECDSA-AES256-GCM-SHA384', 'ssl.curves.list': 'P-256', 'ssl.sigalgs.list': 'ECDSA+SHA256', 'queue.buffering.max.messages': 720000, 'queue.buffering.max.ms': 1000, 'batch.num.messages': 9000, 'compression.codec': 'snappy', 'topic.request.required.acks': 1, 'bootstrap.servers': 'kafka-jumbo1010.eqiad.wmnet:9093,kafka-jumbo1011.eqiad.wmnet:9093,kafka-jumbo1012.eqiad.wmnet:9093,kafka-jumbo1013.eqiad.wmnet:9093,kafka-jumbo1014.eqiad.wmnet:9093,kafka-jumbo1015.eqiad.wmnet:9093,kafka-jumbo1016.eqiad.wmnet:9093,kafka-jumbo1017.eqiad.wmnet:9093,kafka-jumbo1018.eqiad.wmnet:9093', 'ssl.key.location': '/etc/haproxykafka/ssl/kafka__haproxykafka_kafka_11-key.pem', 'ssl.certificate.location': '/etc/haproxykafka/ssl/kafka__haproxykafka_kafka_11.chained.pem'}}, 'monitoring': {'enable_pprof': True, 'enable_prometheus': True, 'server_bind': ':9341', 'prometheus_prefix': 'haproxykafka_', 'prometheus_parsing_buckets': [5e-06, 1e-05, 5e-05, 0.0001, 0.0005, 0.001, 0.005], 'prometheus_processing_buckets': [1e-06, 5e-06, 1e-05, 2e-05, 3e-05, 5e-05, 0.0001, 0.0005, 0.001]}, 'transform_rules': {'haproxy_format': '02/Jan/2006:15:04:05.000', 'date_format': '2006-01-02T15:04:05Z', 'date_tz': 'UTC'}}
+ config => {'workers': 2, 'message_buffer': 100.0, 'sdid': 'haproxykafka@0', 'hostname': 'cp2043.codfw.wmnet', 'socket': {'path': '/var/run/haproxykafka/haproxykafka.sock', 'mode': '0622', 'user': 'haproxykafka', 'group': 'haproxykafka', 'batch_size': 25000, 'batch_deadline': '500ms'}, 'logparser': {'batch_size': 102400, 'batch_deadline': '1000ms'}, 'kafka': {'topic': 'webrequest_frontend_text', 'dlq_topic': 'webrequest_errors', 'flush_timeout': 1000, 'batch_size': 102400, 'batch_deadline': '1000ms', 'rdkafka': {'acks': 'all', 'client.id': 'cp2043', 'security.protocol': 'SSL', 'ssl.ca.location': '/etc/ssl/certs/wmf-ca-certificates.crt', 'ssl.cipher.suites': 'ECDHE-ECDSA-AES256-GCM-SHA384', 'ssl.curves.list': 'P-256', 'ssl.sigalgs.list': 'ECDSA+SHA256', 'queue.buffering.max.messages': 720000, 'queue.buffering.max.ms': 1000, 'batch.num.messages': 9000, 'compression.codec': 'snappy', 'topic.request.required.acks': 1, 'bootstrap.servers': 'kafka-jumbo1010.eqiad.wmnet:9093,kafka-jumbo1011.eqiad.wmnet:9093,kafka-jumbo1012.eqiad.wmnet:9093,kafka-jumbo1013.eqiad.wmnet:9093,kafka-jumbo1014.eqiad.wmnet:9093,kafka-jumbo1015.eqiad.wmnet:9093,kafka-jumbo1016.eqiad.wmnet:9093,kafka-jumbo1017.eqiad.wmnet:9093,kafka-jumbo1018.eqiad.wmnet:9093', 'ssl.key.location': '/etc/haproxykafka/ssl/kafka__haproxykafka-key.pem', 'ssl.certificate.location': '/etc/haproxykafka/ssl/kafka__haproxykafka.chained.pem'}}, 'monitoring': {'enable_pprof': True, 'enable_prometheus': True, 'server_bind': ':9341', 'prometheus_prefix': 'haproxykafka_', 'prometheus_parsing_buckets': [5e-06, 1e-05, 5e-05, 0.0001, 0.0005, 0.001, 0.005], 'prometheus_processing_buckets': [1e-06, 5e-06, 1e-05, 2e-05, 3e-05, 5e-05, 0.0001, 0.0005, 0.001]}, 'transform_rules': {'haproxy_format': '02/Jan/2006:15:04:05.000', 'date_format': '2006-01-02T15:04:05Z', 'date_tz': 'UTC'}}
File[/etc/varnishkafka/statsv.conf]
- Content differences:
--- /etc/varnishkafka/statsv.conf.orig
+++ /etc/varnishkafka/statsv.conf
@@ -252,8 +252,8 @@
#
kafka.security.protocol=SSL
kafka.ssl.ca.location=/etc/ssl/certs/wmf-ca-certificates.crt
-kafka.ssl.key.location=/etc/varnishkafka/ssl/kafka__varnishkafka_kafka_11-key.pem
-kafka.ssl.certificate.location=/etc/varnishkafka/ssl/kafka__varnishkafka_kafka_11.chained.pem
+kafka.ssl.key.location=/etc/varnishkafka/ssl/kafka__varnishkafka-key.pem
+kafka.ssl.certificate.location=/etc/varnishkafka/ssl/kafka__varnishkafka.chained.pem
kafka.ssl.cipher.suites=ECDHE-ECDSA-AES256-GCM-SHA384
kafka.ssl.curves.list=P-256
kafka.ssl.sigalgs.list=ECDSA+SHA256
Varnishkafka::Instance[statsv]
- Parameters differences:
--- Varnishkafka::Instance[statsv].orig
+++ Varnishkafka::Instance[statsv]
@@
- ssl_key_location => /etc/varnishkafka/ssl/kafka__varnishkafka_kafka_11-key.pem
+ ssl_key_location => /etc/varnishkafka/ssl/kafka__varnishkafka-key.pem
@@
- ssl_certificate_location => /etc/varnishkafka/ssl/kafka__varnishkafka_kafka_11.chained.pem
+ ssl_certificate_location => /etc/varnishkafka/ssl/kafka__varnishkafka.chained.pem
- File[/etc/haproxykafka/config.yaml]
- Content differences:
--- /etc/haproxykafka/config.yaml.orig
+++ /etc/haproxykafka/config.yaml
@@ -33,8 +33,8 @@
compression.codec: snappy
topic.request.required.acks: 1
bootstrap.servers: kafka-jumbo1010.eqiad.wmnet:9093,kafka-jumbo1011.eqiad.wmnet:9093,kafka-jumbo1012.eqiad.wmnet:9093,kafka-jumbo1013.eqiad.wmnet:9093,kafka-jumbo1014.eqiad.wmnet:9093,kafka-jumbo1015.eqiad.wmnet:9093,kafka-jumbo1016.eqiad.wmnet:9093,kafka-jumbo1017.eqiad.wmnet:9093,kafka-jumbo1018.eqiad.wmnet:9093
- ssl.key.location: "/etc/haproxykafka/ssl/kafka__haproxykafka_kafka_11-key.pem"
- ssl.certificate.location: "/etc/haproxykafka/ssl/kafka__haproxykafka_kafka_11.chained.pem"
+ ssl.key.location: "/etc/haproxykafka/ssl/kafka__haproxykafka-key.pem"
+ ssl.certificate.location: "/etc/haproxykafka/ssl/kafka__haproxykafka.chained.pem"
monitoring:
enable_pprof: true
enable_prometheus: true
Relevant files