Ppchelko has uploaded a new change for review. https://gerrit.wikimedia.org/r/295576
Change subject: Change-Prop: Added rules for ORES cache updates ...................................................................... Change-Prop: Added rules for ORES cache updates Change-Id: I30b5f0e1bac559c946a6538fddd708a9941feb12 --- M modules/changeprop/manifests/init.pp M modules/changeprop/templates/config.yaml.erb 2 files changed, 120 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/76/295576/1 diff --git a/modules/changeprop/manifests/init.pp b/modules/changeprop/manifests/init.pp index 5ec01d2..0d02fe1 100644 --- a/modules/changeprop/manifests/init.pp +++ b/modules/changeprop/manifests/init.pp @@ -13,6 +13,9 @@ # [*purge_host*] # The vhtcpd daemon host to send purge requests to. Default: 239.128.0.112 # +# [*ores_host*] +# The host where ORES service is running. Default: ores.svc.eqiad.wmnet +# # [*purge_port*] # The port the vhtcp daemon listens to. Default: 4827 # @@ -20,11 +23,13 @@ # The maximum number of tasks the service can execute at any given point in # time. Default: 30 # + class changeprop( $zk_uri, $purge_host = '239.128.0.112', + $ores_host = 'ores.svc.eqiad.wmnet', $purge_port = 4827, - $concurrency = 50, + $concurrency = 50 ) { include ::service::configuration diff --git a/modules/changeprop/templates/config.yaml.erb b/modules/changeprop/templates/config.yaml.erb index 2c2a202..c34e8f59 100644 --- a/modules/changeprop/templates/config.yaml.erb +++ b/modules/changeprop/templates/config.yaml.erb @@ -215,3 +215,117 @@ # cache-control: no-cache # query: # redirect: false + + # ORES caching updates + ores_cache: + topic: mediawiki.revision_create + cases: + - match: + meta: + domain: ar.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/arwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: en.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/enwiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/enwiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/enwiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: es.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/eswiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: et.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/etwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: fa.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/fawiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/fawiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/fawiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: fr.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/frwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: he.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/hewiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: hu.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/huwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: id.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/idwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: it.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/itwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: nl.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/nlwiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/nlwiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/nlwiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: pl.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/plwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: pt.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/ptwiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/ptwiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/ptwiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: test.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/testwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: ru.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/ruwiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/ruwiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/ruwiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: tr.wikipedia.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/trwiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/trwiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/trwiki/goodfaith/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: uk.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/ukwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: vi.wikipedia.org + exec: + uri: 'http://<%= @ores_host %>/v2/scores/viwiki/reverted/{{message.rev_id}}/?precache=true' + - match: + meta: + domain: wikidata.org + exec: + - uri: 'http://<%= @ores_host %>/v2/scores/wikidatawiki/damaging/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/wikidatawiki/reverted/{{message.rev_id}}/?precache=true' + - uri: 'http://<%= @ores_host %>/v2/scores/wikidatawiki/goodfaith/{{message.rev_id}}/?precache=true' \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/295576 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I30b5f0e1bac559c946a6538fddd708a9941feb12 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ppchelko <ppche...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits