Filippo Giunchedi has submitted this change and it was merged. Change subject: Emit resource_change events from RESTBase. ......................................................................
Emit resource_change events from RESTBase. Set up eventlogging-service configuration for RESTBase to enable resource_change in production Bug: T126571 Change-Id: I3388d446e48bb9c9441b30b1f436c308fe1c9b43 --- M hieradata/labs/deployment-prep/common.yaml M modules/restbase/manifests/init.pp M modules/restbase/templates/config.labs.yaml.erb M modules/restbase/templates/config.yaml.erb 4 files changed, 12 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/hieradata/labs/deployment-prep/common.yaml b/hieradata/labs/deployment-prep/common.yaml index dadcf2c..f3969f9 100644 --- a/hieradata/labs/deployment-prep/common.yaml +++ b/hieradata/labs/deployment-prep/common.yaml @@ -114,6 +114,7 @@ restbase::mathoid_uri: http://deployment-mathoid.deployment-prep.eqiad.wmflabs:10042 restbase::aqs_uri: https://wikimedia.org/api/rest_v1/metrics restbase::purge_host: deployment-cache-text04.deployment-prep.eqiad.wmflabs +restbase::eventlogging_service_uri: http://deployment-eventlogging04.deployment-prep.eqiad.wmflabs:8085/v1/events "mediawiki::log_aggregator": deployment-fluorine.eqiad.wmflabs:8420 "mediawiki::forward_syslog": deployment-logstash2.deployment-prep.eqiad.wmflabs:10514 mediawiki_memcached_servers: diff --git a/modules/restbase/manifests/init.pp b/modules/restbase/manifests/init.pp index 3542fe4..093c4ee 100644 --- a/modules/restbase/manifests/init.pp +++ b/modules/restbase/manifests/init.pp @@ -75,6 +75,9 @@ # [*purge_port*] # The port the vhtcp daemon listens to. Default: 4827 # +# [*eventlogging_service_uri*] +# Eventlogging service URI. Default: http://eventbus.svc.eqiad.wmnet:8085/v1/events +# # [*monitor_domain*] # The domain to monitor during the service's operation. # Default: en.wikipedia.org @@ -105,6 +108,8 @@ 'http://aqs.svc.eqiad.wmnet:7232/analytics.wikimedia.org/v1', $purge_host = '239.128.0.112', $purge_port = 4827, + $eventlogging_service_uri = + 'http://eventbus.svc.eqiad.wmnet:8085/v1/events', $monitor_domain = 'en.wikipedia.org', ) { diff --git a/modules/restbase/templates/config.labs.yaml.erb b/modules/restbase/templates/config.labs.yaml.erb index 09c1ea7..ff071b1 100644 --- a/modules/restbase/templates/config.labs.yaml.erb +++ b/modules/restbase/templates/config.labs.yaml.erb @@ -36,6 +36,9 @@ purge: host: <%= @purge_host %> port: <%= @purge_port %> + eventlogging_service: + uri: <%= @eventlogging_service_uri %> + topic: resource_change related: cache_control: s-maxage=86400, max-age=86400 # Cache headers for purged end points. diff --git a/modules/restbase/templates/config.yaml.erb b/modules/restbase/templates/config.yaml.erb index 39129eb..3577051 100644 --- a/modules/restbase/templates/config.yaml.erb +++ b/modules/restbase/templates/config.yaml.erb @@ -59,6 +59,9 @@ purge: host: <%= @purge_host %> port: <%= @purge_port %> + eventlogging_service: + uri: <%= @eventlogging_service_uri %> + topic: resource_change related: cache_control: s-maxage=86400, max-age=3600 # Cache headers for purged end points. -- To view, visit https://gerrit.wikimedia.org/r/281740 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3388d446e48bb9c9441b30b1f436c308fe1c9b43 Gerrit-PatchSet: 4 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ppchelko <[email protected]> Gerrit-Reviewer: Filippo Giunchedi <[email protected]> Gerrit-Reviewer: GWicke <[email protected]> Gerrit-Reviewer: Mobrovac <[email protected]> Gerrit-Reviewer: Ottomata <[email protected]> Gerrit-Reviewer: Ppchelko <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
