Mobrovac has submitted this change and it was merged.
Change subject: Update the config template
......................................................................
Update the config template
Change-Id: I57d8b452036c034505c6424c3c96cdcf3ad35307
---
M scap/templates/config.yaml.j2
M scap/vars.yaml
2 files changed, 20 insertions(+), 16 deletions(-)
Approvals:
Mobrovac: Verified; Looks good to me, approved
diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index e28ebd2..98bf122 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -1,20 +1,20 @@
# Number of worker processes to spawn.
# Set to 0 to run everything in a single process without clustering.
# Use 'ncpu' to run as many workers as there are CPU units
-num_workers: <%= num_workers %>
+num_workers: 2
# Log error messages and gracefully restart a worker if v8 reports that it
# uses more heap (note: not RSS) than this many mb.
-worker_heap_limit_mb: <%= worker_heap_limit_mb %>
+worker_heap_limit_mb: 500
# The maximum interval in ms that can pass between two beat messages
# sent by each worker to the master before it is killed
-worker_heartbeat_timeout: <%= worker_heartbeat_timeout %>
+worker_heartbeat_timeout: 7500
# Logger info
logging:
level: warn
- name: <%= log_name %>
+ name: trending-edits
streams:
- host: <%= logstash_host %>
port: <%= logstash_port %>
@@ -25,13 +25,13 @@
# Statsd metrics reporter
metrics:
- name: <%= metrics_name %>
+ name: trending-edits
host: <%= metrics_host %>
port: <%= metrics_port %>
type: statsd
services:
- - name: <%= name %>
+ - name: trending-edits
# a relative path or the name of an npm package, if different from name
module: ./src/app.js
# per-service config
@@ -42,7 +42,7 @@
# the location of the spec, defaults to spec.yaml if not specified
# spec: ./spec.template.yaml
# allow cross-domain requests to the API (default '*')
- cors: '*'
+ # cors: '*'
# to disable use:
# cors: false
# to restrict to a particular domain, use:
@@ -50,7 +50,7 @@
# content for the CSP headers
# csp: false # uncomment this line to disable sending them
# URL of the outbound proxy to use (complete with protocol)
- proxy: <%= proxy if proxy else '' %>
+ # proxy: <%= proxy if proxy else '' %>
# the list of domains for which not to use the proxy defined above
# no_proxy_list:
# - domain1.com
@@ -65,3 +65,13 @@
# - if-match
# - user-agent
# - x-request-id
+ # the user agent to use when issuing requests
+ user_agent: WMF Trending Edits
+ # which datacenters to consume edit events from
+ consume_dc: [ <%= site %> ]
+ # calculate trending for one hour
+ trending_period: 60
+ # the number of edits needed to take a page into account
+ min_edits: 6
+ # the list of Kafka brokers to contact
+ broker_list: <%= broker_list %>
diff --git a/scap/vars.yaml b/scap/vars.yaml
index 32ba3ff..3735aea 100644
--- a/scap/vars.yaml
+++ b/scap/vars.yaml
@@ -1,18 +1,12 @@
-# general
-num_workers: 0
-worker_heap_limit_mb: 250
-worker_heartbeat_timeout: 7500
# log-related variables
-log_name: trendingedits
logstash_host: localhost
logstash_port: 12201
log_file: /tmp/trendingedits.log
# metrics
-metrics_name: trendingedits
metrics_host: localhost
metrics_port: 8125
# service
-name: trendingedits
port: 6699
proxy:
-
+site: datacenter1
+broker_list: localhost:9092
--
To view, visit https://gerrit.wikimedia.org/r/323162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I57d8b452036c034505c6424c3c96cdcf3ad35307
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/trending-edits/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac <mobro...@wikimedia.org>
Gerrit-Reviewer: Mobrovac <mobro...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
