[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Depool db1086

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401717 )

Change subject: db-eqiad.php: Depool db1086
..


db-eqiad.php: Depool db1086

Needs alter table

Bug: T174569
Change-Id: I9a3ba324b8416e699b35f1ea051e60ceedbb24a0
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 520ce91..8147427 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   'db1086' => 500, # B3 3.6TB 512GB, api
+   'db1079' => 200, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
+   # 'db1086' => 500, # B3 3.6TB 512GB, api # T174569
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -452,7 +452,7 @@
],
'api' => [
'db1079' => 100,
-   'db1086' => 1,
+   # 'db1086' => 1,
],
'watchlist' => [
'db1098:3317' => 1,

-- 
To view, visit https://gerrit.wikimedia.org/r/401717
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a3ba324b8416e699b35f1ea051e60ceedbb24a0
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::appserver::api: add load monitoring

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401714 )

Change subject: mediawiki::appserver::api: add load monitoring
..


mediawiki::appserver::api: add load monitoring

We've had quite a few cases of HHVM API appservers with high cpu usage
causing noitceable latencies to users; the easiest way to detect such
deadlocks is quite simply checking the machine CPU usage/load - at least
that's what I do manually.

This change won't solve the issue per-se, but it will make ops aware of
what is going on proactively.

Bug: T182568
Bug: T184048
Change-Id: I06af45cbf8f42ade5753dc7397c6e1aa2b32c4ea
---
A modules/profile/manifests/mediawiki/api.pp
M modules/role/manifests/mediawiki/appserver/api.pp
2 files changed, 23 insertions(+), 8 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/mediawiki/api.pp 
b/modules/profile/manifests/mediawiki/api.pp
new file mode 100644
index 000..0f0e9d6
--- /dev/null
+++ b/modules/profile/manifests/mediawiki/api.pp
@@ -0,0 +1,22 @@
+# == Class profile::mediawiki::api
+#
+# Specific settings for the mediawiki API servers
+class profile::mediawiki::api {
+# Using fastcgi we need more local ports
+sysctl::parameters { 'raise_port_range':
+values   => { 'net.ipv4.local_port_range' => '22500 65535', },
+priority => 90,
+}
+
+# Check the load to detect clearly hosts hanging (see T184048, T182568)
+$nproc = $facts['processorcount']
+$warning = join([ $nproc * 0.95, $nproc * 0.8, $nproc * 0.75], ',')
+$critical = join([ $nproc * 1.5, $nproc * 1.1, $nproc * 1], ',')
+# Since we're checking the load, that is already a moving average, we can
+# alarm at the first occurrence
+nrpe::monitor_service { 'cpu_load':
+description  => 'High CPU load on API appserver',
+nrpe_command => "/usr/lib/nagios/plugins/check_load -w ${warning} -c 
${critical}",
+retries  => 1,
+}
+}
diff --git a/modules/role/manifests/mediawiki/appserver/api.pp 
b/modules/role/manifests/mediawiki/appserver/api.pp
index 83494bb..c36d4b7 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -5,12 +5,5 @@
 include ::profile::base::firewall
 include ::profile::prometheus::apache_exporter
 include ::profile::prometheus::hhvm_exporter
-
-# Using fastcgi we need more local ports
-sysctl::parameters { 'raise_port_range':
-values   => {
-'net.ipv4.local_port_range' => '22500 65535',
-},
-priority => 90,
-}
+include ::profile::mediawiki::api
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I06af45cbf8f42ade5753dc7397c6e1aa2b32c4ea
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Display the file sha1 value in the file info page

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400695 )

Change subject: Display the file sha1 value in the file info page
..


Display the file sha1 value in the file info page

When a visitor accesses an info page of an existing file, base-36 sha1 value of 
this file will displayed in the table of basic information.

Bug: T181651
Change-Id: Ib8cae3e4070a186e28e8625556d3c510af0701c2
---
M includes/actions/InfoAction.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 14 insertions(+), 0 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 62f7ddf..a8a8317 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -437,6 +437,18 @@
];
}
 
+   // Display image SHA-1 value
+   if ( $title->inNamespace( NS_FILE ) ) {
+   $fileObj = wfFindFile( $title );
+   if ( $fileObj !== false ) {
+   $output = $fileObj->getSha1();
+   $pageInfo['header-basic'][] = [
+   $this->msg( 'pageinfo-file-hash' ),
+   $output
+   ];
+   }
+   }
+
// Page protection
$pageInfo['header-restrictions'] = [];
 
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 18c546d..5e206ef 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3055,6 +3055,7 @@
"pageinfo-category-subcats": "Number of subcategories",
"pageinfo-category-files": "Number of files",
"pageinfo-user-id": "User ID",
+   "pageinfo-file-hash": "Hash value",
"markaspatrolleddiff": "Mark as patrolled",
"markaspatrolledlink": "[$1]",
"markaspatrolledtext": "Mark this page as patrolled",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 0659453..30df1bd 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -3250,6 +3250,7 @@
"pageinfo-category-subcats": "See also:\n* 
{{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-files}}",
"pageinfo-category-files": "See also:\n* 
{{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-subcats}}",
"pageinfo-user-id": "The numeric ID for a user\n{{Identical|User ID}}",
+   "pageinfo-file-hash": "Base-36 SHA-1 value of the file",
"markaspatrolleddiff": "{{doc-actionlink}}\nSee also:\n* 
{{msg-mw|Markaspatrolledtext}}\n{{Identical|Mark as patrolled}}",
"markaspatrolledlink": "{{notranslate}}\nParameters:\n* $1 - link which 
has text {{msg-mw|Markaspatrolledtext}}",
"markaspatrolledtext": "{{doc-actionlink}}\nSee also:\n* 
{{msg-mw|Markaspatrolleddiff}}",

-- 
To view, visit https://gerrit.wikimedia.org/r/400695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8cae3e4070a186e28e8625556d3c510af0701c2
Gerrit-PatchSet: 16
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: 星耀晨曦 
Gerrit-Reviewer: Ebe123 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: Zhuyifei1999 
Gerrit-Reviewer: jenkins-bot <>
Gerrit-Reviewer: 星耀晨曦 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...python-thumbor-wikimedia[master]: Upgrade to 1.8

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401725 )

Change subject: Upgrade to 1.8
..


Upgrade to 1.8

Bug: T183907
Change-Id: Ie6123058b098f17f61fcb69505471ab70693cc5a
---
M debian/changelog
M setup.py
A tests/integration/originals/Cape_Town_under_the_clouds.webm
A 
tests/integration/originals/Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm
M tests/integration/test_video.py
A tests/integration/thumbnails/640px--Cape_Town_under_the_clouds.webm.jpg
A 
tests/integration/thumbnails/640px--Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm.jpg
M tox.ini
M wikimedia_thumbor/engine/stl/stl.py
M wikimedia_thumbor/loader/video/__init__.py
M wikimedia_thumbor/logging/filter/context/context.py
M wikimedia_thumbor/logging/filter/http404/http404.py
12 files changed, 55 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index 0a00260..59b5c76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-thumbor-wikimedia (1.8-1) jessie-wikimedia; urgency=low
+
+  * New upstream release
+
+ -- Gilles Dubuc   Wed, 3 Jan 2018 12:46:00 +
+
 python-thumbor-wikimedia (1.7-1) jessie-wikimedia; urgency=low
 
   * New upstream release
diff --git a/setup.py b/setup.py
index 57716a5..36d 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
 
 setup(
 name='wikimedia_thumbor',
-version='1.7',
+version='1.8',
 url='https://phabricator.wikimedia.org/diffusion/THMBREXT/',
 license='MIT',
 author='Gilles Dubuc, Wikimedia Foundation',
diff --git a/tests/integration/originals/Cape_Town_under_the_clouds.webm 
b/tests/integration/originals/Cape_Town_under_the_clouds.webm
new file mode 100644
index 000..82e16fc
--- /dev/null
+++ b/tests/integration/originals/Cape_Town_under_the_clouds.webm
Binary files differ
diff --git 
a/tests/integration/originals/Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm
 
b/tests/integration/originals/Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm
new file mode 100644
index 000..71b9428
--- /dev/null
+++ 
b/tests/integration/originals/Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm
Binary files differ
diff --git a/tests/integration/test_video.py b/tests/integration/test_video.py
index f5d5d91..8da8d73 100644
--- a/tests/integration/test_video.py
+++ b/tests/integration/test_video.py
@@ -38,6 +38,32 @@
 1.0
 )
 
+path = os.path.join(
+os.path.dirname(__file__),
+'originals',
+'Cape_Town_under_the_clouds.webm'
+)
+
+self.run_and_check_ssim_and_size(
+'thumbor/unsafe/640x/' + path,
+'640px--Cape_Town_under_the_clouds.webm.jpg',
+0.98,
+1.0
+)
+
+path = os.path.join(
+os.path.dirname(__file__),
+'originals',
+
'Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm'
+)
+
+self.run_and_check_ssim_and_size(
+'thumbor/unsafe/640x/' + path,
+
'640px--Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm.jpg',
+0.99,
+1.0
+)
+
 def test_webm_with_seek(self):
 path = os.path.join(
 os.path.dirname(__file__),
diff --git 
a/tests/integration/thumbnails/640px--Cape_Town_under_the_clouds.webm.jpg 
b/tests/integration/thumbnails/640px--Cape_Town_under_the_clouds.webm.jpg
new file mode 100644
index 000..0cfa53a
--- /dev/null
+++ b/tests/integration/thumbnails/640px--Cape_Town_under_the_clouds.webm.jpg
Binary files differ
diff --git 
a/tests/integration/thumbnails/640px--Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm.jpg
 
b/tests/integration/thumbnails/640px--Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm.jpg
new file mode 100644
index 000..4c4fecd
--- /dev/null
+++ 
b/tests/integration/thumbnails/640px--Debris_flow_-_22_juillet_2013_-_Crue_torrentielle_a_Saint_Julien_Montdenis.webm.jpg
Binary files differ
diff --git a/tox.ini b/tox.ini
index 157253d..2fca023 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,6 +6,7 @@
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
+commands = python -c 'print("done!")'
 
 [testenv:flake8]
 commands = flake8 {posargs}
diff --git a/wikimedia_thumbor/engine/stl/stl.py 
b/wikimedia_thumbor/engine/stl/stl.py
index 9dd3d47..a7cf8ec 100644
--- a/wikimedia_thumbor/engine/stl/stl.py
+++ b/wikimedia_thumbor/engine/stl/stl.py
@@ -18,6 +18,7 @@
 
 from wikimedia_thumbor.engine import BaseWikimediaEngine
 from 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add ssl_array and ssl_string entries to kafka_config

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398863 )

Change subject: Add ssl_array and ssl_string entries to kafka_config
..


Add ssl_array and ssl_string entries to kafka_config

This makes it easier for kafka clients to choose if they communicate
with Kafka over SSL.

Change-Id: I3ed69794f7153760e1c54c23c79a2ec014e75a48
---
M modules/role/lib/puppet/parser/functions/kafka_config.rb
1 file changed, 16 insertions(+), 6 deletions(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved
  Elukey: Looks good to me, but someone else must approve



diff --git a/modules/role/lib/puppet/parser/functions/kafka_config.rb 
b/modules/role/lib/puppet/parser/functions/kafka_config.rb
index 11bc44e..ffbe1d9 100644
--- a/modules/role/lib/puppet/parser/functions/kafka_config.rb
+++ b/modules/role/lib/puppet/parser/functions/kafka_config.rb
@@ -67,17 +67,27 @@
 # These are the zookeeper hosts for this kafka cluster.
 zk_hosts = zk_clusters[zk_cluster_name]['hosts'].keys.sort
 
+default_port = 9092
+default_ssl_port = 9093
 jmx_port = ''
+
 config = {
   'name'  => cluster_name,
   'brokers'   => {
-'hash' => brokers,
-'array'=> brokers.keys.sort,
-# list of comma-separated host:port broker pairs
-'string'   => brokers.map { |host, conf| "#{host}:#{conf['port'] || 
9092}" }.sort.join(','),
+'hash'   => brokers,
+# array of broker hostnames without port.  TODO: change this to use 
host:port?
+'array'  => brokers.keys.sort,
+# string list of comma-separated host:port broker
+'string' => brokers.map { |host, conf| "#{host}:#{conf['port'] || 
default_port}" }.sort.join(','),
+
+# array host:ssl_port brokers
+'ssl_array'  => brokers.map { |host, conf| "#{host}:#{conf['ssl_port'] 
|| default_ssl_port}" }.sort,
+# string list of comma-separated host:ssl_port brokers
+'ssl_string' => brokers.map { |host, conf| "#{host}:#{conf['ssl_port'] 
|| default_ssl_port}" }.sort.join(','),
+
 # list of comma-separated host_ broker pairs used as graphite 
wildcards
-'graphite' => "{#{brokers.keys.map { |b| "#{b.tr '.', 
'_'}_#{jmx_port}" }.sort.join(',')}}",
-'size' => brokers.keys.size
+'graphite'   => "{#{brokers.keys.map { |b| "#{b.tr '.', 
'_'}_#{jmx_port}" }.sort.join(',')}}",
+'size'   => brokers.keys.size
   },
   'jmx_port'  => jmx_port,
   'zookeeper' => {

-- 
To view, visit https://gerrit.wikimedia.org/r/398863
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3ed69794f7153760e1c54c23c79a2ec014e75a48
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: api: move mw1189-1200 to role::spare::system

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401482 )

Change subject: api: move mw1189-1200 to role::spare::system
..


api: move mw1189-1200 to role::spare::system

Also remove them from conftool

Bug: T183895
Change-Id: Ia25effaafda0d0f2656a94efc0584b03154fbde6
---
M conftool-data/node/eqiad.yaml
M manifests/site.pp
2 files changed, 4 insertions(+), 15 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 8f54087..48d4950 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -25,17 +25,6 @@
 mw1336.eqiad.wmnet: [apache2,nginx]
 mw1337.eqiad.wmnet: [apache2,nginx]
   api_appserver:
-mw1189.eqiad.wmnet: [apache2,nginx]
-mw1190.eqiad.wmnet: [apache2,nginx]
-mw1191.eqiad.wmnet: [apache2,nginx]
-mw1192.eqiad.wmnet: [apache2,nginx]
-mw1193.eqiad.wmnet: [apache2,nginx]
-mw1194.eqiad.wmnet: [apache2,nginx]
-mw1195.eqiad.wmnet: [apache2,nginx]
-mw1197.eqiad.wmnet: [apache2,nginx]
-mw1198.eqiad.wmnet: [apache2,nginx]
-mw1199.eqiad.wmnet: [apache2,nginx]
-mw1200.eqiad.wmnet: [apache2,nginx]
 mw1201.eqiad.wmnet: [apache2,nginx]
 mw1202.eqiad.wmnet: [apache2,nginx]
 mw1203.eqiad.wmnet: [apache2,nginx]
diff --git a/manifests/site.pp b/manifests/site.pp
index ddfb6df..6604232 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1510,13 +1510,13 @@
 role(mediawiki::canary_appserver)
 }
 
-# mw1180-1188 are apaches
-node /^mw118[0-8]\.eqiad\.wmnet$/ {
+# mw1180-1200 are spares
+node /^mw1(1[8-9][0-9]|200)\.eqiad\.wmnet$/ {
 role(spare::system)
 }
 
-# mw1189-1208 are api apaches
-node /^mw1(189|19[0-9]|20[0-8])\.eqiad\.wmnet$/ {
+# mw1201-1208 are api apaches
+node /^mw120[1-8]\.eqiad\.wmnet$/ {
 role(mediawiki::appserver::api)
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401482
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia25effaafda0d0f2656a94efc0584b03154fbde6
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix "Mark as read" button icon on no-JS

[Petar.petkovic (Code Review)]

Petar.petkovic has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401738 )

Change subject: Fix "Mark as read" button icon on no-JS
..

Fix "Mark as read" button icon on no-JS

Bug: T182167
Change-Id: I2c386e1ab2c95d2d1034c8d366d39c12827b3d22
---
M modules/styles/LabelIconWidget.less
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/38/401738/1

diff --git a/modules/styles/LabelIconWidget.less 
b/modules/styles/LabelIconWidget.less
index 9aec81f..bffd2a8 100644
--- a/modules/styles/LabelIconWidget.less
+++ b/modules/styles/LabelIconWidget.less
@@ -1,5 +1,6 @@
 .oo-ui-labelIconWidget {
display: table;
+   padding-left: 1.5em;
 }
 
 .oo-ui-labelIconWidget-row {
@@ -10,4 +11,8 @@
display: table-cell;
vertical-align: middle;
}
+
+   .oo-ui-iconElement-icon {
+   left: 0.5em;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c386e1ab2c95d2d1034c8d366d39c12827b3d22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: labstore: add comment to interval options for nfs-exportd

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401735 )

Change subject: labstore: add comment to interval options for nfs-exportd
..


labstore: add comment to interval options for nfs-exportd

Change-Id: I884e4b74a1054a25295801dc6f2892f88b2c1886
---
M modules/labstore/files/nfs-exportd
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/labstore/files/nfs-exportd 
b/modules/labstore/files/nfs-exportd
index 8af1ac3..7b7aac1 100755
--- a/modules/labstore/files/nfs-exportd
+++ b/modules/labstore/files/nfs-exportd
@@ -226,7 +226,7 @@
 '--interval',
 type=int,
 default=0,
-help='Set interval to rerun at',
+help='Set interval to rerun at.  Default is 0 which means run once.',
 )
 
 argparser.add_argument(

-- 
To view, visit https://gerrit.wikimedia.org/r/401735
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I884e4b74a1054a25295801dc6f2892f88b2c1886
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Switchover s6-codfw master to db2039

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401734 )

Change subject: mariadb: Switchover s6-codfw master to db2039
..


mariadb: Switchover s6-codfw master to db2039

db2039 is partitioned, will remove the partitions afterwards.

Bug: T176243
Change-Id: I77fcdfac11c84c1ae68a5adecf55b87410110177
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index daea153..77da252 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -157,8 +157,8 @@
'db2089:3315' => 1, # A3 3.3TB 512GB # rc, log: s5 and s6
],
's6' => [
-   'db2028'  => 0,   # B6  2.9TB  96GB, master
-   'db2039'  => 50,  # C6 2.9TB 160GB, rc, log
+   'db2039'  => 0,   # C6 2.9TB 160GB, master, partitioned!
+   # 'db2028'  => 0,   # B6 2.9TB  96GB, old master, to be 
decom.
'db2046'  => 400, # C6 2.9TB 160GB
'db2053'  => 100, # D6 2.9TB 160GB, dump (inactive), vslow
'db2060'  => 100, # D6 3.3TB 160GB, api
@@ -432,27 +432,22 @@
],
's6' => [
'watchlist' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'recentchanges' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'recentchangeslinked' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'contributions' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'logpager' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],

-- 
To view, visit https://gerrit.wikimedia.org/r/401734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I77fcdfac11c84c1ae68a5adecf55b87410110177
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: Run coverage for all extensions from https://tools.wmflabs.o...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401720 )

Change subject: Run coverage for all extensions from 
https://tools.wmflabs.org/coverage/
..


Run coverage for all extensions from https://tools.wmflabs.org/coverage/

* CentralAuth
* Gadgets
* GlobalCssJs
* MassMessage
* MobileFrontend

Change-Id: I4aeee342b082b4a909ee733e799c43554f2466fa
---
M zuul/layout.yaml
1 file changed, 9 insertions(+), 0 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2dc19cf..2f656ec 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -3015,6 +3015,8 @@
   - name: extension-unittests-generic
   - name: mwgate-rake
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 experimental:
   - mediawiki-core-qunit-selenium-jessie
   - mwext-mw-selenium-jessie
@@ -3507,6 +3509,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/Gather
 template:
@@ -3577,6 +3581,8 @@
   - name: extension-gate
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/GlobalPreferences
 template:
@@ -3880,6 +3886,8 @@
 template:
   - name: extension-unittests-generic
   - name: mwgate-npm
+postmerge:
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/MassMessageEmail
 template:
@@ -3924,6 +3932,7 @@
 postmerge:
   - mwext-jsduck-publish
   - mwext-doxygen-publish
+  - mwext-phpunit-coverage-publish
 
   - name: mediawiki/extensions/MobileApp
 template:

-- 
To view, visit https://gerrit.wikimedia.org/r/401720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4aeee342b082b4a909ee733e799c43554f2466fa
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: appservers: move mw1180-1188 to role::spare::system

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401479 )

Change subject: appservers: move mw1180-1188 to role::spare::system
..


appservers: move mw1180-1188 to role::spare::system

Also, remove them from conftool-data

Bug: T183895
Change-Id: Ibb45f449767088ff429723ba103579133dd42ccc
---
M conftool-data/node/eqiad.yaml
M manifests/site.pp
2 files changed, 1 insertion(+), 10 deletions(-)

Approvals:
  Giuseppe Lavagetto: Looks good to me, approved
  Muehlenhoff: Looks good to me, but someone else must approve
  Elukey: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/conftool-data/node/eqiad.yaml b/conftool-data/node/eqiad.yaml
index 9357ded..8f54087 100644
--- a/conftool-data/node/eqiad.yaml
+++ b/conftool-data/node/eqiad.yaml
@@ -81,15 +81,6 @@
 mw1316.eqiad.wmnet: [apache2,nginx]
 mw1317.eqiad.wmnet: [apache2,nginx]
   appserver:
-mw1180.eqiad.wmnet: [apache2,nginx]
-mw1181.eqiad.wmnet: [apache2,nginx]
-mw1182.eqiad.wmnet: [apache2,nginx]
-mw1183.eqiad.wmnet: [apache2,nginx]
-mw1184.eqiad.wmnet: [apache2,nginx]
-mw1185.eqiad.wmnet: [apache2,nginx]
-mw1186.eqiad.wmnet: [apache2,nginx]
-mw1187.eqiad.wmnet: [apache2,nginx]
-mw1188.eqiad.wmnet: [apache2,nginx]
 mw1209.eqiad.wmnet: [apache2,nginx]
 mw1210.eqiad.wmnet: [apache2,nginx]
 mw1211.eqiad.wmnet: [apache2,nginx]
diff --git a/manifests/site.pp b/manifests/site.pp
index 89fa933..ddfb6df 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1512,7 +1512,7 @@
 
 # mw1180-1188 are apaches
 node /^mw118[0-8]\.eqiad\.wmnet$/ {
-role(mediawiki::appserver)
+role(spare::system)
 }
 
 # mw1189-1208 are api apaches

-- 
To view, visit https://gerrit.wikimedia.org/r/401479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb45f449767088ff429723ba103579133dd42ccc
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Remove redundant @since tags

[Thiemo Kreuz (WMDE) (Code Review)]

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401727 )

Change subject: Remove redundant @since tags
..

Remove redundant @since tags

These @since tags are duplicated in so far that the entire file was
introduced with this version.

Change-Id: I2541809c4bafae6f1c74b0fbc149701bd381aca4
---
M EducationProgram.hooks.php
M includes/ArticleAdder.php
M includes/ArticleStore.php
M includes/DYKBox.php
M includes/DiffTable.php
M includes/Events/EditEventCreator.php
M includes/Events/Event.php
M includes/Events/EventGrouper.php
M includes/Events/EventQuery.php
M includes/Events/EventStore.php
M includes/Events/RecentPageEventGrouper.php
M includes/Events/Timeline.php
M includes/Events/TimelineGroup.php
M includes/Extension.php
M includes/FailForm.php
M includes/IRole.php
M includes/LogFormatter.php
M includes/Menu.php
M includes/RevisionAction.php
M includes/RoleObject.php
M includes/Settings.php
M includes/UPCUserCourseFinder.php
M includes/UserCourseFinder.php
M includes/Utils.php
M includes/actions/Action.php
M includes/actions/DeleteAction.php
M includes/actions/EditAction.php
M includes/actions/EditCourseAction.php
M includes/actions/EditOrgAction.php
M includes/actions/HistoryAction.php
M includes/actions/RestoreAction.php
M includes/actions/UndeleteAction.php
M includes/actions/UndoAction.php
M includes/actions/ViewAction.php
M includes/actions/ViewCourseAction.php
M includes/actions/ViewCourseActivityAction.php
M includes/actions/ViewOrgAction.php
M includes/api/ApiDeleteEducation.php
M includes/api/ApiEnlist.php
M includes/api/ApiRefreshEducation.php
M includes/pagers/ArticleTable.php
M includes/pagers/CoursePager.php
M includes/pagers/EPPager.php
M includes/pagers/OAPager.php
M includes/pagers/OrgPager.php
M includes/pagers/RevisionPager.php
M includes/pagers/StudentActivityPager.php
M includes/pagers/StudentPager.php
M includes/pages/CoursePage.php
M includes/pages/EducationPage.php
M includes/pages/OrgPage.php
M includes/rows/CA.php
M includes/rows/Course.php
M includes/rows/EPArticle.php
M includes/rows/EPRevision.php
M includes/rows/Instructor.php
M includes/rows/OA.php
M includes/rows/Org.php
M includes/rows/PageObject.php
M includes/rows/RevisionedObject.php
M includes/rows/Student.php
M includes/specials/SpecialAmbassadorProfile.php
M includes/specials/SpecialCAProfile.php
M includes/specials/SpecialCAs.php
M includes/specials/SpecialCourses.php
M includes/specials/SpecialDisenroll.php
M includes/specials/SpecialEducationProgram.php
M includes/specials/SpecialEnroll.php
M includes/specials/SpecialInstitutions.php
M includes/specials/SpecialManageCourses.php
M includes/specials/SpecialMyCourses.php
M includes/specials/SpecialOAProfile.php
M includes/specials/SpecialOAs.php
M includes/specials/SpecialStudentActivity.php
M includes/specials/SpecialStudents.php
M includes/specials/VerySpecialPage.php
M includes/tables/CAs.php
M includes/tables/Courses.php
M includes/tables/Events.php
M includes/tables/Instructors.php
M includes/tables/OAs.php
M includes/tables/Orgs.php
M includes/tables/PageTable.php
M includes/tables/Revisions.php
M includes/tables/Students.php
M maintenance/importWEPData.php
M maintenance/importWEPFromDB.php
M tests/phpunit/rows/CourseTest.php
M tests/phpunit/rows/OrgTest.php
89 files changed, 67 insertions(+), 870 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/27/401727/1

diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index 0d5acb4..a1cc248 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -86,8 +86,6 @@
 * Schema update to set up the needed database tables.
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/LoadExtensionSchemaUpdates
 *
-* @since 0.1
-*
 * @param DatabaseUpdater $updater
 */
public static function onSchemaUpdate( DatabaseUpdater $updater ) {
@@ -126,8 +124,6 @@
 * Called after the personal URLs have been set up, before they are 
shown.
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/PersonalUrls
 *
-* @since 0.1
-*
 * @param array &$personal_urls
 * @param Title &$title
 */
@@ -154,8 +150,6 @@
/**
 * Adds the preferences of Education Program to the list of available 
ones.
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/GetPreferences
-*
-* @since 0.1
 *
 * @param User $user
 * @param array &$preferences
@@ -190,8 +184,6 @@
 * Called to determine the class to handle the article rendering, based 
on title.
 * @see https://www.mediawiki.org/wiki/Manual:Hooks/ArticleFromTitle
 *
-* @since 0.1
-*
 * @param Title &$title
 * @param \Article|null &$article
 */
@@ -205,8 +197,6 @@
   

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Improve type safety in parseItemIdParameter()

[Lucas Werkmeister (WMDE) (Code Review)]

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401731 )

Change subject: Improve type safety in parseItemIdParameter()
..

Improve type safety in parseItemIdParameter()

Instead of calling getters multiple times, assign the returned values to
variables, so that we know they’re the same values (and therefore have
the same types).

The pattern is inspired by the Ceylon programming language, where I
would write something like this:

if (is EntityIdValue dataValue = snak.dataValue,
is ItemId itemId = dataValue.entityId) {
return ItemIdSnakValue.ofItemId(itemId);
} else {
throw ConstraintParameterException {
message = ...;
};
}

Change-Id: I027a2ad16a74c8b786acaa5abcad83b8e95a3678
---
M src/ConstraintCheck/Helper/ConstraintParameterParser.php
1 file changed, 5 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseQualityConstraints
 refs/changes/31/401731/1

diff --git a/src/ConstraintCheck/Helper/ConstraintParameterParser.php 
b/src/ConstraintCheck/Helper/ConstraintParameterParser.php
index 2177456..d90d3c8 100644
--- a/src/ConstraintCheck/Helper/ConstraintParameterParser.php
+++ b/src/ConstraintCheck/Helper/ConstraintParameterParser.php
@@ -259,16 +259,17 @@
}
 
private function parseItemIdParameter( PropertyValueSnak $snak, 
$parameterId ) {
-   if ( $snak->getDataValue() instanceof EntityIdValue &&
-   $snak->getDataValue()->getEntityId() instanceof ItemId
+   if (
+   ( $dataValue = $snak->getDataValue() ) instanceof 
EntityIdValue &&
+   ( $itemId = $dataValue->getEntityId() ) instanceof 
ItemId
) {
-   return ItemIdSnakValue::fromItemId( 
$snak->getDataValue()->getEntityId() );
+   return ItemIdSnakValue::fromItemId( $itemId );
} else {
throw new ConstraintParameterException(
wfMessage( 
'wbqc-violation-message-parameter-item' )
->rawParams(

$this->constraintParameterRenderer->formatPropertyId( $parameterId, 
Role::CONSTRAINT_PARAMETER_PROPERTY ),
-   
$this->constraintParameterRenderer->formatDataValue( $snak->getDataValue(), 
Role::CONSTRAINT_PARAMETER_VALUE )
+   
$this->constraintParameterRenderer->formatDataValue( $dataValue, 
Role::CONSTRAINT_PARAMETER_VALUE )
)
->escaped()
);

-- 
To view, visit https://gerrit.wikimedia.org/r/401731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I027a2ad16a74c8b786acaa5abcad83b8e95a3678
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add klog alias to otto's bash aliases for tailing kafka logs

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401732 )

Change subject: Add klog alias to otto's bash aliases for tailing kafka logs
..

Add klog alias to otto's bash aliases for tailing kafka logs

Change-Id: I5d84d7383b496d0a5296b4a59c4a793242038d39
---
M modules/admin/files/home/otto/.bash_aliases
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/32/401732/1

diff --git a/modules/admin/files/home/otto/.bash_aliases 
b/modules/admin/files/home/otto/.bash_aliases
index 418b077..3fd414b 100644
--- a/modules/admin/files/home/otto/.bash_aliases
+++ b/modules/admin/files/home/otto/.bash_aliases
@@ -4,4 +4,5 @@
 alias cdr='cd /srv/deployment/analytics/refinery'
 alias hproxy="export http_proxy=http://webproxy.eqiad.wmnet:8080; export 
HTTPS_PROXY=http://webproxy.eqiad.wmnet:8080;;
 alias slog='sudo tail -n 200 -f /var/log/syslog'
-alias pvl='pv -l > /dev/null'
\ No newline at end of file
+alias pvl='pv -l > /dev/null'
+alias klog='sudo tail -f /var/log/kafka/server.log 
/var/log/kafka/kafka-authorizor.log'

-- 
To view, visit https://gerrit.wikimedia.org/r/401732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d84d7383b496d0a5296b4a59c4a793242038d39
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Set cipher.suites and ssl.enabled.protocols for jumbo and va...

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399700 )

Change subject: Set cipher.suites and ssl.enabled.protocols for jumbo and 
varnishkafka (canary)
..


Set cipher.suites and ssl.enabled.protocols for jumbo and varnishkafka (canary)

Also remove hardcoded Kafka brokers from 
profile::cache::kafka::webrequest::jumbo
now that kafka_config.rb supports 'ssl_array' entry

Bug: T167304
Change-Id: I39e62f7d13a9b379f45cfb9c6bad8b7a6ebd1e88
---
M modules/confluent/manifests/kafka/broker.pp
M modules/confluent/templates/kafka/server.properties.erb
M modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
M modules/profile/manifests/kafka/broker.pp
M modules/varnishkafka
5 files changed, 29 insertions(+), 13 deletions(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/confluent/manifests/kafka/broker.pp 
b/modules/confluent/manifests/kafka/broker.pp
index 0cfb32a..10037da 100644
--- a/modules/confluent/manifests/kafka/broker.pp
+++ b/modules/confluent/manifests/kafka/broker.pp
@@ -37,9 +37,17 @@
 # [*ssl_truststore_password*]
 #   The password for the trust store file.  Default: undef
 #
-# [*ssl_client_auth*]
+# [*ssl_client_auth]
 #   Configures kafka broker to request client authentication.  Must be one of
 #   'none', 'requested', or 'required'.  Default: undef
+#
+# [*ssl_enabled_protocols**]
+#   Comma separated string of enabled ssl protocols that will be accepted from 
clients
+#  e.g. TLSv1.2,TLSv1.1,TLSv1.  Default: undef
+#
+# [*ssl_cipher_suites*]
+#   Comma separated string of cipher suites that will be accepted from clients.
+#   Default: undef
 #
 # [*log_dirs*]
 #   Array of directories in which the broker will store its received message
@@ -247,6 +255,8 @@
 $ssl_truststore_location = undef,
 $ssl_truststore_password = undef,
 $ssl_client_auth = undef,
+$ssl_enabled_protocols   = undef,
+$ssl_cipher_suites   = undef,
 
 $log_dirs= ['/var/spool/kafka'],
 
diff --git a/modules/confluent/templates/kafka/server.properties.erb 
b/modules/confluent/templates/kafka/server.properties.erb
index 624e9fb..e8feb80 100644
--- a/modules/confluent/templates/kafka/server.properties.erb
+++ b/modules/confluent/templates/kafka/server.properties.erb
@@ -78,6 +78,12 @@
 <% if @ssl_truststore_password -%>
 ssl.truststore.password=<%= @ssl_truststore_password %>
 <% end -%>
+<% if @ssl_enabled_protocols -%>
+ssl.enabled.protocols=<%= @ssl_enabled_protocols %>
+<% end -%>
+<% if @ssl_cipher_suites -%>
+ssl.cipher.suites=<%= @ssl_cipher_suites %>
+<% end -%>
 
 <% if @ssl_client_auth -%>
 ssl.client.auth=<%= @ssl_client_auth %>
diff --git a/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp 
b/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
index f7f5218..c97f74b 100644
--- a/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
+++ b/modules/profile/manifests/cache/kafka/webrequest/jumbo.pp
@@ -23,17 +23,8 @@
 ) {
 $config = kafka_config('jumbo-eqiad')
 
-# FIXME: Temporary workaround to force varnishkafka to use the TLS port of
-# Kafka Jumbo. This will probably be handled in the future via 
kafka_config.rb
-#$kafka_brokers = $config['brokers']['array']
-$kafka_brokers = [
-'kafka-jumbo1001.eqiad.wmnet:9093',
-'kafka-jumbo1002.eqiad.wmnet:9093',
-'kafka-jumbo1003.eqiad.wmnet:9093',
-'kafka-jumbo1004.eqiad.wmnet:9093',
-'kafka-jumbo1005.eqiad.wmnet:9093',
-'kafka-jumbo1006.eqiad.wmnet:9093',
-]
+# Array of kafka brokers in jumbo-eqiad with SSL port 9093
+$kafka_brokers = $config['brokers']['ssl_array']
 
 $topic = "webrequest_${cache_cluster}_test"
 # These used to be parameters, but I don't really see why given we never 
change
@@ -73,6 +64,7 @@
 
 $ssl_certificate_secrets_path = 
'certificates/varnishkafka/varnishkafka.crt.pem'
 $ssl_certificate_location = "${ssl_location}/varnishkafka.crt.pem"
+$ssl_cipher_suites = 'ECDHE-ECDSA-AES256-GCM-SHA384'
 
 file { $ssl_location:
 ensure => 'directory',
@@ -145,6 +137,7 @@
 ssl_key_password => $ssl_key_password,
 ssl_key_location => $ssl_key_location,
 ssl_certificate_location => $ssl_certificate_location,
+ssl_cipher_suites=> $ssl_cipher_suites,
 require  => [
 File[$ssl_key_location],
 File[$ssl_certificate_location]
diff --git a/modules/profile/manifests/kafka/broker.pp 
b/modules/profile/manifests/kafka/broker.pp
index 9fe7bcb..33109ab 100644
--- a/modules/profile/manifests/kafka/broker.pp
+++ b/modules/profile/manifests/kafka/broker.pp
@@ -183,6 +183,9 @@
 $ssl_truststore_secrets_path= 

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Comment out broken test after Chrome upgrade

[Code Review]

Bartosz Dziewoński has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401741 )

Change subject: Comment out broken test after Chrome upgrade
..

Comment out broken test after Chrome upgrade

Our CI environment uses either Chrome 57 (mediawiki/extensions/VisualEditor)
or Chrome 63 (VisualEditor/VisualEditor), but they produce different results,
so this test will always fail in at least one of them.

Follow-up to 288e6cffd38dde83688ace3b8ba38f2d72c8c4de.

Change-Id: Iacd9f7e7d1eb8c05643b4b6a746ebab2bc024d2e
---
M tests/ce/ve.ce.Surface.test.js
1 file changed, 7 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/41/401741/1

diff --git a/tests/ce/ve.ce.Surface.test.js b/tests/ce/ve.ce.Surface.test.js
index 419ecdd..7b76069 100644
--- a/tests/ce/ve.ce.Surface.test.js
+++ b/tests/ce/ve.ce.Surface.test.js
@@ -1430,12 +1430,16 @@
'',
expectedText: 'Foo\n\n',
msg: 'RDFa attributes encoded into 
data-ve-attributes'
-   },
+   }/*,
+   // Our CI environment uses either Chrome 57 
(mediawiki/extensions/VisualEditor)
+   // or Chrome 63 (VisualEditor/VisualEditor), but they 
produce different results,
+   // so this test will always fail in at least one of 
them.
{
rangeOrSelection: new ve.Range( 0, 61 ),
-   expectedText: 
'abc\nd\n\ne\n\nf\n\ng\n\nhi\nj\n\nk\n\nl\n\nm\n\n',
+   expectedText: 
'abc\n\nd\n\ne\n\nf\n\ng\n\nhi\nj\n\nk\n\nl\n\nm\n\n', // Chrome 57
+   expectedText: 
'abc\nd\n\ne\n\nf\n\ng\n\nhi\nj\n\nk\n\nl\n\nm\n\n',   // Chrome 63
msg: 'Plain text of entire document'
-   }
+   }*/
];
 
function testRunner( doc, rangeOrSelection, expectedData, 
expectedOriginalRange, expectedBalancedRange, expectedHtml, expectedText, msg ) 
{

-- 
To view, visit https://gerrit.wikimedia.org/r/401741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacd9f7e7d1eb8c05643b4b6a746ebab2bc024d2e
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PropertySuggester[master]: Type hint against IDatabase instead of Database

[Thiemo Kreuz (WMDE) (Code Review)]

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401721 )

Change subject: Type hint against IDatabase instead of Database
..

Type hint against IDatabase instead of Database

Change-Id: I8e2ea8167e7f7f3a41cf321e6387801e1c03c212
---
M src/UpdateTable/Importer/BasicImporter.php
1 file changed, 4 insertions(+), 4 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PropertySuggester 
refs/changes/21/401721/1

diff --git a/src/UpdateTable/Importer/BasicImporter.php 
b/src/UpdateTable/Importer/BasicImporter.php
index 1baa8e9..2e19435 100644
--- a/src/UpdateTable/Importer/BasicImporter.php
+++ b/src/UpdateTable/Importer/BasicImporter.php
@@ -4,7 +4,7 @@
 
 use UnexpectedValueException;
 use PropertySuggester\UpdateTable\ImportContext;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * A strategy which imports entries from a CSV file into a DB table. Used as 
fallback, when no
@@ -37,12 +37,12 @@
}
 
/**
-* @param $fileHandle
-* @param Database $db
+* @param resource $fileHandle
+* @param IDatabase $db
 * @param ImportContext $importContext
 * @throws UnexpectedValueException
 */
-   private function doImport( $fileHandle, Database $db, ImportContext 
$importContext ) {
+   private function doImport( $fileHandle, IDatabase $db, ImportContext 
$importContext ) {
$accumulator = [];
$batchSize = $importContext->getBatchSize();
$i = 0;

-- 
To view, visit https://gerrit.wikimedia.org/r/401721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8e2ea8167e7f7f3a41cf321e6387801e1c03c212
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Type hint against IDatabase instead of Database

[Thiemo Kreuz (WMDE) (Code Review)]

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401722 )

Change subject: Type hint against IDatabase instead of Database
..

Type hint against IDatabase instead of Database

Change-Id: I4050e1e08fe084cca046f4743d19259f933ea61b
---
M client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php
M client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
M repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
3 files changed, 5 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/22/401722/1

diff --git 
a/client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php 
b/client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php
index f991e97..1964618 100644
--- a/client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php
+++ b/client/tests/phpunit/includes/Store/Sql/PagePropsEntityIdLookupTest.php
@@ -7,7 +7,7 @@
 use Wikibase\DataModel\Entity\EntityId;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Entity\ItemIdParser;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * @covers Wikibase\Client\Store\Sql\PagePropsEntityIdLookup
@@ -34,7 +34,7 @@
return $title;
}
 
-   private function insertPageProps( Database $db, $pageId, EntityId 
$entityId ) {
+   private function insertPageProps( IDatabase $db, $pageId, EntityId 
$entityId ) {
$db->insert(
'page_props',
[
diff --git a/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php 
b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
index f27d54d..3fb4c9f 100644
--- a/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
+++ b/client/tests/phpunit/includes/Usage/Sql/EntityUsageTableTest.php
@@ -347,7 +347,7 @@
}
 
/**
-* @param Database $db
+* @param IDatabase $db
 * @param array $conditions
 *
 * @return bool
diff --git 
a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php 
b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
index 4f2d989..be41a7d 100644
--- a/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
+++ b/repo/tests/phpunit/includes/Store/Sql/WikiPageEntityMetaDataLookupTest.php
@@ -15,6 +15,7 @@
 use Wikibase\Repo\WikibaseRepo;
 use Wikimedia\Rdbms\Database;
 use Wikimedia\Rdbms\FakeResultWrapper;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * This test needs to be in repo, although the class is in lib as we can't 
alter
@@ -104,7 +105,7 @@
/**
 * Gets a "lagged" database connection: We always leave out the first 
row on select.
 */
-   private function getLaggedDatabase( Database $realDB, $selectCount, 
$selectRowCount ) {
+   private function getLaggedDatabase( IDatabase $realDB, $selectCount, 
$selectRowCount ) {
$db = $this->getMockBuilder( Database::class )
->disableOriginalConstructor()
->setMethods( [ 'select', 'selectRow' ] )

-- 
To view, visit https://gerrit.wikimedia.org/r/401722
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4050e1e08fe084cca046f4743d19259f933ea61b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Kreuz (WMDE) 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...varnishkafka[master]: Parameterize kafka.ssl.cipher.suites

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399689 )

Change subject: Parameterize kafka.ssl.cipher.suites
..


Parameterize kafka.ssl.cipher.suites

Bug: T177225
Change-Id: Ie4dafe2a0323428b66042a126cfa0bdbaa01bec3
---
M manifests/instance.pp
M templates/varnishkafka.conf.erb
2 files changed, 9 insertions(+), 1 deletion(-)

Approvals:
  Ottomata: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/manifests/instance.pp b/manifests/instance.pp
index 8faca33..b8c847a 100644
--- a/manifests/instance.pp
+++ b/manifests/instance.pp
@@ -93,6 +93,10 @@
 # $ssl_certificate_location - Full path of the SSL client certificate.
 # Default: undef
 #
+# $ssl_cipher_suites- Comma separated string of cipher suites 
that are permitted to
+# be used for SSL communication with 
brokers.  This must match
+# at least one of the cipher suites 
allowed by the brokers.
+#
 define varnishkafka::instance(
 $brokers= ['localhost:9092'],
 $topic  = 'varnish',
@@ -139,6 +143,7 @@
 $ssl_key_password   = undef,
 $ssl_key_location   = undef,
 $ssl_certificate_location   = undef,
+$ssl_cipher_suites  = undef,
 ) {
 require ::varnishkafka
 
diff --git a/templates/varnishkafka.conf.erb b/templates/varnishkafka.conf.erb
index df797ca..927ef5e 100644
--- a/templates/varnishkafka.conf.erb
+++ b/templates/varnishkafka.conf.erb
@@ -279,4 +279,7 @@
 kafka.ssl.key.password=<%= @ssl_key_password %>
 kafka.ssl.key.location=<%= @ssl_key_location %>
 kafka.ssl.certificate.location=<%= @ssl_certificate_location %>
-<% end -%>
\ No newline at end of file
+<% if @ssl_cipher_suites -%>
+kafka.ssl.cipher.suites=<%= @ssl_cipher_suites %>
+<% end -%>
+<% end -%>

-- 
To view, visit https://gerrit.wikimedia.org/r/399689
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4dafe2a0323428b66042a126cfa0bdbaa01bec3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet/varnishkafka
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Type hint against IDatabase instead of Database

[Thiemo Kreuz (WMDE) (Code Review)]

Thiemo Kreuz (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401723 )

Change subject: Type hint against IDatabase instead of Database
..

Type hint against IDatabase instead of Database

Change-Id: Ibb067ca33fd71464d48c0144470df3d082a97cbe
---
M includes/ArticleStore.php
M includes/Events/EventStore.php
M includes/Store/CourseStore.php
M includes/UPCUserCourseFinder.php
M includes/pagers/RevisionPager.php
M includes/rows/ORMRow.php
M includes/tables/IORMTable.php
M includes/tables/ORMTable.php
8 files changed, 36 insertions(+), 36 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EducationProgram 
refs/changes/23/401723/1

diff --git a/includes/ArticleStore.php b/includes/ArticleStore.php
index f08a676..9d57eb8 100644
--- a/includes/ArticleStore.php
+++ b/includes/ArticleStore.php
@@ -3,7 +3,7 @@
 namespace EducationProgram;
 
 use InvalidArgumentException;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Store for EPArticle objects.
@@ -84,7 +84,7 @@
 *
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
protected function getReadConnection() {
return wfGetDB( $this->readConnectionId );
@@ -96,7 +96,7 @@
 *
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
protected function getWriteConnection() {
return wfGetDB( DB_MASTER );
diff --git a/includes/Events/EventStore.php b/includes/Events/EventStore.php
index 507031e..b1dd839 100644
--- a/includes/Events/EventStore.php
+++ b/includes/Events/EventStore.php
@@ -3,7 +3,7 @@
 namespace EducationProgram\Events;
 
 use InvalidArgumentException;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Service via which EducationProgram events can be saved and queried.
@@ -66,7 +66,7 @@
/**
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
private function getReadConnection() {
return wfGetDB( $this->readConnectionId );
@@ -75,7 +75,7 @@
/**
 * @since 0.3
 *
-* @return Database
+* @return IDatabase
 */
private function getWriteConnection() {
return wfGetDB( DB_MASTER );
diff --git a/includes/Store/CourseStore.php b/includes/Store/CourseStore.php
index 4e8d236..c934b1c 100644
--- a/includes/Store/CourseStore.php
+++ b/includes/Store/CourseStore.php
@@ -6,7 +6,7 @@
 use EducationProgram\CourseNotFoundException;
 use EducationProgram\CourseTitleNotFoundException;
 use EducationProgram\Courses;
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * This program is free software; you can redistribute it and/or modify
@@ -40,11 +40,11 @@
private $tableName;
 
/**
-* @var Database
+* @var IDatabase
 */
private $readDatabase;
 
-   public function __construct( $tableName, Database $readDatabase ) {
+   public function __construct( $tableName, IDatabase $readDatabase ) {
$this->readDatabase = $readDatabase;
$this->tableName = $tableName;
}
diff --git a/includes/UPCUserCourseFinder.php b/includes/UPCUserCourseFinder.php
index f5e0cf8..2296869 100644
--- a/includes/UPCUserCourseFinder.php
+++ b/includes/UPCUserCourseFinder.php
@@ -2,7 +2,7 @@
 
 namespace EducationProgram;
 
-use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\IDatabase;
 
 /**
  * Implementation of the UserCourseFinder interface that works by doing
@@ -39,16 +39,16 @@
/**
 * @since 0.3
 *
-* @var Database
+* @var IDatabase
 */
private $db;
 
/**
 * @since 0.3
 *
-* @param Database $db
+* @param IDatabase $db
 */
-   public function __construct( Database $db ) {
+   public function __construct( IDatabase $db ) {
$this->db = $db;
}
 
diff --git a/includes/pagers/RevisionPager.php 
b/includes/pagers/RevisionPager.php
index de96c04..a0bcab0 100644
--- a/includes/pagers/RevisionPager.php
+++ b/includes/pagers/RevisionPager.php
@@ -173,8 +173,8 @@
 * This function should be overridden to provide all parameters
 * needed for the main paged query. It returns an associative
 * array with the following elements:
-*  tables => Table(s) for passing to Database::select()
-*  fields => Field(s) for passing to Database::select(), may be *
+*  tables => Table(s) for passing to IDatabase::select()
+*  fields => Field(s) for passing to IDatabase::select(), may be *
 *  conds => WHERE conditions
 *  options => option array
 *  join_conds => JOIN conditions
diff --git 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: Switchover s6-codfw master to db2039

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401734 )

Change subject: mariadb: Switchover s6-codfw master to db2039
..

mariadb: Switchover s6-codfw master to db2039

db2039 is partitioned, will remove the partitions afterwards.

Bug: T176243
Change-Id: I77fcdfac11c84c1ae68a5adecf55b87410110177
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/34/401734/1

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index daea153..77da252 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -157,8 +157,8 @@
'db2089:3315' => 1, # A3 3.3TB 512GB # rc, log: s5 and s6
],
's6' => [
-   'db2028'  => 0,   # B6  2.9TB  96GB, master
-   'db2039'  => 50,  # C6 2.9TB 160GB, rc, log
+   'db2039'  => 0,   # C6 2.9TB 160GB, master, partitioned!
+   # 'db2028'  => 0,   # B6 2.9TB  96GB, old master, to be 
decom.
'db2046'  => 400, # C6 2.9TB 160GB
'db2053'  => 100, # D6 2.9TB 160GB, dump (inactive), vslow
'db2060'  => 100, # D6 3.3TB 160GB, api
@@ -432,27 +432,22 @@
],
's6' => [
'watchlist' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'recentchanges' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'recentchangeslinked' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'contributions' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],
'logpager' => [
-   'db2039' => 1,
'db2087:3316' => 1,
'db2089:3316' => 1,
],

-- 
To view, visit https://gerrit.wikimedia.org/r/401734
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I77fcdfac11c84c1ae68a5adecf55b87410110177
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Echo[master]: Fix "Mark as read" button icon on no-JS

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401738 )

Change subject: Fix "Mark as read" button icon on no-JS
..


Fix "Mark as read" button icon on no-JS

Bug: T182167
Change-Id: I2c386e1ab2c95d2d1034c8d366d39c12827b3d22
---
M modules/styles/LabelIconWidget.less
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  Catrope: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/styles/LabelIconWidget.less 
b/modules/styles/LabelIconWidget.less
index 9aec81f..bffd2a8 100644
--- a/modules/styles/LabelIconWidget.less
+++ b/modules/styles/LabelIconWidget.less
@@ -1,5 +1,6 @@
 .oo-ui-labelIconWidget {
display: table;
+   padding-left: 1.5em;
 }
 
 .oo-ui-labelIconWidget-row {
@@ -10,4 +11,8 @@
display: table-cell;
vertical-align: middle;
}
+
+   .oo-ui-iconElement-icon {
+   left: 0.5em;
+   }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401738
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2c386e1ab2c95d2d1034c8d366d39c12827b3d22
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Petar.petkovic 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: add compute profiles for labtestn virt role

[Rush (Code Review)]

Rush has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401740 )

Change subject: nova: add compute profiles for labtestn virt role
..

nova: add compute profiles for labtestn virt role

Change-Id: I1970761282ce32530528a013988eb6000b01503f
---
M modules/role/manifests/wmcs/openstack/labtestn/virt.pp
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/40/401740/1

diff --git a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp 
b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
index 6832d63..81d0331 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
@@ -2,4 +2,6 @@
 system::role { $name: }
 include ::standard
 include ::profile::openstack::labtestn::cloudrepo
+include ::profile::openstack::labtestn::nova::common
+include ::profile::openstack::labtestn::nova::compute::service
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1970761282ce32530528a013988eb6000b01503f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: add compute profiles for labtestn virt role

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401740 )

Change subject: nova: add compute profiles for labtestn virt role
..


nova: add compute profiles for labtestn virt role

Change-Id: I1970761282ce32530528a013988eb6000b01503f
---
M modules/role/manifests/wmcs/openstack/labtestn/virt.pp
1 file changed, 2 insertions(+), 0 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp 
b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
index 6832d63..81d0331 100644
--- a/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
+++ b/modules/role/manifests/wmcs/openstack/labtestn/virt.pp
@@ -2,4 +2,6 @@
 system::role { $name: }
 include ::standard
 include ::profile::openstack::labtestn::cloudrepo
+include ::profile::openstack::labtestn::nova::common
+include ::profile::openstack::labtestn::nova::compute::service
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401740
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1970761282ce32530528a013988eb6000b01503f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Promote db2039 to be the new master of s6-codfw

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401706 )

Change subject: mariadb: Promote db2039 to be the new master of s6-codfw
..


mariadb: Promote db2039 to be the new master of s6-codfw

Bug: T176243
Change-Id: I62eec3ca94263dbaba21434a8d7494df0d11dbfc
---
M hieradata/hosts/db2028.yaml
M hieradata/hosts/db2039.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_codfw.yaml
4 files changed, 6 insertions(+), 8 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/hieradata/hosts/db2028.yaml b/hieradata/hosts/db2028.yaml
index 161cc96..7308ffb 100644
--- a/hieradata/hosts/db2028.yaml
+++ b/hieradata/hosts/db2028.yaml
@@ -1,4 +1 @@
 mariadb::shard: 's6'
-mariadb::mysql_role: 'master'
-mariadb::binlog_format: 'STATEMENT'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2039.yaml b/hieradata/hosts/db2039.yaml
index f41d15a..85f9a4a 100644
--- a/hieradata/hosts/db2039.yaml
+++ b/hieradata/hosts/db2039.yaml
@@ -1,2 +1,3 @@
 mariadb::shard: 's6'
-mariadb::socket: '/tmp/mysql.sock'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/manifests/site.pp b/manifests/site.pp
index 91b2dcf..89fa933 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -419,11 +419,11 @@
 
 # s6 core production dbs on codfw
 # codfw master
-node 'db2028.codfw.wmnet' {
+node 'db2039.codfw.wmnet' {
 role(mariadb::core)
 }
 
-node /^db20(39|46|53|60|67|76)\.codfw\.wmnet/ {
+node /^db20(28|46|53|60|67|76)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_codfw.yaml 
b/modules/role/files/prometheus/mysql-core_codfw.yaml
index bc0eda4..57fb140 100644
--- a/modules/role/files/prometheus/mysql-core_codfw.yaml
+++ b/modules/role/files/prometheus/mysql-core_codfw.yaml
@@ -91,7 +91,7 @@
 shard: s6
 role: slave
   targets:
-  - db2039:9104
+  - db2028:9104
   - db2046:9104
   - db2053:9104
   - db2060:9104
@@ -103,7 +103,7 @@
 shard: s6
 role: master
   targets:
-  - db2028:9104
+  - db2039:9104
 
 - labels:
 shard: s7

-- 
To view, visit https://gerrit.wikimedia.org/r/401706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I62eec3ca94263dbaba21434a8d7494df0d11dbfc
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1086"

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401726 )

Change subject: Revert "db-eqiad.php: Depool db1086"
..


Revert "db-eqiad.php: Depool db1086"

This reverts commit 3bcde968667bcea4f3f1abfbd800fc25f66d16ef.

Change-Id: Ic9866f41c63799d19a0ce7ead55e9a3558c9b4c9
---
M wmf-config/db-eqiad.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 8147427..520ce91 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -163,8 +163,8 @@
'db1062' => 0,   # D4 2.8TB 128GB, master
# 'db1039' => 0,   # B2 1.4TB  64GB # T163190
'db1069' => 0,   # D1 2.8TB 160GB, vslow, dump, old master
-   'db1079' => 200, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
-   # 'db1086' => 500, # B3 3.6TB 512GB, api # T174569
+   'db1079' => 300, # A2 3.6TB 512GB, api #master for db1102 
(sanitarium 3)
+   'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
@@ -452,7 +452,7 @@
],
'api' => [
'db1079' => 100,
-   # 'db1086' => 1,
+   'db1086' => 1,
],
'watchlist' => [
'db1098:3317' => 1,

-- 
To view, visit https://gerrit.wikimedia.org/r/401726
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic9866f41c63799d19a0ce7ead55e9a3558c9b4c9
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Fix detection of WikiEditor and toolbar

[WMDE-Fisch (Code Review)]

WMDE-Fisch has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401728 )

Change subject: Fix detection of WikiEditor and toolbar
..

Fix detection of WikiEditor and toolbar

See changes done in I7677f0b597c33f236192aea1aaa347a36216fbb7

Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Depends-On: I7677f0b597c33f236192aea1aaa347a36216fbb7
---
M includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/28/401728/1

diff --git a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php 
b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
index 2f902c5..560eacd 100644
--- a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
@@ -555,7 +555,8 @@
}
 
private function wikiEditorIsEnabled() {
-   return class_exists( WikiEditorHooks::class ) && 
WikiEditorHooks::isEnabled( 'toolbar' );
+   return ExtensionRegistry::getInstance()->isLoaded( 'WikiEditor' 
) &&
+   $this->out->getUser()->getOption( 'usebetatoolbar' );
}
 
private function deactivateWikEd() {

-- 
To view, visit https://gerrit.wikimedia.org/r/401728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::graphite::alerts: add Druid realtime ingestion monitoring

[Elukey (Code Review)]

Elukey has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401730 )

Change subject: role::graphite::alerts: add Druid realtime ingestion monitoring
..

role::graphite::alerts: add Druid realtime ingestion monitoring

Change-Id: Ic955b3295f5d10472d47dcb11ffae082232dd694
---
M modules/role/manifests/graphite/alerts.pp
1 file changed, 13 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/30/401730/1

diff --git a/modules/role/manifests/graphite/alerts.pp 
b/modules/role/manifests/graphite/alerts.pp
index 8a2a317..a717a2b 100644
--- a/modules/role/manifests/graphite/alerts.pp
+++ b/modules/role/manifests/graphite/alerts.pp
@@ -103,4 +103,17 @@
 from=> '10min',
 percentage  => 50,
 }
+
+# Monitor Druid realtime ingestion event rate.
+# Experimental, only alerting the Analytics alias.
+monitoring::check_prometheus { 'druid_realtime_banner_activity':
+description => 'Number of banner_activity realtime events received 
by Druid over a 30 minutes period',
+query   => 
'sum_over_time(druid_realtime_ingest_events_processed_count{cluster="druid_analytics",
 instance=~"druid.*:8000", datasource=~"banner_activity_minutely"}[30m])',
+prometheus_url  => "http://prometheus.svc.${::site}.wmnet/analytics;,
+method  => 'le'
+warning => 10,
+critical=> 0,
+contact_group   => 'analytics',
+dashboard_links => 
['https://grafana.wikimedia.org/dashboard/db/prometheus-druid?refresh=1m=41=1']
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic955b3295f5d10472d47dcb11ffae082232dd694
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add text to tab links telling if they do exist

[Albert221 (Code Review)]

Albert221 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401733 )

Change subject: Add text to tab links telling if they do exist
..

Add text to tab links telling if they do exist

And changed a little bit signature of Linker::titleAttrib
and Linker::tooltipAndAcceskeyAttribs. Added $options
parameter to the second one and made $options parameter
satisfied by passing an array with options, because there
is one more now: 'nonexisting' which tells to add text
about the thing that the page does not exist to its tooltip.

Bug: T19099
Change-Id: Ia76dd6db363f6add5efb8955be9e23a1f8e8476f
---
M includes/Linker.php
M includes/skins/BaseTemplate.php
M includes/skins/SkinTemplate.php
M languages/i18n/en.json
M languages/i18n/qqq.json
5 files changed, 38 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/33/401733/1

diff --git a/includes/Linker.php b/includes/Linker.php
index 84e3103..8eb0b1a 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1968,8 +1968,9 @@
 *
 * @since 1.16.3 $msgParams added in 1.27
 * @param string $name Id of the element, minus prefixes.
-* @param string|null $options Null or the string 'withaccess' to add 
an access-
-*   key hint
+* @param string|array|null $options Null or the string or array 
containing some of the following options:
+*   - 'withaccess' to add an access-key hint
+*   - 'nonexisting' to add an accessibility hint that page does not 
exist
 * @param array $msgParams Parameters to pass to the message
 *
 * @return string Contents of the title attribute (which you must HTML-
@@ -1989,7 +1990,17 @@
}
}
 
-   if ( $options == 'withaccess' ) {
+   $options = (array)$options;
+
+   if ( in_array( 'nonexisting', $options ) ) {
+   if ( $tooltip === false || $tooltip === '' ) {
+   $tooltip = wfMessage( 'nonexisting' )->text();
+   } else {
+   $tooltip .= wfMessage( 'word-separator' 
)->text();
+   $tooltip .= wfMessage( 'nonexisting' )->text();
+   }
+   }
+   if ( in_array( 'withaccess', $options ) ) {
$accesskey = self::accesskey( $name );
if ( $accesskey !== false ) {
// Should be build the same as in 
jquery.accessKeyLabel.js
@@ -2132,12 +2143,18 @@
 * @since 1.16.3. $msgParams introduced in 1.27
 * @param string $name
 * @param array $msgParams Params for constructing the message
+* @param string|null $options Options to be passed to titleAttrib.
+*
+* @see Linker::titleAttrib
 *
 * @return array
 */
-   public static function tooltipAndAccesskeyAttribs( $name, array 
$msgParams = [] ) {
+   public static function tooltipAndAccesskeyAttribs( $name, array 
$msgParams = [], $options = null ) {
+   $options = (array)$options;
+   $options[] = 'withaccess';
+
$attribs = [
-   'title' => self::titleAttrib( $name, 'withaccess', 
$msgParams ),
+   'title' => self::titleAttrib( $name, $options, 
$msgParams ),
'accesskey' => self::accesskey( $name )
];
if ( $attribs['title'] === false ) {
diff --git a/includes/skins/BaseTemplate.php b/includes/skins/BaseTemplate.php
index f0b336a..1cff694 100644
--- a/includes/skins/BaseTemplate.php
+++ b/includes/skins/BaseTemplate.php
@@ -143,7 +143,7 @@
if ( isset( $plink['active'] ) ) {
$ptool['active'] = $plink['active'];
}
-   foreach ( [ 'href', 'class', 'text', 'dir', 'data' ] as 
$k ) {
+   foreach ( [ 'href', 'class', 'text', 'dir', 'data', 
'exists' ] as $k ) {
if ( isset( $plink[$k] ) ) {
$ptool['links'][0][$k] = $plink[$k];
}
@@ -391,7 +391,7 @@
if ( isset( $item['href'] ) || isset( $options['link-fallback'] 
) ) {
$attrs = $item;
foreach ( [ 'single-id', 'text', 'msg', 'tooltiponly', 
'context', 'primary',
-   'tooltip-params' ] as $k ) {
+   'tooltip-params', 'exists' ] as $k ) {
unset( $attrs[$k] );
}
 
@@ -412,13 +412,15 @@
}
 
if ( isset( $item['single-id'] ) ) {
+   $tooltipOption = isset( 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Make the tour module depend on ext.guidedTour

[Catrope (Code Review)]

Catrope has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401739 )

Change subject: Make the tour module depend on ext.guidedTour
..

Make the tour module depend on ext.guidedTour

Otherwise, JS errors happen because mw.guidedTour doesn't exist:

Uncaught TypeError: Cannot read property 'TourBuilder' of undefined

Change-Id: I41f6abc1fdf6b6f3b7ed6c1203aa6e56f611c153
---
M Hooks.php
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow 
refs/changes/39/401739/1

diff --git a/Hooks.php b/Hooks.php
index ce482be..c236a06 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -83,7 +83,8 @@

"flow-guidedtour-optin-find-old-conversations-description",

"flow-guidedtour-optin-feedback",

"flow-guidedtour-optin-feedback-description"
-   ]
+   ],
+   'dependencies' => 'ext.guidedTour',
] );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I41f6abc1fdf6b6f3b7ed6c1203aa6e56f611c153
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...scap[master]: add wmflabs config for dumps scap

[ArielGlenn (Code Review)]

ArielGlenn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400598 )

Change subject: add wmflabs config for dumps scap
..


add wmflabs config for dumps scap

Change-Id: I5b2b4fa35987f64cb74811ec39a98faf35752477
---
A dumps_targets_betacluster
M scap.cfg
2 files changed, 5 insertions(+), 0 deletions(-)

Approvals:
  ArielGlenn: Verified; Looks good to me, approved



diff --git a/dumps_targets_betacluster b/dumps_targets_betacluster
new file mode 100644
index 000..2419e87
--- /dev/null
+++ b/dumps_targets_betacluster
@@ -0,0 +1,2 @@
+deployment-snapshot01.deployment-prep.eqiad.wmflabs
+
diff --git a/scap.cfg b/scap.cfg
index 99348a9..ac1f466 100644
--- a/scap.cfg
+++ b/scap.cfg
@@ -3,3 +3,6 @@
 git_deploy_dir: /srv/deployment
 ssh_user: dumpsgen
 dsh_targets: dumps_targets
+
+[deployment-prep.eqiad.wmflabs]
+dsh_targets: dumps_targets_betacluster

-- 
To view, visit https://gerrit.wikimedia.org/r/400598
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5b2b4fa35987f64cb74811ec39a98faf35752477
Gerrit-PatchSet: 2
Gerrit-Project: operations/dumps/scap
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: Thcipriani 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Use posix_name to make ci docker group unique

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401698 )

Change subject: admin: Use posix_name to make ci docker group unique
..

admin: Use posix_name to make ci docker group unique

Use the posix_name attribute, allowing us to rename the docker ci
related group and making it uniqueu, alieviating the pain that could
arise from conflicting users requesting docker access

Change-Id: Ie50f35a0a66592f1eecaa0764d4e3b6c55736f46
---
M hieradata/role/common/ci/master.yaml
M modules/admin/data/data.yaml
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/98/401698/1

diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index fb227af..59e859e 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -2,7 +2,7 @@
   - contint-users
   - contint-admins
   - contint-roots
-  - docker
+  - contint-docker
 cluster: misc
 contactgroups: 'admins,contint'
 
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 706c5e3..83fb8bf 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -641,11 +641,11 @@
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
  'ALL = (syslog) NOPASSWD: ALL']
-  docker:
+  contint-docker:
 # Generally speaking, avoiding direct docker access is the most prudent 
course of action, but if
 # needed the docker group does have elevated privileges allowing users to 
interact with docker
-# This has the potential of conflicting with other users asking 
permissions to run docker. IFF
-# such a need arises we might want to revisit this
+# Allow this for CI users. There is no gid on purpose, to allow reusing 
the package provided one
+posix_name: docker # Use posix_name to avoid potential conflicts with 
other uses of the docker group
 description: Allow releng team to be in the docker group for contint. No 
gid on purpose
 members: [akosiaris, dduvall, demon, gjg, hashar, thcipriani, 
twentyafterfour, zfilipin]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie50f35a0a66592f1eecaa0764d4e3b6c55736f46
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: tcpircbot: convert role to profile

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400250 )

Change subject: tcpircbot: convert role to profile
..


tcpircbot: convert role to profile

Change-Id: I8aeb27f380c71ba090247b22ac6fa01135166f68
---
A modules/profile/manifests/tcpircbot.pp
M modules/role/manifests/tcpircbot.pp
2 files changed, 61 insertions(+), 51 deletions(-)

Approvals:
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/tcpircbot.pp 
b/modules/profile/manifests/tcpircbot.pp
new file mode 100644
index 000..6e33d0d
--- /dev/null
+++ b/modules/profile/manifests/tcpircbot.pp
@@ -0,0 +1,57 @@
+class profile::tcpircbot(
+$ensure='present',
+){
+
+include passwords::logmsgbot
+
+tcpircbot::instance { 'logmsgbot':
+ensure   => $ensure,
+channels => '#wikimedia-operations',
+password => $passwords::logmsgbot::logmsgbot_password,
+cidr => [
+':::127.0.0.1/128', # loopback
+':::10.64.32.167/128',  # logging: eventlog1001
+':::10.64.0.196/128',   # deployment eqiad v4: tin
+'2620:0:861:101:10:64:0:196/128',   # deployment eqiad v6: tin
+':::10.192.32.22/128',  # deployment codfw v4: naos
+'2620:0:860:103:10:192:32:22/128',  # deployment codfw v6: naos
+':::10.64.32.13/128',   # maintenance eqiad v4: terbium
+'2620:0:861:103:10:64:32:13/64',# maintenance eqiad v6: terbium
+':::10.192.48.45/128',  # maintenance codfw v4: wasat
+'2620:0:860:104:10:192:48:45/64',   # maintenance codfw v6: wasat
+':::10.64.16.73/128',   # puppetmaster1001.eqiad.wmnet
+'2620:0:861:102:10:64:16:73/128',   # puppetmaster1001.eqiad.wmnet
+':::10.192.0.27/128',   # puppetmaster2001.codfw.wmnet
+'2620:0:860:101:10:192:0:27/128',   # puppetmaster2001.codfw.wmnet
+':::10.64.32.20/128',   # neodymium.eqiad.wmnet
+'2620:0:861:103:10:64:32:20/64',# neodymium.eqiad.wmnet
+':::10.192.0.140/128',  # sarin.codfw.wmnet
+'2620:0:860:101:10:192:0:140/64',   # sarin.codfw.wmnet
+],
+}
+if $ensure == 'present' {
+nrpe::monitor_service { 'tcpircbot':
+description  => 'tcpircbot_service_running',
+nrpe_command => '/usr/lib/nagios/plugins/check_procs -w 1:1 -c 1:1 
-C python -a tcpircbot.py',
+}
+}
+
+$allowed_hosts = [
+'eventlog1001.eqiad.wmnet', # logging eqiad
+'tin.eqiad.wmnet',  # deployment eqiad
+'naos.codfw.wmnet', # deployment codfw
+'puppetmaster1001.eqiad.wmnet', # puppet eqiad
+'puppetmaster2001.codfw.wmnet', # puppet codfw
+'terbium.eqiad.wmnet',  # maintenance eqiad
+'wasat.codfw.wmnet',# maintenance codfw
+'neodymium.eqiad.wmnet',# cluster mgmt eqiad
+'sarin.codfw.wmnet',# cluster mgmt codfw
+]
+
+$allowed_hosts_ferm = join($allowed_hosts, ' ')
+ferm::service { 'tcpircbot_allowed':
+proto  => 'tcp',
+port   => '9200',
+srange => "(@resolve((${allowed_hosts_ferm})) 
@resolve((${allowed_hosts_ferm}), ))",
+}
+}
diff --git a/modules/role/manifests/tcpircbot.pp 
b/modules/role/manifests/tcpircbot.pp
index b1f1da4..8a4799f 100644
--- a/modules/role/manifests/tcpircbot.pp
+++ b/modules/role/manifests/tcpircbot.pp
@@ -1,59 +1,12 @@
-class role::tcpircbot($ensure='present') {
-include ::tcpircbot
-include passwords::logmsgbot
+class role::tcpircbot {
 
 system::role { 'tcpircbot':
 description => 'tcpircbot server',
 }
 
-tcpircbot::instance { 'logmsgbot':
-ensure   => $ensure,
-channels => '#wikimedia-operations',
-password => $passwords::logmsgbot::logmsgbot_password,
-cidr => [
-':::127.0.0.1/128', # loopback
-':::10.64.32.167/128',  # logging: eventlog1001
-':::10.64.0.196/128',   # deployment eqiad v4: tin
-'2620:0:861:101:10:64:0:196/128',   # deployment eqiad v6: tin
-':::10.192.32.22/128',  # deployment codfw v4: naos
-'2620:0:860:103:10:192:32:22/128',  # deployment codfw v6: naos
-':::10.64.32.13/128',   # maintenance eqiad v4: terbium
-'2620:0:861:103:10:64:32:13/64',# maintenance eqiad v6: terbium
-':::10.192.48.45/128',  # maintenance codfw v4: wasat
-'2620:0:860:104:10:192:48:45/64',   # maintenance codfw v6: wasat
-':::10.64.16.73/128',   # 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove editable flag in EntityParserOutputGenerator

[WMDE-leszek (Code Review)]

WMDE-leszek has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401699 )

Change subject: Remove editable flag in EntityParserOutputGenerator
..

Remove editable flag in EntityParserOutputGenerator

Also removes no longer used EmptyEditSectionGenerator.

This is resubmitting the other part of commit
e70e72b3f124a4f8fcd8891bbb0595c7a2eff0e0.

Bug: T182767
Change-Id: Iee499eb26e1746e623f2c7847e235fd073ed1663
---
M repo/includes/Content/EntityContent.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/resources/wikibase.ui.entityViewInit.js
M 
repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
M view/autoload.php
D view/src/EmptyEditSectionGenerator.php
M view/src/StatementHtmlGenerator.php
D view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/StatementHtmlGeneratorTest.php
11 files changed, 14 insertions(+), 193 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/99/401699/1

diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index e5605ff..bfe1061 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -262,8 +262,7 @@
$entityParserOutputGeneratorFactory = 
WikibaseRepo::getDefaultInstance()->getEntityParserOutputGeneratorFactory();
 
$outputGenerator = 
$entityParserOutputGeneratorFactory->getEntityParserOutputGenerator(
-   $options->getUserLang(),
-   true
+   $options->getUserLang()
);
 
$entityRevision = $this->getEntityRevision( $revisionId );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index c7d92ca..f779ae5 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -24,7 +24,6 @@
 use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
 use Wikibase\Repo\MediaWikiLocalizedTextProvider;
 use Wikibase\Repo\View\RepoSpecialPageLinker;
-use Wikibase\View\EmptyEditSectionGenerator;
 use Wikibase\View\LocalizedTextProvider;
 use Wikibase\View\Template\TemplateFactory;
 use Wikibase\View\TermsListView;
@@ -91,11 +90,6 @@
private $languageCode;
 
/**
-* @var bool
-*/
-   private $editable;
-
-   /**
 * @param DispatchingEntityViewFactory $entityViewFactory
 * @param ParserOutputJsConfigBuilder $configBuilder
 * @param EntityTitleLookup $entityTitleLookup
@@ -106,7 +100,6 @@
 * @param EntityDataFormatProvider $entityDataFormatProvider
 * @param ParserOutputDataUpdater[] $dataUpdaters
 * @param string $languageCode
-* @param bool $editable
 */
public function __construct(
DispatchingEntityViewFactory $entityViewFactory,
@@ -118,8 +111,7 @@
LocalizedTextProvider $textProvider,
EntityDataFormatProvider $entityDataFormatProvider,
array $dataUpdaters,
-   $languageCode,
-   $editable
+   $languageCode
) {
$this->entityViewFactory = $entityViewFactory;
$this->configBuilder = $configBuilder;
@@ -131,7 +123,6 @@
$this->entityDataFormatProvider = $entityDataFormatProvider;
$this->dataUpdaters = $dataUpdaters;
$this->languageCode = $languageCode;
-   $this->editable = $editable;
}
 
/**
@@ -293,11 +284,11 @@
$this->languageFallbackChain
);
 
-   $editSectionGenerator = $this->editable ? new 
ToolbarEditSectionGenerator(
+   $editSectionGenerator = new ToolbarEditSectionGenerator(
new RepoSpecialPageLinker(),
$this->templateFactory,
$this->textProvider
-   ) : new EmptyEditSectionGenerator();
+   );
 
$languageDirectionalityLookup = new 
MediaWikiLanguageDirectionalityLookup();
$languageNameLookup = new LanguageNameLookup( 
$this->languageCode );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php 
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index 481c971..a614fca 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -131,11 +131,10 @@
 * Creates an EntityParserOutputGenerator to create the ParserOutput 
for the entity

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Show references on the diff page

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401695 )

Change subject: Show references on the diff page
..


Show references on the diff page

This is resubmitting part of commit
e70e72b3f124a4f8fcd8891bbb0595c7a2eff0e0.

Bug: T182767
Change-Id: I7adc7b23bb0f201a5fe4197e70a5a710ec6a5795
---
M view/resources/wikibase/wikibase.less
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  WMDE-leszek: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/view/resources/wikibase/wikibase.less 
b/view/resources/wikibase/wikibase.less
index b84e2ed..bbbdeaf 100644
--- a/view/resources/wikibase/wikibase.less
+++ b/view/resources/wikibase/wikibase.less
@@ -515,7 +515,8 @@
 }
 
 /* Some UI elements are initially hidden if JS is enabled */
-.client-js .wikibase-initially-collapsed {
+.client-js 
.wikibase-entitytermsview-entitytermsforlanguagelistview.wikibase-initially-collapsed,
+.client-js body:not( .wb-diffpage ):not( .wb-oldrevpage ) 
.wikibase-initially-collapsed {
display: none;
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401695
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7adc7b23bb0f201a5fe4197e70a5a710ec6a5795
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: WMDE-leszek 
Gerrit-Reviewer: Thiemo Kreuz (WMDE) 
Gerrit-Reviewer: WMDE-leszek 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Use posix_name to make ci docker group unique

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401698 )

Change subject: admin: Use posix_name to make ci docker group unique
..


admin: Use posix_name to make ci docker group unique

Use the posix_name attribute, allowing us to rename the docker ci
related group and making it uniqueu, alieviating the pain that could
arise from conflicting users requesting docker access

Change-Id: Ie50f35a0a66592f1eecaa0764d4e3b6c55736f46
---
M hieradata/role/common/ci/master.yaml
M modules/admin/data/data.yaml
2 files changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Alexandros Kosiaris: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/ci/master.yaml 
b/hieradata/role/common/ci/master.yaml
index fb227af..59e859e 100644
--- a/hieradata/role/common/ci/master.yaml
+++ b/hieradata/role/common/ci/master.yaml
@@ -2,7 +2,7 @@
   - contint-users
   - contint-admins
   - contint-roots
-  - docker
+  - contint-docker
 cluster: misc
 contactgroups: 'admins,contint'
 
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 706c5e3..83fb8bf 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -641,11 +641,11 @@
 privileges: ['ALL = NOPASSWD: /bin/journalctl *',
  'ALL = NOPASSWD: /bin/dmesg *',
  'ALL = (syslog) NOPASSWD: ALL']
-  docker:
+  contint-docker:
 # Generally speaking, avoiding direct docker access is the most prudent 
course of action, but if
 # needed the docker group does have elevated privileges allowing users to 
interact with docker
-# This has the potential of conflicting with other users asking 
permissions to run docker. IFF
-# such a need arises we might want to revisit this
+# Allow this for CI users. There is no gid on purpose, to allow reusing 
the package provided one
+posix_name: docker # Use posix_name to avoid potential conflicts with 
other uses of the docker group
 description: Allow releng team to be in the docker group for contint. No 
gid on purpose
 members: [akosiaris, dduvall, demon, gjg, hashar, thcipriani, 
twentyafterfour, zfilipin]
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401698
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie50f35a0a66592f1eecaa0764d4e3b6c55736f46
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: thumbor: use the canonical definition of logstash host

[Gehel (Code Review)]

Gehel has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399652 )

Change subject: thumbor: use the canonical definition of logstash host
..


thumbor: use the canonical definition of logstash host

Also extracts a profile::thumbor class to respect our puppet guidelines
at least on new hiera parameters.

Bug: T182304
Change-Id: I87bb508d633b6f39ead3e6075641db608bb9bbf4
---
M hieradata/common.yaml
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/codfw/thumbor/mediawiki.yaml
M hieradata/role/eqiad/thumbor/mediawiki.yaml
A modules/profile/manifests/thumbor.pp
M modules/role/manifests/thumbor/mediawiki.pp
6 files changed, 44 insertions(+), 34 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, but someone else must approve
  Gehel: Looks good to me, approved



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 2cfc1b1..71a9a87 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -522,7 +522,10 @@
 logstash_host: "logstash.svc.eqiad.wmnet"
 logstash_syslog_port: 10514
 logstash_gelf_port: 12201
+# TCP json_lines input
 logstash_json_lines_port: 11514
+# UDP logback/json input
+logstash_logback_port: 11514
 udp2log_aggregator: "udplog:8420"
 
 tcpircbot_host: 'icinga.wikimedia.org'
diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index f2c54ce..5bad6f5 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -140,10 +140,15 @@
   default_instance_params:
 rpc_address: '%{::ipaddress}'
 # end cassandra
-"udp2log_aggregator": deployment-fluorine02.deployment-prep.eqiad.wmflabs:8420
-"logstash_host": deployment-logstash2.deployment-prep.eqiad.wmflabs
-"logstash_syslog_port": 10514
-"logstash_gelf_port": 12201
+udp2log_aggregator: deployment-fluorine02.deployment-prep.eqiad.wmflabs:8420
+logstash_host: deployment-logstash2.deployment-prep.eqiad.wmflabs
+logstash_syslog_port: 10514
+logstash_gelf_port: 12201
+# TCP json_lines input
+logstash_json_lines_port: 11514
+# UDP logback/json input
+logstash_logback_port: 11514
+
 mediawiki_memcached_servers:
 - 10.68.23.25:11211:1  # deployment-memc04
 - 10.68.23.49:11211:1  # deployment-memc05
@@ -357,9 +362,6 @@
   recentchange:
 topics: ["%{::site}.mediawiki.recentchange"]
 profile::eventstreams::rdkafka_config: {}
-
-thumbor::logstash_host: 'deployment-logstash2.deployment-prep.eqiad.wmflabs'
-thumbor::logstash_port: 11514
 
 cache::be_transient_gb: 0
 cache::fe_transient_gb: 0
diff --git a/hieradata/role/codfw/thumbor/mediawiki.yaml 
b/hieradata/role/codfw/thumbor/mediawiki.yaml
index 9dd4e02..634df35 100644
--- a/hieradata/role/codfw/thumbor/mediawiki.yaml
+++ b/hieradata/role/codfw/thumbor/mediawiki.yaml
@@ -17,7 +17,4 @@
 
 thumbor::poolcounter_server: 'poolcounter2001.codfw.wmnet'
 
-thumbor::logstash_host: 'logstash.svc.eqiad.wmnet'
-thumbor::logstash_port: 11514
-
 thumbor::stl_support: true
diff --git a/hieradata/role/eqiad/thumbor/mediawiki.yaml 
b/hieradata/role/eqiad/thumbor/mediawiki.yaml
index 12ac392..4163d6c 100644
--- a/hieradata/role/eqiad/thumbor/mediawiki.yaml
+++ b/hieradata/role/eqiad/thumbor/mediawiki.yaml
@@ -17,7 +17,4 @@
 
 thumbor::poolcounter_server: 'poolcounter1001.eqiad.wmnet'
 
-thumbor::logstash_host: 'logstash.svc.eqiad.wmnet'
-thumbor::logstash_port: 11514
-
 thumbor::stl_support: true
diff --git a/modules/profile/manifests/thumbor.pp 
b/modules/profile/manifests/thumbor.pp
new file mode 100644
index 000..c31fa2e
--- /dev/null
+++ b/modules/profile/manifests/thumbor.pp
@@ -0,0 +1,31 @@
+class profile::thumbor(
+$memcached_servers_nutcracker = 
hiera('thumbor_memcached_servers_nutcracker'),
+$logstash_host = hiera('logstash_host'),
+$logstash_port = hiera('logstash_logback_port'),
+$swift_sharded_containers = 
hiera_array('swift::proxy::shard_container_list'),
+) {
+
+class { '::thumbor::nutcracker':
+thumbor_memcached_servers => $memcached_servers_nutcracker,
+}
+
+class { '::thumbor':
+logstash_host => $logstash_host,
+logstash_port => $logstash_port,
+}
+
+include ::swift::params
+$swift_account_keys = $::swift::params::account_keys
+
+class { '::thumbor::swift':
+swift_key=> $swift_account_keys['mw_thumbor'],
+swift_sharded_containers => $swift_sharded_containers,
+}
+
+ferm::service { 'thumbor':
+proto  => 'tcp',
+port   => '8800',
+srange => '$DOMAIN_NETWORKS',
+}
+
+}
\ No newline at end of file
diff --git a/modules/role/manifests/thumbor/mediawiki.pp 
b/modules/role/manifests/thumbor/mediawiki.pp
index 6214b4c..88f5943 100644
--- a/modules/role/manifests/thumbor/mediawiki.pp
+++ b/modules/role/manifests/thumbor/mediawiki.pp
@@ -10,28 +10,8 @@
 include ::mediawiki::packages::fonts
 include 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Remove editable flag in EntityParserOutputGenerator

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401699 )

Change subject: Remove editable flag in EntityParserOutputGenerator
..


Remove editable flag in EntityParserOutputGenerator

Also removes no longer used EmptyEditSectionGenerator.

This is resubmitting the other part of commit
e70e72b3f124a4f8fcd8891bbb0595c7a2eff0e0.

Bug: T182767
Change-Id: Iee499eb26e1746e623f2c7847e235fd073ed1663
---
M repo/includes/Content/EntityContent.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/resources/wikibase.ui.entityViewInit.js
M 
repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
M view/autoload.php
D view/src/EmptyEditSectionGenerator.php
M view/src/StatementHtmlGenerator.php
D view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/StatementHtmlGeneratorTest.php
11 files changed, 14 insertions(+), 193 deletions(-)

Approvals:
  WMDE-leszek: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index e5605ff..bfe1061 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -262,8 +262,7 @@
$entityParserOutputGeneratorFactory = 
WikibaseRepo::getDefaultInstance()->getEntityParserOutputGeneratorFactory();
 
$outputGenerator = 
$entityParserOutputGeneratorFactory->getEntityParserOutputGenerator(
-   $options->getUserLang(),
-   true
+   $options->getUserLang()
);
 
$entityRevision = $this->getEntityRevision( $revisionId );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index c7d92ca..f779ae5 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -24,7 +24,6 @@
 use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
 use Wikibase\Repo\MediaWikiLocalizedTextProvider;
 use Wikibase\Repo\View\RepoSpecialPageLinker;
-use Wikibase\View\EmptyEditSectionGenerator;
 use Wikibase\View\LocalizedTextProvider;
 use Wikibase\View\Template\TemplateFactory;
 use Wikibase\View\TermsListView;
@@ -91,11 +90,6 @@
private $languageCode;
 
/**
-* @var bool
-*/
-   private $editable;
-
-   /**
 * @param DispatchingEntityViewFactory $entityViewFactory
 * @param ParserOutputJsConfigBuilder $configBuilder
 * @param EntityTitleLookup $entityTitleLookup
@@ -106,7 +100,6 @@
 * @param EntityDataFormatProvider $entityDataFormatProvider
 * @param ParserOutputDataUpdater[] $dataUpdaters
 * @param string $languageCode
-* @param bool $editable
 */
public function __construct(
DispatchingEntityViewFactory $entityViewFactory,
@@ -118,8 +111,7 @@
LocalizedTextProvider $textProvider,
EntityDataFormatProvider $entityDataFormatProvider,
array $dataUpdaters,
-   $languageCode,
-   $editable
+   $languageCode
) {
$this->entityViewFactory = $entityViewFactory;
$this->configBuilder = $configBuilder;
@@ -131,7 +123,6 @@
$this->entityDataFormatProvider = $entityDataFormatProvider;
$this->dataUpdaters = $dataUpdaters;
$this->languageCode = $languageCode;
-   $this->editable = $editable;
}
 
/**
@@ -293,11 +284,11 @@
$this->languageFallbackChain
);
 
-   $editSectionGenerator = $this->editable ? new 
ToolbarEditSectionGenerator(
+   $editSectionGenerator = new ToolbarEditSectionGenerator(
new RepoSpecialPageLinker(),
$this->templateFactory,
$this->textProvider
-   ) : new EmptyEditSectionGenerator();
+   );
 
$languageDirectionalityLookup = new 
MediaWikiLanguageDirectionalityLookup();
$languageNameLookup = new LanguageNameLookup( 
$this->languageCode );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php 
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index 481c971..a614fca 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -131,11 +131,10 @@
 * Creates an EntityParserOutputGenerator to create the ParserOutput 
for the entity
 *
   

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: add yubikey for ema

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401702 )

Change subject: admin: add yubikey for ema
..

admin: add yubikey for ema

Change-Id: I73a6eed15fdd239fc6cd3fe4311593549f7fc542
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/02/401702/1

diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 73cdcb2..41f751d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2061,6 +2061,7 @@
 realname: Emanuele Rocca
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCfoCT4+pXcLRk3jsZsxFsAtVP38Rs4pfdxSS05+hkMcN1yxi2R1ZeNFkQkCPo6s25Gq863ru5E/vxSjy9mDS4HeaxNSJlPPWD0iEmGdyCg+wEGAZ01n1muFDyb+oiSNy5JcgOk0ZqAPNPYlISKVp+vLro5txdEK8cySy4BIbiM5ygKIjmq1xP+dM9zVdd/UbVQPPBFS2UDBzLX3AeYen4biMx2GkHBpZ/nJLqtb9JE4LLzQAtrqi4+J9jKQGepeTemVQ/n3lbheiGmTDZbRsUx7GTXmdIOPqN4k6FEXEgMIe5plxV8YeAoWqMsGpln4J4bz9HCtM1dL5mdLsa7tkq/
 ema@orion
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCZ4V90QtsYJ4QuykOcVJQPJ64S5wkQdus7N4W8km9LChzvD/dgu/K2NbvRpUSVki+JGGIi8rPyUpGi+ELYd0E6ul3izSnIsMfyTSHqM/craBe8CPmoiFEHKIkXmOGvl1HHczaeziotFVkBm6D5e7MEuz2QJc83XT95trwjZW+e8Cz6f6xW+SGcWDCqOceI6n3wc0PwnWUKZVum2nU71FFZlcCg/fL5srLPis3GWU3zfTmZpvHmXnBE5fFEd6wzQOoSNPHVpehtbgIIrFh5KU5j5HhksHyRZAez+LM19VuZyYOeqUkmIiGq/3hHn+npCOR/r51Lf1Smua+GPyEQNqbn
 ema@newbikey
 uid: 4565
 email: ero...@wikimedia.org
   elukey:

-- 
To view, visit https://gerrit.wikimedia.org/r/401702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I73a6eed15fdd239fc6cd3fe4311593549f7fc542
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap: Amend to rename docker to contint-docker

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401700 )

Change subject: openldap: Amend to rename docker to contint-docker
..

openldap: Amend to rename docker to contint-docker

Followup for Ie50f35a0a66592 where docker was renamed to contint-docker

Change-Id: I3090c2a544d28effb426ce12b1601817c0605554
---
M modules/openldap/files/cross-validate-accounts.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/00/401700/1

diff --git a/modules/openldap/files/cross-validate-accounts.py 
b/modules/openldap/files/cross-validate-accounts.py
index 4c85f22..a54a87f 100644
--- a/modules/openldap/files/cross-validate-accounts.py
+++ b/modules/openldap/files/cross-validate-accounts.py
@@ -224,8 +224,12 @@
 # statistics-privatedata-users enables mysql access as well
 # deploy-phabricator concerns handling of keyholder for 
deployment
 # analytics-search-users concerns user creation in HDFS
+# contint-docker is about being able to issue docker commands
+# directly and execute scripts issuing docker commands
 groups.difference_update(['analytics-privatedata-users', 
'gitpuppet', 'ops',
-  'researchers', 
'statistics-privatedata-users', 'docker',
+  'researchers',
+  'statistics-privatedata-users',
+  'contint-docker',
   'deploy-phabricator', 
'analytics-search-users'])
 if len(set(groups)) > 0:
 log += "Malformed membership for ops user " + i + ", has 
additional group(s): "

-- 
To view, visit https://gerrit.wikimedia.org/r/401700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3090c2a544d28effb426ce12b1601817c0605554
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: Flatten 2 levels of arrays in unique_users

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401701 )

Change subject: admin: Flatten 2 levels of arrays in unique_users
..

admin: Flatten 2 levels of arrays in unique_users

This should allow creating complex arrays of 2 levels deep, that is
allowing an array of users containing another array. This will make it
possible to include groups into groups

Change-Id: Ia9d88bb5e2e63918127e9288699f60641525b1cb
---
M modules/admin/lib/puppet/parser/functions/unique_users.rb
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/01/401701/1

diff --git a/modules/admin/lib/puppet/parser/functions/unique_users.rb 
b/modules/admin/lib/puppet/parser/functions/unique_users.rb
index ec62765..3c98778 100644
--- a/modules/admin/lib/puppet/parser/functions/unique_users.rb
+++ b/modules/admin/lib/puppet/parser/functions/unique_users.rb
@@ -8,6 +8,6 @@
 users.push(myhash['groups'][group]['members'])
 end
 end
-return users.flatten(1).uniq
+return users.flatten(2).uniq
 end
 end

-- 
To view, visit https://gerrit.wikimedia.org/r/401701
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9d88bb5e2e63918127e9288699f60641525b1cb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: admin: add yubikey for ema

[Ema (Code Review)]

Ema has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401702 )

Change subject: admin: add yubikey for ema
..


admin: add yubikey for ema

Change-Id: I73a6eed15fdd239fc6cd3fe4311593549f7fc542
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Ema: Verified; Looks good to me, approved



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 83fb8bf..5abd19a 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -2061,6 +2061,7 @@
 realname: Emanuele Rocca
 ssh_keys:
   - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCfoCT4+pXcLRk3jsZsxFsAtVP38Rs4pfdxSS05+hkMcN1yxi2R1ZeNFkQkCPo6s25Gq863ru5E/vxSjy9mDS4HeaxNSJlPPWD0iEmGdyCg+wEGAZ01n1muFDyb+oiSNy5JcgOk0ZqAPNPYlISKVp+vLro5txdEK8cySy4BIbiM5ygKIjmq1xP+dM9zVdd/UbVQPPBFS2UDBzLX3AeYen4biMx2GkHBpZ/nJLqtb9JE4LLzQAtrqi4+J9jKQGepeTemVQ/n3lbheiGmTDZbRsUx7GTXmdIOPqN4k6FEXEgMIe5plxV8YeAoWqMsGpln4J4bz9HCtM1dL5mdLsa7tkq/
 ema@orion
+  - ssh-rsa 
B3NzaC1yc2EDAQABAAABAQCZ4V90QtsYJ4QuykOcVJQPJ64S5wkQdus7N4W8km9LChzvD/dgu/K2NbvRpUSVki+JGGIi8rPyUpGi+ELYd0E6ul3izSnIsMfyTSHqM/craBe8CPmoiFEHKIkXmOGvl1HHczaeziotFVkBm6D5e7MEuz2QJc83XT95trwjZW+e8Cz6f6xW+SGcWDCqOceI6n3wc0PwnWUKZVum2nU71FFZlcCg/fL5srLPis3GWU3zfTmZpvHmXnBE5fFEd6wzQOoSNPHVpehtbgIIrFh5KU5j5HhksHyRZAez+LM19VuZyYOeqUkmIiGq/3hHn+npCOR/r51Lf1Smua+GPyEQNqbn
 ema@newbikey
 uid: 4565
 email: ero...@wikimedia.org
   elukey:

-- 
To view, visit https://gerrit.wikimedia.org/r/401702
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I73a6eed15fdd239fc6cd3fe4311593549f7fc542
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: hieradata: partial eqiad SMART metrics rollout

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401491 )

Change subject: hieradata: partial eqiad SMART metrics rollout
..


hieradata: partial eqiad SMART metrics rollout

Bug: T86552
Change-Id: I436fff25a02b55a86b3fe468f2dd9154b6da89c2
---
M hieradata/regex.yaml
1 file changed, 4 insertions(+), 0 deletions(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  Ottomata: Looks good to me, but someone else must approve
  Elukey: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, but someone else must approve
  Filippo Giunchedi: Looks good to me, approved
  Gehel: Looks good to me, but someone else must approve



diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index c715acb..d04a992 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -253,6 +253,10 @@
   __regex: !ruby/regexp /^.*\.ulsfo\.wmnet$/
   profile::base::check_smart: true
 
+smart_health_eqiad:
+  __regex: !ruby/regexp 
/^(analytics1028|aqs1004|conf1001|cp1045|db1039|db1001|db1087|db1011|druid1001|elastic1017|es1015|etcd1001|ganeti1001|graphite1001|kafka1001|kafka-jumbo1001|labmon1001|logstash1008|mw1180|maps1001|mc1019|ms-be1013|ms-be1039|ores1001|oresrdb1002|pc1004|sca1003|scb1001|thumbor1001).eqiad\.wmnet$/
+  profile::base::check_smart: true
+
 labtestpuppetmaster:
   __regex: !ruby/regexp /^labtestpuppetmaster.*\.wikimedia\.org$/
   puppetmaster: "puppetmaster2001.codfw.wmnet"

-- 
To view, visit https://gerrit.wikimedia.org/r/401491
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I436fff25a02b55a86b3fe468f2dd9154b6da89c2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: BBlack 
Gerrit-Reviewer: Chasemp 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Ema 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Ottomata 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CirrusSearch[master]: Use target wiki config when checking rescore profile

[DCausse (Code Review)]

DCausse has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401703 )

Change subject: Use target wiki config when checking rescore profile
..

Use target wiki config when checking rescore profile

Bug: T184008
Change-Id: Idc26150bc2f542090e52bab6ab5683731e9cf1cb
---
M includes/CirrusSearch.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CirrusSearch 
refs/changes/03/401703/1

diff --git a/includes/CirrusSearch.php b/includes/CirrusSearch.php
index a5a36ac..40e759b 100644
--- a/includes/CirrusSearch.php
+++ b/includes/CirrusSearch.php
@@ -346,7 +346,7 @@
 
if ( isset( 
$this->features[SearchEngine::FT_QUERY_INDEP_PROFILE_TYPE] ) ) {
$profile = 
$this->features[SearchEngine::FT_QUERY_INDEP_PROFILE_TYPE];
-   if ( $this->config->getElement( 
'CirrusSearchRescoreProfiles', $profile ) !== null ) {
+   if ( $config->getElement( 
'CirrusSearchRescoreProfiles', $profile ) !== null ) {

$searcher->getSearchContext()->setRescoreProfile( $profile );
}
}

-- 
To view, visit https://gerrit.wikimedia.org/r/401703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc26150bc2f542090e52bab6ab5683731e9cf1cb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: DCausse 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/slimapp[master]: Added methods for starting, committing and rolling back tran...

[Nehajha (Code Review)]

Nehajha has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401704 )

Change subject: Added methods for starting, committing and rolling back 
transactions
..

Added methods for starting, committing and rolling back transactions

Change-Id: I69da09ac3474ab5a9f1a59b15e691ffd70182d6c
---
M src/Dao/AbstractDao.php
1 file changed, 27 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/slimapp 
refs/changes/04/401704/1

diff --git a/src/Dao/AbstractDao.php b/src/Dao/AbstractDao.php
index d0c2f6f..b608578 100644
--- a/src/Dao/AbstractDao.php
+++ b/src/Dao/AbstractDao.php
@@ -44,6 +44,7 @@
 * @var LoggerInterface $logger
 */
protected $logger;
+   protected $transactionCounter = 0;
 
/**
 * @param string $dsn PDO data source name
@@ -62,6 +63,32 @@
);
}
 
+   protected function transactionStart() {
+   if ( $this->transactionCounter == 0 ) {
+   $this->transactionCounter++;
+   return $this->dbh->begintransaction();
+   }
+   $this->transactionCounter++;
+   return $this->transactionCounter >= 0;
+   }
+
+   protected function transactionCommit() {
+   $this->transactionCounter--;
+   if ( $this->transactionCounter == 0 ) {
+   return $this->dbh->commit();
+   }
+   return $this->transactionCounter >= 0;
+   }
+
+   protected function transactionRollback() {
+   if ( $this->transactionCounter >= 0 ) {
+   $this->transactionCounter = 0;
+   return $this->dbh->rollback();
+   }
+   $this->transactionCounter = 0;
+   return false;
+   }
+
/**
 * Bind values to a prepared statement.
 *

-- 
To view, visit https://gerrit.wikimedia.org/r/401704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69da09ac3474ab5a9f1a59b15e691ffd70182d6c
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/slimapp
Gerrit-Branch: master
Gerrit-Owner: Nehajha 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Properly close HC client in WikibaseRepository

[Gehel (Code Review)]

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401705 )

Change subject: Properly close HC client in WikibaseRepository
..

Properly close HC client in WikibaseRepository

This could be one of the cause for leaked threads detected in our unit
tests.

Bug: T178721
Change-Id: I882d886382fe73630cfc5d4f372de809e4ddeb29
---
M tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
M 
tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
M 
tools/src/test/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepositoryIntegrationTest.java
4 files changed, 55 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/05/401705/1

diff --git a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java 
b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
index 9ea247e..5d768ac 100644
--- a/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
+++ b/tools/src/main/java/org/wikidata/query/rdf/tool/Update.java
@@ -50,10 +50,11 @@
 public static void main(String[] args) throws Exception {
 RdfRepository rdfRepository = null;
 Updater updater;
+WikibaseRepository wikibaseRepository;
 
 try {
 UpdateOptions options = handleOptions(UpdateOptions.class, args);
-WikibaseRepository wikibaseRepository = 
buildWikibaseRepository(options);
+wikibaseRepository = buildWikibaseRepository(options);
 URI sparqlUri = sparqlUri(options);
 WikibaseUris uris = new WikibaseUris(options.wikibaseHost());
 rdfRepository = new RdfRepository(sparqlUri, uris);
@@ -67,13 +68,15 @@
 }
 throw e;
 }
-try (RdfRepository r = rdfRepository) {
+try (
+WikibaseRepository w = wikibaseRepository;
+RdfRepository r = rdfRepository;
+Updater u = updater
+) {
 updater.run();
 } catch (Exception e) {
 log.error("Error during updater run.", e);
 throw e;
-} finally {
-updater.close();
 }
 }
 
diff --git 
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
 
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
index eeccbc5..58c3cfb 100644
--- 
a/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
+++ 
b/tools/src/main/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepository.java
@@ -1,5 +1,6 @@
 package org.wikidata.query.rdf.tool.wikibase;
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.InterruptedIOException;
@@ -72,7 +73,7 @@
  */
 // TODO fan out complexity
 @SuppressWarnings("checkstyle:classfanoutcomplexity")
-public class WikibaseRepository {
+public class WikibaseRepository implements Closeable {
 private static final Logger log = 
LoggerFactory.getLogger(WikibaseRepository.class);
 
 /**
@@ -416,6 +417,11 @@
 return name.matches("^[A-Za-z0-9:]+$");
 }
 
+@Override
+public void close() throws IOException {
+client.close();
+}
+
 /**
  * URIs used for accessing wikibase.
  */
diff --git 
a/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
 
b/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
index 22bf8eb..c49cca4 100644
--- 
a/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
+++ 
b/tools/src/test/java/org/wikidata/query/rdf/tool/AbstractUpdaterIntegrationTestBase.java
@@ -1,10 +1,12 @@
 package org.wikidata.query.rdf.tool;
 
+import java.io.IOException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.After;
 import org.junit.Rule;
 import org.junit.runner.RunWith;
 import org.wikidata.query.rdf.common.uri.WikibaseUris;
@@ -37,6 +39,11 @@
 public RdfRepositoryForTesting rdfRepository = new 
RdfRepositoryForTesting("wdq");
 
 
+@After
+public void closeWikibaseRepository() throws IOException {
+wikibaseRepository.close();
+}
+
 /**
  * Update all ids from from to to.
  */
diff --git 
a/tools/src/test/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepositoryIntegrationTest.java
 
b/tools/src/test/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepositoryIntegrationTest.java
index bf4c887..865db7b 100644
--- 
a/tools/src/test/java/org/wikidata/query/rdf/tool/wikibase/WikibaseRepositoryIntegrationTest.java
+++ 

[MediaWiki-commits] [Gerrit] mediawiki...EducationProgram[master]: Fix wgRestrictionEdit not exists in mw.config

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401411 )

Change subject: Fix wgRestrictionEdit not exists in mw.config
..


Fix wgRestrictionEdit not exists in mw.config

Added new TitleExists hook that gives true whether
an Org or a Course actually exists.

Bug: T133289
Change-Id: Ibe447488959e85f335af654e714db136ff22c8ab
---
M EducationProgram.hooks.php
M extension.json
2 files changed, 35 insertions(+), 12 deletions(-)

Approvals:
  Florianschmidtwelzow: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/EducationProgram.hooks.php b/EducationProgram.hooks.php
index 72191aa..0d5acb4 100644
--- a/EducationProgram.hooks.php
+++ b/EducationProgram.hooks.php
@@ -366,17 +366,7 @@
 * @param bool|null &$isKnown
 */
public static function onTitleIsAlwaysKnown( Title $title, &$isKnown ) {
-   if ( $title->getNamespace() == EP_NS ) {
-   if ( Utils::isCourse( $title ) ) {
-   $class = 'EducationProgram\Courses';
-   } else {
-   $class = 'EducationProgram\Orgs';
-   }
-
-   $identifier = $title->getText();
-
-   $isKnown = $class::singleton()->hasIdentifier( 
$identifier );
-   }
+   self::doesOrgOrCourseExists( $title, $isKnown );
}
 
public static function onMovePageIsValidMove(
@@ -709,4 +699,36 @@
 
return true;
}
+
+   /**
+* Title::exists() returns false for all actions across 
EducationProgram, fix that here.
+*
+* @param Title $title
+* @param bool &$exists
+*/
+   public static function onTitleExists( Title $title, &$exists ) {
+   self::doesOrgOrCourseExists( $title, $exists );
+   }
+
+   /**
+* Note: This isn't a hook, it's a helper function that is called
+* from self::onTitleIsAlwaysKnown and self::onTitleExists.
+*
+* @param Title $title
+* @param boolean $exists
+*/
+   private static function doesOrgOrCourseExists( Title $title, &$exists ) 
{
+   if ( $title->getNamespace() == EP_NS ) {
+   if ( Utils::isCourse( $title ) ) {
+   $class = Courses::class;
+   } else {
+   $class = Orgs::class;
+   }
+
+   $identifier = $title->getText();
+
+   /** @var Courses|Orgs $class */
+   $exists = $class::singleton()->hasIdentifier( 
$identifier );
+   }
+   }
 }
diff --git a/extension.json b/extension.json
index 2d4aeb8..80b005b 100644
--- a/extension.json
+++ b/extension.json
@@ -705,7 +705,8 @@
"UserMergeAccountFields": 
"EducationProgram\\Hooks::onUserMergeAccountFields",
"UserMergeAccountDeleteTables": 
"EducationProgram\\Hooks::onUserMergeAccountDeleteTables",
"MergeAccountFromTo": 
"EducationProgram\\Hooks::onMergeAccountFromTo",
-   "ResourceLoaderRegisterModules": 
"EducationProgram\\Hooks::onResourceLoaderRegisterModules"
+   "ResourceLoaderRegisterModules": 
"EducationProgram\\Hooks::onResourceLoaderRegisterModules",
+   "TitleExists": "EducationProgram\\Hooks::onTitleExists"
},
"config": {
"EPSettings": {

-- 
To view, visit https://gerrit.wikimedia.org/r/401411
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe447488959e85f335af654e714db136ff22c8ab
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/EducationProgram
Gerrit-Branch: master
Gerrit-Owner: Albert221 
Gerrit-Reviewer: Albert221 
Gerrit-Reviewer: AndyRussG 
Gerrit-Reviewer: D3r1ck01 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Ragesoss 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Promote db2039 to be the new master of s6-codfw

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401706 )

Change subject: mariadb: Promote db2039 to be the new master of s6-codfw
..

mariadb: Promote db2039 to be the new master of s6-codfw

Bug: T176243
Change-Id: I62eec3ca94263dbaba21434a8d7494df0d11dbfc
---
M hieradata/hosts/db2028.yaml
M hieradata/hosts/db2039.yaml
M manifests/site.pp
3 files changed, 4 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/06/401706/1

diff --git a/hieradata/hosts/db2028.yaml b/hieradata/hosts/db2028.yaml
index 161cc96..7308ffb 100644
--- a/hieradata/hosts/db2028.yaml
+++ b/hieradata/hosts/db2028.yaml
@@ -1,4 +1 @@
 mariadb::shard: 's6'
-mariadb::mysql_role: 'master'
-mariadb::binlog_format: 'STATEMENT'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/hieradata/hosts/db2039.yaml b/hieradata/hosts/db2039.yaml
index f41d15a..85f9a4a 100644
--- a/hieradata/hosts/db2039.yaml
+++ b/hieradata/hosts/db2039.yaml
@@ -1,2 +1,3 @@
 mariadb::shard: 's6'
-mariadb::socket: '/tmp/mysql.sock'
+mariadb::mysql_role: 'master'
+mariadb::binlog_format: 'STATEMENT'
diff --git a/manifests/site.pp b/manifests/site.pp
index 447ffaa..572ef78 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -419,11 +419,11 @@
 
 # s6 core production dbs on codfw
 # codfw master
-node 'db2028.codfw.wmnet' {
+node 'db2039.codfw.wmnet' {
 role(mariadb::core)
 }
 
-node /^db20(39|46|53|60|67|76)\.codfw\.wmnet/ {
+node /^db20(28|46|53|60|67|76)\.codfw\.wmnet/ {
 role(mariadb::core)
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401706
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62eec3ca94263dbaba21434a8d7494df0d11dbfc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Decommission db1029, former x1 replica

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401529 )

Change subject: mariadb: Decommission db1029, former x1 replica
..


mariadb: Decommission db1029, former x1 replica

Bug: T183469
Change-Id: If44e08bf34b574070c01aa886ce29e43eda5a02f
---
D hieradata/hosts/db1029.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 1 insertion(+), 5 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/hieradata/hosts/db1029.yaml b/hieradata/hosts/db1029.yaml
deleted file mode 100644
index 8b3d379..000
--- a/hieradata/hosts/db1029.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-mariadb::shard: 'x1'
-mariadb::binlog_format: 'ROW'
-mariadb::socket: '/tmp/mysql.sock'
diff --git a/manifests/site.pp b/manifests/site.pp
index d90fb8a..447ffaa 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -491,7 +491,7 @@
 role(mariadb::core)
 }
 
-node /^db10(29|55|56)\.eqiad\.wmnet/ {
+node /^db10(55|56)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml 
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index f579beb..6cf92ee 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -134,7 +134,6 @@
 shard: x1
 role: slave
   targets:
-  - db1029:9104
   - db1055:9104
   - db1056:9104
 - labels:

-- 
To view, visit https://gerrit.wikimedia.org/r/401529
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If44e08bf34b574070c01aa886ce29e43eda5a02f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smart: special case for backports on Ubuntu

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401707 )

Change subject: smart: special case for backports on Ubuntu
..

smart: special case for backports on Ubuntu

We don't ship trusty-backports, thus special case the install on Ubuntu.

Bug: T86552
Change-Id: I4510bd0d538502d158833560bb2e375cba23a9b2
---
M modules/smart/manifests/init.pp
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/07/401707/1

diff --git a/modules/smart/manifests/init.pp b/modules/smart/manifests/init.pp
index 90d9dab..7129480 100644
--- a/modules/smart/manifests/init.pp
+++ b/modules/smart/manifests/init.pp
@@ -9,11 +9,17 @@
 fail('smart module is not supported on virtual hosts')
 }
 
-# Prefer smartmontools version from backports (if any) because of newer
+# Prefer smartmontools version from backports (on Debian, if any) because 
of newer
 # smart drivedb.
-package { 'smartmontools':
-ensure  => $ensure,
-install_options => ['-t', "${::lsbdistcodename}-backports"],
+if os_version('ubuntu >= trusty') {
+package { 'smartmontools':
+ensure => $ensure,
+}
+} else {
+package { 'smartmontools':
+ensure  => $ensure,
+install_options => ['-t', "${::lsbdistcodename}-backports"],
+}
 }
 
 # Make sure we send smart alerts from smartd via syslog and not email.

-- 
To view, visit https://gerrit.wikimedia.org/r/401707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4510bd0d538502d158833560bb2e375cba23a9b2
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Set db1029 as a spare and ready to decommission

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401708 )

Change subject: mariadb: Set db1029 as a spare and ready to decommission
..

mariadb: Set db1029 as a spare and ready to decommission

Bug: T184054
Change-Id: I4eec34754d7a263c67d64ed26f99a81ac1a685ab
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/08/401708/1

diff --git a/manifests/site.pp b/manifests/site.pp
index 572ef78..d43e3fb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -495,6 +495,11 @@
 role(mariadb::core)
 }
 
+# To be decommissioned
+node 'db1029.eqiad.wmnet' {
+role(spare::system)
+}
+
 # codfw
 node 'db2033.codfw.wmnet' {
 role(mariadb::core)

-- 
To view, visit https://gerrit.wikimedia.org/r/401708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4eec34754d7a263c67d64ed26f99a81ac1a685ab
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations...cumin[master]: ClusterShell backend: fix execute() return code

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399829 )

Change subject: ClusterShell backend: fix execute() return code
..


ClusterShell backend: fix execute() return code

* The return code of the execute() method was not respecting the parent
  class contract for its return code when there are no commands set or
  no hosts to target.
* Breaking API change: make the Target class raise an WorkerError
  exception on instantiation if there are no target hosts.
* Breaking API change: make the execute() method raise a WorkerError
  exception if there are no commands to execute.

Change-Id: Idb59df41dac12d78803d560af3c22da9f1df4d1a
---
M cumin/tests/unit/test_transport.py
M cumin/tests/unit/transports/test_clustershell.py
M cumin/tests/unit/transports/test_init.py
M cumin/transports/__init__.py
M cumin/transports/clustershell.py
5 files changed, 25 insertions(+), 24 deletions(-)

Approvals:
  jenkins-bot: Verified
  Gehel: Looks good to me, but someone else must approve
  Volans: Looks good to me, approved



diff --git a/cumin/tests/unit/test_transport.py 
b/cumin/tests/unit/test_transport.py
index 52159b3..b821141 100644
--- a/cumin/tests/unit/test_transport.py
+++ b/cumin/tests/unit/test_transport.py
@@ -12,13 +12,13 @@
 def test_missing_transport():
 """Not passing a transport should raise CuminError."""
 with pytest.raises(CuminError, match=r"Missing required parameter 
'transport'"):
-Transport.new({}, transports.Target([]))
+Transport.new({}, transports.Target(['host1']))
 
 
 def test_invalid_transport():
 """Passing an invalid transport should raise CuminError."""
 with pytest.raises(ImportError, match=r'No module named 
non_existent_transport'):
-Transport.new({'transport': 'non_existent_transport'}, 
transports.Target([]))
+Transport.new({'transport': 'non_existent_transport'}, 
transports.Target(['host1']))
 
 
 def test_missing_worker_class():
@@ -27,11 +27,11 @@
 del module.worker_class
 with mock.patch('importlib.import_module', lambda _: module):
 with pytest.raises(AttributeError, match=r'worker_class'):
-Transport.new({'transport': 'invalid_transport'}, 
transports.Target([]))
+Transport.new({'transport': 'invalid_transport'}, 
transports.Target(['host1']))
 
 
 @pytest.mark.parametrize('transport', [name for _, name, ispkg in 
pkgutil.iter_modules(transports.__path__)
if not ispkg])
 def test_valid_transport(transport):
 """Passing a valid transport should return an instance of BaseWorker."""
-assert isinstance(Transport.new({'transport': transport}, 
transports.Target([])), transports.BaseWorker)
+assert isinstance(Transport.new({'transport': transport}, 
transports.Target(['host1'])), transports.BaseWorker)
diff --git a/cumin/tests/unit/transports/test_clustershell.py 
b/cumin/tests/unit/transports/test_clustershell.py
index ccaba3f..6387984 100644
--- a/cumin/tests/unit/transports/test_clustershell.py
+++ b/cumin/tests/unit/transports/test_clustershell.py
@@ -96,23 +96,18 @@
 assert kwargs['handler'] == self.worker._handler_instance
 
 def test_execute_no_commands(self):
-"""Calling execute() without commands should return immediately."""
+"""Calling execute() without commands should raise WorkerError."""
 self.worker.handler = ConcreteBaseEventHandler
 self.worker.commands = None
-assert self.worker.execute() is None
+with pytest.raises(WorkerError, match=r'No commands provided\.'):
+self.worker.execute()
 assert not self.worker.task.shell.called
 
 def test_execute_one_command_no_mode(self):
-"""Calling execute() with only one command without mode should raise 
CuminError."""
+"""Calling execute() with only one command without mode should raise 
WorkerError."""
 self.worker.commands = [self.commands[0]]
-with pytest.raises(CuminError, match=r'An EventHandler is 
mandatory\.'):
+with pytest.raises(WorkerError, match=r'An EventHandler is 
mandatory\.'):
 self.worker.execute()
-
-def test_execute_no_target_hosts(self):
-"""Calling execute() with a target without hosts should return 
immediately."""
-self.target.hosts = []
-self.worker.handler = ConcreteBaseEventHandler
-assert self.worker.execute() is None
 assert not self.worker.task.shell.called
 
 def test_execute_wrong_mode(self):
diff --git a/cumin/tests/unit/transports/test_init.py 
b/cumin/tests/unit/transports/test_init.py
index c40dfdc..d326d0e 100644
--- a/cumin/tests/unit/transports/test_init.py
+++ b/cumin/tests/unit/transports/test_init.py
@@ -316,6 +316,11 @@
 self.hosts_list = ['host' + str(i) for i in xrange(10)]
 self.hosts = NodeSet.fromlist(self.hosts_list)
 
+def 

[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Access Archiva over HTTPS

[Gehel (Code Review)]

Gehel has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401709 )

Change subject: Access Archiva over HTTPS
..

Access Archiva over HTTPS

Archiva sends an HTTP 307 (temporary redirect) when accessed over HTTP.
Maven does not handle that well, and since we should only be accessing
it over HTTPS, let's correct our pom.xml

Change-Id: If8a951fc2d5f05581d595abefe25fe79993d478f
---
M pom.xml
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf 
refs/changes/09/401709/1

diff --git a/pom.xml b/pom.xml
index 69fddaf..5df3940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -619,11 +619,11 @@
 
 
 wmf.mirrored
-http://archiva.wikimedia.org/repository/mirrored
+https://archiva.wikimedia.org/repository/mirrored
 
 
 wmf.releases
-http://archiva.wikimedia.org/repository/releases
+https://archiva.wikimedia.org/repository/releases
 
 
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401709
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If8a951fc2d5f05581d595abefe25fe79993d478f
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/software[master]: dblist: Reorder db2028 & db2039 because master switchover

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401710 )

Change subject: dblist: Reorder db2028 & db2039 because master switchover
..

dblist: Reorder db2028 & db2039 because master switchover

Bug: T176243
Change-Id: I558f8904a230b0979fbc026e7055f2179b626030
---
M dbtools/s6.hosts
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/10/401710/1

diff --git a/dbtools/s6.hosts b/dbtools/s6.hosts
index 66ce97e..01829b4 100644
--- a/dbtools/s6.hosts
+++ b/dbtools/s6.hosts
@@ -2,12 +2,12 @@
 db2089.codfw.wmnet 3316
 db2087.codfw.wmnet 3316
 db2076.codfw.wmnet 3306
-db2039.codfw.wmnet 3306
 db2046.codfw.wmnet 3306
 db2053.codfw.wmnet 3306
 db2060.codfw.wmnet 3306
 db2067.codfw.wmnet 3306
 db2028.codfw.wmnet 3306
+db2039.codfw.wmnet 3306
 labsdb1009.eqiad.wmnet 3306
 labsdb1010.eqiad.wmnet 3306
 labsdb1011.eqiad.wmnet 3306

-- 
To view, visit https://gerrit.wikimedia.org/r/401710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I558f8904a230b0979fbc026e7055f2179b626030
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: mariadb: Point x1-slave.eqiad.wmnet to db1056

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401711 )

Change subject: mariadb: Point x1-slave.eqiad.wmnet to db1056
..

mariadb: Point x1-slave.eqiad.wmnet to db1056

Bug: T184054
Change-Id: I2e12729ba25ca13a2fe2f0bcad07ef6fa9ecae42
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/11/401711/1

diff --git a/templates/wmnet b/templates/wmnet
index 4dc8d1e..2366eef 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -53,7 +53,7 @@
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.
 x1-master   5M  IN CNAMEdb1031.eqiad.wmnet.
-x1-slave5M  IN CNAMEdb1029.eqiad.wmnet.
+x1-slave5M  IN CNAMEdb1056.eqiad.wmnet.
 es2-master  5M  IN CNAMEes1011.eqiad.wmnet.
 es3-master  5M  IN CNAMEes1014.eqiad.wmnet.
 pc1-master  5M  IN CNAMEpc1004.eqiad.wmnet.

-- 
To view, visit https://gerrit.wikimedia.org/r/401711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2e12729ba25ca13a2fe2f0bcad07ef6fa9ecae42
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: mariadb: Point x1-master.eqiad.wmnet to db1055

[Jcrespo (Code Review)]

Jcrespo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401712 )

Change subject: mariadb: Point x1-master.eqiad.wmnet to db1055
..

mariadb: Point x1-master.eqiad.wmnet to db1055

Bug: T184054
Change-Id: Ibc6d722a8ad610593a6bd33fab2f85d9956b6899
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/12/401712/1

diff --git a/templates/wmnet b/templates/wmnet
index 2366eef..0c959b5 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -52,7 +52,7 @@
 m4-slave5M  IN CNAMEdb1108.eqiad.wmnet.
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.
-x1-master   5M  IN CNAMEdb1031.eqiad.wmnet.
+x1-master   5M  IN CNAMEdb1055.eqiad.wmnet.
 x1-slave5M  IN CNAMEdb1056.eqiad.wmnet.
 es2-master  5M  IN CNAMEes1011.eqiad.wmnet.
 es3-master  5M  IN CNAMEes1014.eqiad.wmnet.

-- 
To view, visit https://gerrit.wikimedia.org/r/401712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc6d722a8ad610593a6bd33fab2f85d9956b6899
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Set db1029 as a spare and ready to decommission

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401708 )

Change subject: mariadb: Set db1029 as a spare and ready to decommission
..


mariadb: Set db1029 as a spare and ready to decommission

Bug: T184054
Change-Id: I4eec34754d7a263c67d64ed26f99a81ac1a685ab
---
M manifests/site.pp
1 file changed, 5 insertions(+), 0 deletions(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 447ffaa..91b2dcf 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -495,6 +495,11 @@
 role(mariadb::core)
 }
 
+# To be decommissioned T184054
+node 'db1029.eqiad.wmnet' {
+role(spare::system)
+}
+
 # codfw
 node 'db2033.codfw.wmnet' {
 role(mariadb::core)

-- 
To view, visit https://gerrit.wikimedia.org/r/401708
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4eec34754d7a263c67d64ed26f99a81ac1a685ab
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1101:3317"

[Marostegui (Code Review)]

Hello Urbanecm, jenkins-bot, Jcrespo, Zoranzoki21,

I'd like you to do a code review.  Please visit

https://gerrit.wikimedia.org/r/401713

to review the following change.


Change subject: Revert "db-eqiad.php: Depool db1101:3317"
..

Revert "db-eqiad.php: Depool db1101:3317"

This reverts commit a04ce6892c31deaf5f92cf6221fef262f0305230.

Change-Id: Iac9adb0c82349463d526076d4896d69a569bcfc2
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/13/401713/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f4357ab..520ce91 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -167,7 +167,7 @@
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
-   # 'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8 # 
T174569
+   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
'db1071' => 0,   # D1 2.8TB 160GB, master
@@ -456,23 +456,23 @@
],
'watchlist' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'recentchanges' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'recentchangeslinked' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'contributions' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'logpager' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
],
's8' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/401713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac9adb0c82349463d526076d4896d69a569bcfc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/software[master]: mariadb: Remove db1029 from dblists

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401527 )

Change subject: mariadb: Remove db1029 from dblists
..


mariadb: Remove db1029 from dblists

Bug: T183469
Change-Id: Ida140ce53659123b3e96535aa002900070a83a6c
---
M dbtools/x1.hosts
1 file changed, 0 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/dbtools/x1.hosts b/dbtools/x1.hosts
index 2e46584..d4c31e7 100644
--- a/dbtools/x1.hosts
+++ b/dbtools/x1.hosts
@@ -3,7 +3,6 @@
 db2033.codfw.wmnet 3306
 dbstore1001.eqiad.wmnet3306
 dbstore1002.eqiad.wmnet3306
-db1029.eqiad.wmnet 3306
 db1055.eqiad.wmnet 3306
 db1056.eqiad.wmnet 3306
 db1031.eqiad.wmnet 3306

-- 
To view, visit https://gerrit.wikimedia.org/r/401527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ida140ce53659123b3e96535aa002900070a83a6c
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/dns[master]: mariadb: Point x1-slave.eqiad.wmnet to db1056

[Jcrespo (Code Review)]

Jcrespo has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401711 )

Change subject: mariadb: Point x1-slave.eqiad.wmnet to db1056
..


mariadb: Point x1-slave.eqiad.wmnet to db1056

Bug: T184054
Change-Id: I2e12729ba25ca13a2fe2f0bcad07ef6fa9ecae42
---
M templates/wmnet
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Marostegui: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/templates/wmnet b/templates/wmnet
index 4dc8d1e..2366eef 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -53,7 +53,7 @@
 m5-master   5M  IN CNAMEdb1009.eqiad.wmnet.
 m5-slave5M  IN CNAMEdb2030.codfw.wmnet.
 x1-master   5M  IN CNAMEdb1031.eqiad.wmnet.
-x1-slave5M  IN CNAMEdb1029.eqiad.wmnet.
+x1-slave5M  IN CNAMEdb1056.eqiad.wmnet.
 es2-master  5M  IN CNAMEes1011.eqiad.wmnet.
 es3-master  5M  IN CNAMEes1014.eqiad.wmnet.
 pc1-master  5M  IN CNAMEpc1004.eqiad.wmnet.

-- 
To view, visit https://gerrit.wikimedia.org/r/401711
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e12729ba25ca13a2fe2f0bcad07ef6fa9ecae42
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::appserver::api: add load monitoring

[Giuseppe Lavagetto (Code Review)]

Giuseppe Lavagetto has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401714 )

Change subject: mediawiki::appserver::api: add load monitoring
..

mediawiki::appserver::api: add load monitoring

We've had quite a few cases of HHVM API appservers with high cpu usage
causing noitceable latencies to users; the easiest way to detect such
deadlocks is quite simply checking the machine CPU usage/load - at least
that's what I do manually.

This change won't solve the issue per-se, but it will make ops aware of
what is going on proactively.

Bug: T182568, T184048
Change-Id: I06af45cbf8f42ade5753dc7397c6e1aa2b32c4ea
---
M modules/role/manifests/mediawiki/appserver/api.pp
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/14/401714/1

diff --git a/modules/role/manifests/mediawiki/appserver/api.pp 
b/modules/role/manifests/mediawiki/appserver/api.pp
index 83494bb..39d2ffb 100644
--- a/modules/role/manifests/mediawiki/appserver/api.pp
+++ b/modules/role/manifests/mediawiki/appserver/api.pp
@@ -13,4 +13,15 @@
 },
 priority => 90,
 }
+
+# Check the load to detect clearly hosts hanging (see T184048, T182568)
+$nproc = $facts['processorcount']
+$warning = join([ $nproc * 0.95, $nproc * 0.8, $nproc * 0.75], ',')
+$critical = join([ $nproc * 1.5, $nproc * 1.1, $nproc * 1], ',')
+# Since we're checking the load, that is already a moving average, we can
+# alarm at the first occurrence
+nrpe::monitor_service { 'cpu_load':
+command => "check_load -w ${warning} -c ${critical}",
+retries => 1,
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401714
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I06af45cbf8f42ade5753dc7397c6e1aa2b32c4ea
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::puppetmaster::standalone: add ferm rules to allow conn...

[Arturo Borrero Gonzalez (Code Review)]

Arturo Borrero Gonzalez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/394101 )

Change subject: role::puppetmaster::standalone: add ferm rules to allow 
connecting to tcp/8140
..


role::puppetmaster::standalone: add ferm rules to allow connecting to tcp/8140

Add some firewalling rules to allow connecting to the standalone puppetmaster
in port tcp/8140.

Bug: T154150
Change-Id: I7f255bd1a445de0529f34b50a910217326f51fc3
Signed-off-by: Arturo Borrero Gonzalez 
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Arturo Borrero Gonzalez: Verified; Looks good to me, approved



diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index 29e5179..c2ef517 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -92,4 +92,10 @@
 class { 'puppetmaster::gitsync':
 run_every_minutes => $git_sync_minutes,
 }
+
+ferm::service { 'puppetmaster-frontend':
+proto  => 'tcp',
+port   => 8140,
+srange => '$LABS_NETWORKS',
+}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/394101
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f255bd1a445de0529f34b50a910217326f51fc3
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Rush 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4

[Mobrovac (Code Review)]

Mobrovac has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401715 )

Change subject: Update mathoid to bad5ec8d4
..

Update mathoid to bad5ec8d4

List of changes:
xxx Update node module dependencies

Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
12 files changed, 71,968 insertions(+), 262 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/mathoid/deploy 
refs/changes/15/401715/1


-- 
To view, visit https://gerrit.wikimedia.org/r/401715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update mathoid to bad5ec8d4

[Mobrovac (Code Review)]

Mobrovac has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401715 )

Change subject: Update mathoid to bad5ec8d4
..


Update mathoid to bad5ec8d4

List of changes:
xxx Update node module dependencies

Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c
---
M node_modules/kad/package.json
M node_modules/swagger-ui/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/index.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/lib/parser.pegjs
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/package.json
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/api.js
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.js
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chem-regression.json
A node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/chemtest.tex
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.js
M node_modules/texvcinfo/node_modules/mathoid-texvcjs/test/mathjax-texvc.json
12 files changed, 71,968 insertions(+), 262 deletions(-)

Approvals:
  Mobrovac: Verified; Looks good to me, approved




-- 
To view, visit https://gerrit.wikimedia.org/r/401715
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3238e1c1c4ac5d81de7d035ea81c94e566cc972c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/mathoid/deploy
Gerrit-Branch: master
Gerrit-Owner: Mobrovac 
Gerrit-Reviewer: Mobrovac 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::puppetmaster::standalone: rename ferm rule to be more ...

[Arturo Borrero Gonzalez (Code Review)]

Arturo Borrero Gonzalez has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401716 )

Change subject: role::puppetmaster::standalone: rename ferm rule to be more 
explicit
..

role::puppetmaster::standalone: rename ferm rule to be more explicit

Moritz comments:
 <>

Change-Id: I69dbb4703f4052f351bcd77e04fbaf2f2885ee1e
Suggested-by: Moritz Mühlenhoff 
Signed-off-by: Arturo Borrero Gonzalez 
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/16/401716/1

diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index c2ef517..728fd63 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -93,7 +93,7 @@
 run_every_minutes => $git_sync_minutes,
 }
 
-ferm::service { 'puppetmaster-frontend':
+ferm::service { 'puppetmaster-standalone':
 proto  => 'tcp',
 port   => 8140,
 srange => '$LABS_NETWORKS',

-- 
To view, visit https://gerrit.wikimedia.org/r/401716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69dbb4703f4052f351bcd77e04fbaf2f2885ee1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Arturo Borrero Gonzalez 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: role::puppetmaster::standalone: rename ferm rule to be more ...

[Arturo Borrero Gonzalez (Code Review)]

Arturo Borrero Gonzalez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401716 )

Change subject: role::puppetmaster::standalone: rename ferm rule to be more 
explicit
..


role::puppetmaster::standalone: rename ferm rule to be more explicit

Moritz comments:
 <>

Change-Id: I69dbb4703f4052f351bcd77e04fbaf2f2885ee1e
Suggested-by: Moritz Mühlenhoff 
Signed-off-by: Arturo Borrero Gonzalez 
---
M modules/role/manifests/puppetmaster/standalone.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Looks good to me, but someone else must approve
  Arturo Borrero Gonzalez: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/puppetmaster/standalone.pp 
b/modules/role/manifests/puppetmaster/standalone.pp
index c2ef517..728fd63 100644
--- a/modules/role/manifests/puppetmaster/standalone.pp
+++ b/modules/role/manifests/puppetmaster/standalone.pp
@@ -93,7 +93,7 @@
 run_every_minutes => $git_sync_minutes,
 }
 
-ferm::service { 'puppetmaster-frontend':
+ferm::service { 'puppetmaster-standalone':
 proto  => 'tcp',
 port   => 8140,
 srange => '$LABS_NETWORKS',

-- 
To view, visit https://gerrit.wikimedia.org/r/401716
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I69dbb4703f4052f351bcd77e04fbaf2f2885ee1e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openldap: Amend to rename docker to contint-docker

[Alexandros Kosiaris (Code Review)]

Alexandros Kosiaris has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401700 )

Change subject: openldap: Amend to rename docker to contint-docker
..


openldap: Amend to rename docker to contint-docker

Followup for Ie50f35a0a66592 where docker was renamed to contint-docker

Change-Id: I3090c2a544d28effb426ce12b1601817c0605554
---
M modules/openldap/files/cross-validate-accounts.py
1 file changed, 5 insertions(+), 1 deletion(-)

Approvals:
  Muehlenhoff: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/openldap/files/cross-validate-accounts.py 
b/modules/openldap/files/cross-validate-accounts.py
index 4c85f22..a54a87f 100644
--- a/modules/openldap/files/cross-validate-accounts.py
+++ b/modules/openldap/files/cross-validate-accounts.py
@@ -224,8 +224,12 @@
 # statistics-privatedata-users enables mysql access as well
 # deploy-phabricator concerns handling of keyholder for 
deployment
 # analytics-search-users concerns user creation in HDFS
+# contint-docker is about being able to issue docker commands
+# directly and execute scripts issuing docker commands
 groups.difference_update(['analytics-privatedata-users', 
'gitpuppet', 'ops',
-  'researchers', 
'statistics-privatedata-users', 'docker',
+  'researchers',
+  'statistics-privatedata-users',
+  'contint-docker',
   'deploy-phabricator', 
'analytics-search-users'])
 if len(set(groups)) > 0:
 log += "Malformed membership for ops user " + i + ", has 
additional group(s): "

-- 
To view, visit https://gerrit.wikimedia.org/r/401700
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I3090c2a544d28effb426ce12b1601817c0605554
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: Volans 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Revert "db-eqiad.php: Depool db1101:3317"

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401713 )

Change subject: Revert "db-eqiad.php: Depool db1101:3317"
..


Revert "db-eqiad.php: Depool db1101:3317"

This reverts commit a04ce6892c31deaf5f92cf6221fef262f0305230.

Change-Id: Iac9adb0c82349463d526076d4896d69a569bcfc2
---
M wmf-config/db-eqiad.php
1 file changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Marostegui: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f4357ab..520ce91 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -167,7 +167,7 @@
'db1086' => 500, # B3 3.6TB 512GB, api
'db1094' => 500, # D2 3.6TB 512GB
'db1098:3317' => 1,   # B5 3.6TB 512GB, # rc, log: s6 and s7
-   # 'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8 # 
T174569
+   'db1101:3317' => 1,   # C2 3.6TB 512GB # rc, log: s7 and s8
],
's8' => [
'db1071' => 0,   # D1 2.8TB 160GB, master
@@ -456,23 +456,23 @@
],
'watchlist' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'recentchanges' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'recentchangeslinked' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'contributions' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
'logpager' => [
'db1098:3317' => 1,
-   # 'db1101:3317' => 1,
+   'db1101:3317' => 1,
],
],
's8' => [

-- 
To view, visit https://gerrit.wikimedia.org/r/401713
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iac9adb0c82349463d526076d4896d69a569bcfc2
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] integration/config[master]: beta-scap-eqiad fix scap path

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401818 )

Change subject: beta-scap-eqiad fix scap path
..


beta-scap-eqiad fix scap path

Change-Id: Ib99311d593e0384d69d3f65ed78ade8219c28e98
---
M jjb/beta.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Thcipriani: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/jjb/beta.yaml b/jjb/beta.yaml
index 0ed434f..b27d644 100644
--- a/jjb/beta.yaml
+++ b/jjb/beta.yaml
@@ -151,7 +151,7 @@
 
 builders:
   - shell: |
-  /srv/deployment/scap/scap/bin/scap sync "$JOB_NAME (build 
$BUILD_DISPLAY_NAME)"
+  /usr/bin/scap sync "$JOB_NAME (build $BUILD_DISPLAY_NAME)"
 
 properties:
  - build-discarder:

-- 
To view, visit https://gerrit.wikimedia.org/r/401818
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib99311d593e0384d69d3f65ed78ade8219c28e98
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Thcipriani 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Paladox 
Gerrit-Reviewer: Thcipriani 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: WIP Citibank import

[Eileen (Code Review)]

Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401819 )

Change subject: WIP Citibank import
..

WIP Citibank import

Add Citibank import. Some things to think about
1) I chose the existing payment instrument 'Citibank International'
(which had only about 10 existing contributions)
2) From the csv provided it appears most are Organizations but
a few are Individuals maybe and it's not clear how to identify those
from the code
3) There is relatively little data about each transaction. I have mapped:
  'Account Name' => 'gateway_account',
  'Global Reference Number' => 'gateway_txn_id',
  'Amount' => 'gross',
  'Date Posted' => 'settlement_date',
  'Date Received' => 'date',
  'Originator Name' => 'organization_name',
4) Special instructions Line 1 contains some data which might be marginally 
useful?
I have not mapped at this stage
5) I have mapped Date posted to 'settlement_date' & Date Received to 'date' - is
this right? I didn't use time received. SHould I?
6) I have used the following defaults (from JP Morgan) are they correct?
  'contact_type' => 'Organization',
  'contact_source' => 'citibank import',
  'gateway' => 'citibank',
  'gift_source' => 'Community Gift',
  'no_thank_you' => 'No Contact Details',
  'payment_instrument' => 'Citibank International',
  'restrictions' => 'Unrestricted - General',
  'currency' => 'USD',

Change-Id: Ib9aa8c630249d1e398871ccd07424cdcde947afd
---
A sites/all/modules/offline2civicrm/CitibankFile.php
M sites/all/modules/offline2civicrm/offline2civicrm.info
M sites/all/modules/offline2civicrm/offline2civicrm.module
A sites/all/modules/offline2civicrm/tests/CitibankFileTest.php
A sites/all/modules/offline2civicrm/tests/data/citibank.csv
M sites/all/modules/offline2civicrm/tests/includes/BaseChecksFileTest.php
6 files changed, 120 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/19/401819/1

diff --git a/sites/all/modules/offline2civicrm/CitibankFile.php 
b/sites/all/modules/offline2civicrm/CitibankFile.php
new file mode 100644
index 000..9ea2385
--- /dev/null
+++ b/sites/all/modules/offline2civicrm/CitibankFile.php
@@ -0,0 +1,68 @@
+ 'gateway_account',
+  'Global Reference Number' => 'gateway_txn_id',
+  'Amount' => 'gross',
+  'Date Posted' => 'settlement_date',
+  'Date Received' => 'date',
+  'Originator Name' => 'organization_name',
+  // Should we map this anywhere - not super informative but?
+  //'Special Instructions Line 1' => 'source',
+);
+  }
+
+  protected function getDatetimeFields() {
+return array(
+  'date',
+  'settlement_date',
+);
+  }
+
+  protected function mungeMessage(&$msg) {
+parent::mungeMessage($msg);
+if (substr($msg['organization_name'], 0, 2) == '1/') {
+  // For reasons that are unclear sometimes this string appears at the 
start of the Originator Name field.
+  $msg['organization_name'] = substr($msg['organization_name'], 2);
+}
+
+  }
+
+  protected function getDefaultValues() {
+return array_merge(parent::getDefaultValues(), array(
+  'contact_type' => 'Organization',
+  'contact_source' => 'citibank import',
+  'gateway' => 'citibank',
+  'gift_source' => 'Community Gift',
+  'no_thank_you' => 'No Contact Details',
+  'payment_instrument' => 'Citibank International',
+  'restrictions' => 'Unrestricted - General',
+  'currency' => 'USD',
+));
+  }
+
+}
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.info 
b/sites/all/modules/offline2civicrm/offline2civicrm.info
index 058cd03..473e1ed 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.info
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.info
@@ -19,6 +19,7 @@
 files[] = IgnoredRowException.php
 files[] = JpMorganFile.php
 files[] = BenevityFile.php
+files[] = CitibankFile.php
 files[] = PayPalChecksFile.php
 files[] = RefundFile.php
 files[] = SquareFile.php
diff --git a/sites/all/modules/offline2civicrm/offline2civicrm.module 
b/sites/all/modules/offline2civicrm/offline2civicrm.module
index ed491c3..a286eb1 100644
--- a/sites/all/modules/offline2civicrm/offline2civicrm.module
+++ b/sites/all/modules/offline2civicrm/offline2civicrm.module
@@ -107,6 +107,7 @@
 '#default_value' => 'generic_ind',
 '#options' => array(
   'benevity' => t('Benevity'),
+  'citibank' => t('Citibank'),
   'engage' => t('Engage'),
   'coinbase' => t('Coinbase Merchant Orders'),
   'foreign_checks' => t('Foreign Checks'),
@@ -183,6 +184,10 @@
   $importer = new BenevityFile($file->uri);
   break;
 
+case 'citibank':
+  $importer = new CitibankFile($file->uri);
+  break;
+
 case 'paypal':
   $importer = new PayPalChecksFile($file->uri);
   break;
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Add debugging information to flakey test

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401821 )

Change subject: Add debugging information to flakey test
..

Add debugging information to flakey test

Occasionally for unknown reasons this test fails to make an assertion.
Rather than doing that we'll make an assertion that always fails with the 
exception
that caused it. This should help us identify and fix the culprit.

Bug: T179959
Change-Id: I0c1d57dd0292bef605f05a22f984cd81b0131a96
---
M tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
1 file changed, 3 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/21/401821/1

diff --git 
a/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js 
b/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
index 79511ca..21ec573 100644
--- a/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
+++ b/tests/qunit/mobile.references.gateway/test_ReferencesMobileViewGateway.js
@@ -69,7 +69,9 @@
return referencesGateway.getReference( '#cite_note-1', page 
).always( function () {
return referencesGateway.getReference( '#cite_note-2', 
page ).done( function ( ref ) {
assert.strictEqual( ref.text, 'real lazy 2' );
-   } );
+   } ).catch( function ( err ) {
+   assert.ok( false, err );
+   } )
} );
} );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401821
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0c1d57dd0292bef605f05a22f984cd81b0131a96
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Score[master]: Add support for notes languages

[Phantom42 (Code Review)]

Phantom42 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401820 )

Change subject: Add support for notes languages
..

Add support for notes languages

Language can be set with note-language attribute.
Available languages now are:
arabic, catalan, deutsch, english, espanol, italiano, nederlands,
norsk, portugues, suomi, svenska, vlaams

Bug: T49604
Change-Id: Idd938089ce12134ac0f045dde7d21b1574d2cf27
---
M i18n/en.json
M i18n/qqq.json
M includes/Score.php
3 files changed, 46 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Score 
refs/changes/20/401820/1

diff --git a/i18n/en.json b/i18n/en.json
index 05d1242..2cb0f3e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,6 +15,7 @@
"score-error-category-desc": "There was an error while rendering the 
score.",
"score-getcwderr": "Unable to obtain current working directory",
"score-invalidlang": "Invalid score language 
lang=\"$1\". Currently recognized languages are 
lang=\"lilypond\" (the default) and lang=\"ABC\".",
+   "score-invalidnotelanguage": "Invalid 
note-language=\"$1\". Currently recognized note languages are: 
$2",
"score-invalidaudiooverride": "The file \"$1\" you 
specified with override_audio is invalid. Please specify the file name only, 
omit [[…]] and the \"{{ns:file}}:\" prefix.",
"score-midioverridenotfound": "The file \"$1\" you 
specified with override_midi could not be found. Please specify the file name 
only, omit [[…]] and the \"{{ns:file}}:\" prefix.",
"score-noabcinput": "ABC source file $1 could not be created.",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index ed816ad..cc18ba1 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -21,6 +21,7 @@
"score-error-category-desc": "Description on 
[[Special:TrackingCategories]] for the {{msg-mw|score-error-category}} tracking 
category.",
"score-getcwderr": "Displayed if the extension cannot obtain the 
current working directory.",
"score-invalidlang": "Displayed if the lang=\"…\" attribute contains an 
unrecognized score language. $1 is the unrecognized language.",
+   "score-invalidnotelanguage": "Displayed if the note-language=\"…\" 
attribute contains an unrecognized note language. $1 is the unrecognized note 
language. $2 is comma separated list of available languages.",
"score-invalidaudiooverride": "Displayed if the file specified with the 
override_audio=\"…\" attribute is invalid. $1 is the value of the 
override_audio attribute.",
"score-midioverridenotfound": "Displayed if the file specified with the 
override_midi=\"…\" attribute could not be found. $1 is the value of the 
override_midi attribute.",
"score-noabcinput": "Displayed if an ABC source file could not be 
created for lang=\"ABC\". $1 is the path to the file that could not be 
created.",
diff --git a/includes/Score.php b/includes/Score.php
index 18b2596..8479a89 100644
--- a/includes/Score.php
+++ b/includes/Score.php
@@ -45,6 +45,29 @@
private static $supportedLangs = [ 'lilypond', 'ABC' ];
 
/**
+* Supported note languages.
+*/
+   private static $supportedNoteLanguages = [
+   'arabic',
+   'catalan',
+   'deutsch',
+   'english',
+   'espanol',
+   'italiano',
+   'nederlands',
+   'norsk',
+   'portugues',
+   'suomi',
+   'svenska',
+   'vlaams'
+   ];
+
+   /**
+* Default language used for notes.
+*/
+   private static $defaultNoteLanguage = 'nederlands';
+
+   /**
 * LilyPond version string.
 * It defaults to null and is set the first time it is required.
 */
@@ -218,6 +241,21 @@
htmlspecialchars( $options['lang'] ) ) 
);
}
 
+   /* Note language selection */
+   if ( array_key_exists( 'note-language', $args ) ) {
+   $options['note-language'] = 
$args['note-language'];
+   } else {
+   $options['note-language'] = 
self::$defaultNoteLanguage;
+   }
+   if ( !in_array( $options['note-language'], 
self::$supportedNoteLanguages ) ) {
+   throw new ScoreException(
+   wfMessage( 'score-invalidnotelanguage' 
)->plaintextParams(
+   $options['note-language'],
+   join( ', ', 
self::$supportedNoteLanguages )
+   )
+   );
+   }
+
/* Override MIDI file? */
  

[MediaWiki-commits] [Gerrit] mediawiki...GlobalPreferences[master]: Switch to using PreferencesFactory, and improve UI

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/370152 )

Change subject: Switch to using PreferencesFactory, and improve UI
..


Switch to using PreferencesFactory, and improve UI

This refactors the extension to use the new PreferencesFactory
service and moves each preference's 'enable this globally?'
toggle to the side of the preferences form to make it easier to
see what's enabled and what's not. It also introduces a
'select-all' toggle for each tab of the preferences form.

Bug: T173476
Bug: T68869
Change-Id: I3c10dfeacf02367e90f84a3e572ecf3f4048e02a
---
M .stylelintrc.json
M extension.json
M i18n/en.json
M i18n/qqq.json
D includes/GlobalPreferences.php
A includes/GlobalPreferencesFactory.php
A includes/GlobalPreferencesForm.php
M includes/Hooks.php
M includes/SpecialGlobalPreferences.php
A includes/Storage.php
M resources/ext.GlobalPreferences.special.css
M resources/ext.GlobalPreferences.special.js
M resources/ext.GlobalPreferences.special.nojs.css
A tests/phpunit/GlobalPreferencesTest.php
14 files changed, 781 insertions(+), 363 deletions(-)

Approvals:
  MaxSem: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.stylelintrc.json b/.stylelintrc.json
index 2c90730..d691e9d 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,3 +1,6 @@
 {
-   "extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia",
+   "rules": {
+   "selector-no-id": null
+   }
 }
diff --git a/extension.json b/extension.json
index 8245339..4824a25 100644
--- a/extension.json
+++ b/extension.json
@@ -23,9 +23,11 @@
"GlobalPreferencesAlias": "GlobalPreferences.alias.php"
},
"AutoloadClasses": {
-   "GlobalPreferences\\GlobalPreferences": 
"includes/GlobalPreferences.php",
"GlobalPreferences\\Hooks": "includes/Hooks.php",
-   "GlobalPreferences\\SpecialGlobalPreferences": 
"includes/SpecialGlobalPreferences.php"
+   "GlobalPreferences\\SpecialGlobalPreferences": 
"includes/SpecialGlobalPreferences.php",
+   "GlobalPreferences\\GlobalPreferencesFactory": 
"includes/GlobalPreferencesFactory.php",
+   "GlobalPreferences\\GlobalPreferencesForm": 
"includes/GlobalPreferencesForm.php",
+   "GlobalPreferences\\Storage": "includes/Storage.php"
},
"Hooks": {
"UserLoadOptions": [
@@ -39,11 +41,11 @@
],
"LoadExtensionSchemaUpdates": [
"GlobalPreferences\\Hooks::onLoadExtensionSchemaUpdates"
+   ],
+   "MediaWikiServices": [
+   "GlobalPreferences\\Hooks::onMediaWikiServices"
]
},
-   "ExtensionFunctions": [
-   "GlobalPreferences\\Hooks::onExtensionFunctions"
-   ],
"ResourceFileModulePaths": {
"localBasePath": "resources",
"remoteExtPath": "GlobalPreferences/resources"
@@ -51,7 +53,8 @@
"ResourceModules": {
"ext.GlobalPreferences.special": {
"styles": "ext.GlobalPreferences.special.css",
-   "scripts": "ext.GlobalPreferences.special.js"
+   "scripts": "ext.GlobalPreferences.special.js",
+   "messages": [ "globalprefs-select-all" ]
},
"ext.GlobalPreferences.special.nojs": {
"styles": "ext.GlobalPreferences.special.nojs.css"
diff --git a/i18n/en.json b/i18n/en.json
index 0e37692..119902e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -5,13 +5,14 @@
]
},
"globalprefs-desc": "Allows users to set global preferences",
-   "globalprefs-set-globally": "This preference has been set globally and 
must be modified through [[Special:GlobalPreferences|your global 
preferences]].",
-   "globalprefs-check-label": "Use this preference on all wikis",
+   "globalprefs-set-globally": "This preference has been set globally and 
must be modified through [[Special:GlobalPreferences#$1|your global 
preferences]].",
+   "tooltip-globalprefs-check-label": "Make this setting global",
"globalprefs-error-header": "Error",
"globalprefs-notglobal": "Your account is not a global account and 
cannot set global preferences.",
"globalpreferences": "Global preferences",
"globalprefs-info-label": "Global preferences:",
"globalprefs-info-link": "Set your global preferences",
"globalprefs-reset-intro": "You can use this page to disable all global 
preferences and return to your local preferences.\nThis cannot be undone.",
-   "globalprefs-restoreprefs": "Remove all global preferences (in all 
sections)"
+   "globalprefs-restoreprefs": "Remove all global preferences (in all 
sections)",
+   

[MediaWiki-commits] [Gerrit] research...wheels[master]: Rebuilds wheels using Debian Stretch

[Halfak (Code Review)]

Halfak has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401822 )

Change subject: Rebuilds wheels using Debian Stretch
..

Rebuilds wheels using Debian Stretch

Change-Id: I7424733b19e05f1f1d03666b4be8bb9a9531c31e
---
R Flask-0.10.1-cp35-none-any.whl
A Flask_Jsonpify-1.5.0-cp35-none-any.whl
D Flask_Jsonpify-1.5.0-py3-none-any.whl
A Jinja2-2.10-py2.py3-none-any.whl
D Jinja2-2.9.6-py2.py3-none-any.whl
D MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
A MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
R PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
D Werkzeug-0.12.2-py2.py3-none-any.whl
A Werkzeug-0.14.1-py2.py3-none-any.whl
D amqp-1.4.9-py2.py3-none-any.whl
A amqp-2.2.2-py2.py3-none-any.whl
A anyjson-0.3.3-cp35-none-any.whl
D anyjson-0.3.3-py3-none-any.whl
D billiard-3.3.0.23-py3-none-any.whl
A billiard-3.5.0.3-py3-none-any.whl
D celery-3.1.25-py2.py3-none-any.whl
A celery-4.1.0-py2.py3-none-any.whl
A certifi-2017.11.5-py2.py3-none-any.whl
D certifi-2017.7.27.1-py2.py3-none-any.whl
M docopt-0.6.2-py2.py3-none-any.whl
A docutils-0.14-py3-none-any.whl
R itsdangerous-0.24-cp35-none-any.whl
A json2tsv-0.1.2-py2.py3-none-any.whl
D kombu-3.0.37-py2.py3-none-any.whl
A kombu-4.1.0-py2.py3-none-any.whl
D mmh3-2.3.1-cp34-cp34m-linux_x86_64.whl
A mmh3-2.3.1-cp35-cp35m-linux_x86_64.whl
R more_itertools-2.2-cp35-none-any.whl
A mwbase-0.0.6-py3-none-any.whl
D mwparserfromhell-0.4.4-cp34-cp34m-linux_x86_64.whl
A mwparserfromhell-0.4.4-cp35-cp35m-linux_x86_64.whl
A mwreverts-0.0.6-py2.py3-none-any.whl
D mwreverts-0.1.5-py2.py3-none-any.whl
D mysqltsv-0.0.7-cp34-none-any.whl
A mysqltsv-0.0.7-cp35-none-any.whl
R nltk-3.0.5-cp35-none-any.whl
D nose-1.3.7-py3-none-any.whl
R numpy-1.10.4-cp35-cp35m-manylinux1_x86_64.whl
A para-0.0.5-cp35-none-any.whl
D para-0.0.6-py3-none-any.whl
D pip-9.0.1-py2.py3-none-any.whl
A py-1.5.2-py2.py3-none-any.whl
R pyenchant-1.6.11-cp35-none-any.whl
A pytest-3.2.5-py2.py3-none-any.whl
D revscoring-2.0.10-py2.py3-none-any.whl
A revscoring-2.1.0-py2.py3-none-any.whl
D scikit_learn-0.17.1-cp34-cp34m-manylinux1_x86_64.whl
A scikit_learn-0.17.1-cp35-cp35m-manylinux1_x86_64.whl
D scipy-0.17.1-cp34-cp34m-manylinux1_x86_64.whl
A scipy-0.17.1-cp35-cp35m-manylinux1_x86_64.whl
A socketIO_client-0.5.6-cp35-none-any.whl
A sseclient-0.0.18-cp35-none-any.whl
D sseclient-0.0.18-py3-none-any.whl
A statistics-1.0.3.5-cp35-none-any.whl
D statsd-3.2.1-py2.py3-none-any.whl
A statsd-3.2.2-py2.py3-none-any.whl
A stopit-1.1.1-cp35-none-any.whl
D stopit-1.1.1-py3-none-any.whl
R textstat-0.3.1-cp35-none-any.whl
A vine-1.1.4-py2.py3-none-any.whl
A websocket_client-0.46.0-py2.py3-none-any.whl
62 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/research/ores/wheels 
refs/changes/22/401822/1

diff --git a/Flask-0.10.1-py3-none-any.whl b/Flask-0.10.1-cp35-none-any.whl
similarity index 93%
rename from Flask-0.10.1-py3-none-any.whl
rename to Flask-0.10.1-cp35-none-any.whl
index 12109b9..b8e0ef5 100644
--- a/Flask-0.10.1-py3-none-any.whl
+++ b/Flask-0.10.1-cp35-none-any.whl
Binary files differ
diff --git a/Flask_Jsonpify-1.5.0-cp35-none-any.whl 
b/Flask_Jsonpify-1.5.0-cp35-none-any.whl
new file mode 100644
index 000..d4784b4
--- /dev/null
+++ b/Flask_Jsonpify-1.5.0-cp35-none-any.whl
Binary files differ
diff --git a/Flask_Jsonpify-1.5.0-py3-none-any.whl 
b/Flask_Jsonpify-1.5.0-py3-none-any.whl
deleted file mode 100644
index de8c6bb..000
--- a/Flask_Jsonpify-1.5.0-py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/Jinja2-2.10-py2.py3-none-any.whl b/Jinja2-2.10-py2.py3-none-any.whl
new file mode 100644
index 000..7bc4e35
--- /dev/null
+++ b/Jinja2-2.10-py2.py3-none-any.whl
Binary files differ
diff --git a/Jinja2-2.9.6-py2.py3-none-any.whl 
b/Jinja2-2.9.6-py2.py3-none-any.whl
deleted file mode 100644
index 9fb201e..000
--- a/Jinja2-2.9.6-py2.py3-none-any.whl
+++ /dev/null
Binary files differ
diff --git a/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl 
b/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
deleted file mode 100644
index ed26616..000
--- a/MarkupSafe-1.0-cp34-cp34m-linux_x86_64.whl
+++ /dev/null
Binary files differ
diff --git a/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl 
b/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
new file mode 100644
index 000..7041c1b
--- /dev/null
+++ b/MarkupSafe-1.0-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/PyYAML-3.11-cp34-cp34m-linux_x86_64.whl 
b/PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
similarity index 87%
rename from PyYAML-3.11-cp34-cp34m-linux_x86_64.whl
rename to PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
index 5f249f6..bc62a30 100644
--- a/PyYAML-3.11-cp34-cp34m-linux_x86_64.whl
+++ b/PyYAML-3.11-cp35-cp35m-linux_x86_64.whl
Binary files differ
diff --git a/Werkzeug-0.12.2-py2.py3-none-any.whl 
b/Werkzeug-0.12.2-py2.py3-none-any.whl
deleted file mode 100644
index 9a81bf8..000
--- a/Werkzeug-0.12.2-py2.py3-none-any.whl
+++ /dev/null

[MediaWiki-commits] [Gerrit] mediawiki...codesniffer[master]: Add sniff to use namespaced PHPUnit\Framework\TestCase

[Legoktm (Code Review)]

Legoktm has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401823 )

Change subject: Add sniff to use namespaced PHPUnit\Framework\TestCase
..

Add sniff to use namespaced PHPUnit\Framework\TestCase

PHPUnit 6 introduced namespaces, but those changes were backported to
PHPUnit 4 to make the migration easier.

In preparation for the PHPUnit version upgrade, move to the namespaced
version. This requires a minimum of PHPUnit 4.8.35/5.4.3, which
MediaWiki has been using for a while now.

Bug: T184137
Change-Id: I1021dba1a74a4afcf2aa4fe33232e06fdedf271f
---
A MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
M MediaWiki/Tests/MediaWikiStandardTest.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php
A MediaWiki/Tests/files/Usage/phpunit_usage.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage2.php
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage2.php.fixed
A MediaWiki/Tests/files/Usage/phpunit_usage3.php
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.expect
A MediaWiki/Tests/files/Usage/phpunit_usage3.php.fixed
M composer.json
12 files changed, 161 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/codesniffer 
refs/changes/23/401823/1

diff --git a/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php 
b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
new file mode 100644
index 000..4c646be
--- /dev/null
+++ b/MediaWiki/Sniffs/Usage/PHPUnitClassUsageSniff.php
@@ -0,0 +1,78 @@
+
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+namespace MediaWiki\Sniffs\Usage;
+
+use PHP_CodeSniffer\Files\File;
+use PHP_CodeSniffer\Sniffs\Sniff;
+
+/**
+ * Converts PHPUnit_Framework_TestCase to the new
+ * PHPUnit 6 namespaced PHPUnit\Framework\Testcase
+ *
+ * The namespaced classes were backported in 4.8.35,
+ * so this is compatible with 4.8.35+ and 5.4.3+
+ */
+class PHPUnitClassUsageSniff implements Sniff {
+   /**
+* Only look for classes that extend something
+*
+* @return array|int[]
+*/
+   public function register() {
+   return [ T_EXTENDS ];
+   }
+
+   /**
+* @param File $phpcsFile File object
+* @param int $stackPtr Position of extends token
+*/
+   public function process( File $phpcsFile, $stackPtr ) {
+   $tokens = $phpcsFile->getTokens();
+   $classPtr = $phpcsFile->findPrevious( T_CLASS, $stackPtr );
+   if ( $classPtr === false ) {
+   // interface Foo extends .. which we don't care about
+   return;
+   }
+   $phpunitPtr = $phpcsFile->findNext( T_STRING, $stackPtr );
+   $phpunitToken = $tokens[$phpunitPtr];
+   if ( $phpunitToken['content'] !== 'PHPUnit_Framework_TestCase' 
) {
+   return;
+   }
+
+   $fix = $phpcsFile->addFixableWarning(
+   'Namespaced PHPUnit TestCase class should be used 
instead',
+   $phpunitPtr,
+   'NotNamespaced'
+   );
+   if ( $fix ) {
+   $new = 'PHPUnit\\Framework\\TestCase';
+   // If this file is namespaced, we need a leading \
+   $inANamespace = $phpcsFile->findPrevious( T_NAMESPACE, 
$classPtr ) !== false;
+   $classNameWithSlash = 
$phpcsFile->findExtendedClassName( $classPtr );
+   // But make sure it doesn't already have a slash...
+   $hashLeadingSlash = $classNameWithSlash[0] === '\\';
+   if ( $inANamespace && !$hashLeadingSlash ) {
+   $new = '\\' . $new;
+   }
+   $phpcsFile->fixer->replaceToken( $phpunitPtr, $new );
+   }
+   }
+}
diff --git a/MediaWiki/Tests/MediaWikiStandardTest.php 
b/MediaWiki/Tests/MediaWikiStandardTest.php
index 8a28bb3..b1295af 100644
--- a/MediaWiki/Tests/MediaWikiStandardTest.php
+++ b/MediaWiki/Tests/MediaWikiStandardTest.php
@@ -20,7 +20,7 @@
 
 namespace 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Don't ship unused templates to the client

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398684 )

Change subject: Don't ship unused templates to the client
..


Don't ship unused templates to the client

Rerendering the header (description) doesn't use templates anymore, so
don't ship those. Also don't ship templates for actions that are never
rendered on the client, like diffs and history.

This reduces the size of the ext.flow.templating module by 14KB.

Bonus: Remove unused form_element partial.

Change-Id: Ie5b8797b55d474fadc7a0e52c838465abafb8a61
---
M extension.json
D handlebars/form_element.partial.handlebars
2 files changed, 0 insertions(+), 43 deletions(-)

Approvals:
  Sbisson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/extension.json b/extension.json
index 300fdea..7eb3e04 100644
--- a/extension.json
+++ b/extension.json
@@ -137,31 +137,12 @@
],
"templates": [

"handlebars/flow_anon_warning.partial.handlebars",
-   
"handlebars/flow_block_board-history.handlebars",
-   "handlebars/flow_block_header.handlebars",
-   
"handlebars/flow_block_header_diff_view.handlebars",
-   "handlebars/flow_block_header_edit.handlebars",
-   
"handlebars/flow_block_header_single_view.handlebars",
"handlebars/flow_block_loop.handlebars",
"handlebars/flow_block_topic.handlebars",
-   
"handlebars/flow_block_topic_diff_view.handlebars",
-   
"handlebars/flow_block_topic_edit_title.handlebars",
-   
"handlebars/flow_block_topic_history.handlebars",
-   
"handlebars/flow_block_topic_moderate_post.handlebars",
-   
"handlebars/flow_block_topic_moderate_topic.handlebars",
-   
"handlebars/flow_block_topic_single_view.handlebars",
"handlebars/flow_block_topiclist.handlebars",
-   
"handlebars/flow_block_topicsummary_diff_view.handlebars",
-   
"handlebars/flow_block_topicsummary_edit.handlebars",
-   
"handlebars/flow_block_topicsummary_single_view.handlebars",

"handlebars/flow_board_navigation.partial.handlebars",
"handlebars/flow_edit_post.partial.handlebars",
-   
"handlebars/flow_edit_topic_title.partial.handlebars",
"handlebars/flow_errors.partial.handlebars",
-   
"handlebars/flow_header_title.partial.handlebars",
-   
"handlebars/flow_header_detail.partial.handlebars",
-   
"handlebars/flow_header_categories.partial.handlebars",
-   
"handlebars/flow_header_footer.partial.handlebars",
"handlebars/flow_load_more.partial.handlebars",

"handlebars/flow_moderate_post_confirmation.partial.handlebars",

"handlebars/flow_moderate_post.partial.handlebars",
@@ -189,7 +170,6 @@

"handlebars/flow_topic_titlebar.partial.handlebars",

"handlebars/flow_topic_moderation_flag.partial.handlebars",

"handlebars/flow_topiclist_loop.partial.handlebars",
-   "handlebars/form_element.partial.handlebars",
"handlebars/timestamp.handlebars"
],
"messages": [
diff --git a/handlebars/form_element.partial.handlebars 
b/handlebars/form_element.partial.handlebars
deleted file mode 100644
index 0c01b1c..000
--- a/handlebars/form_element.partial.handlebars
+++ /dev/null
@@ -1,23 +0,0 @@
-{{!
-   }}<{{tag}}
-   {{#if class}}class="{{class}}"{{/if}}
-   {{#if type}}type="{{type}}"{{/if}}
-   {{#if name}}name="{{name}}"{{/if}}
-   {{#if placeholder}}placeholder="{{placeholder}}"{{/if}}
-   {{#if value}}value="{{value}}"{{/if}}
-   {{#if role}}data-role="{{role}}"{{/if}}
-   {{#if min}}min="{{min}}"{{/if}}
-   {{#if max}}max="{{max}}"{{/if}}
-   {{#if maxlength}}maxlength="{{maxlength}}"{{/if}}
-   {{#if pattern}}pattern="{{pattern}}"{{/if}}
-{{!--
-   {{#if required}}required="required"{{/if}}
---}}
-   {{#if closing_tag}}>{{else}}/>{{/if}}{{!
-   }}{{#if radio}}{{/if}}{{!
-   }}{{#if checkbox}}{{/if}}{{!
-   }}{{content}}{{!
-   }}{{#if closing_tag}}{{/if}}{{!
-}}{{#if validation}}{{/if}}{{!
-}}{{!

[MediaWiki-commits] [Gerrit] oojs/ui[master]: Follow-up 49cce4496: Bump package.json version as well for v...

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401802 )

Change subject: Follow-up 49cce4496: Bump package.json version as well for 
v0.24.4
..


Follow-up 49cce4496: Bump package.json version as well for v0.24.4

This way the history release tool selects v0.24.4..v0.25.0 and not
v0.24.3..v0.25.0, which would be a pain.

Change-Id: I997cf78d4550ca4511dfdc6b8d40599f815263ba
---
M package.json
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Bartosz Dziewoński: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/package.json b/package.json
index 0e10483..7ab1775 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "oojs-ui",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "User interface classes built on the OOjs framework.",
   "keywords": [
 "oojs-plugin",

-- 
To view, visit https://gerrit.wikimedia.org/r/401802
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I997cf78d4550ca4511dfdc6b8d40599f815263ba
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Add highlight and selection feature for query result table f...

[Anpans (Code Review)]

Anpans has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401808 )

Change subject: Add highlight and selection feature for query result table for 
Query.Wikidata.org
..

Add highlight and selection feature for query result table for 
Query.Wikidata.org

Change-Id: Ia8733d328300d243ddbb715ae9c07b9fec8e8510
Phabricator: T183807
---
M style.less
M wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
2 files changed, 108 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui 
refs/changes/08/401808/1

diff --git a/style.less b/style.less
index 5567952..602efff 100644
--- a/style.less
+++ b/style.less
@@ -68,6 +68,10 @@
padding: 0 0.5em 0 0;
 }
 
+.table-cell-selected{
+   background-color: palegreen;
+}
+
 .fixed-table-pagination {
margin-bottom: 2.5em;
 }
diff --git a/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js 
b/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
index e992161..2b2dc74 100644
--- a/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
+++ b/wikibase/queryService/ui/resultBrowser/TableResultBrowser.js
@@ -41,6 +41,12 @@
 * @property {Object}
 * @private
 */
+   SELF.prototype._$selectedCell = {};
+
+   /**
+* @property {Object}
+* @private
+*/
SELF.prototype._sorter = {
string: function( val1, val2 ) {
return val1.localeCompare( val2 );
@@ -144,15 +150,111 @@
showPaginationSwitch: showPagination,
pageSize: TABLE_PAGE_SIZE,
pageList: TABLE_PAGE_SIZE_LIST,
-   keyEvents: true,
+   keyEvents: false,
cookie: true,
cookieIdTable: '1',
cookieExpire: '1y',
-   cookiesEnabled: [ 'bs.table.pageList' ]
+   cookiesEnabled: [ 'bs.table.pageList' ],
+   onResetView: function(name, args){
+   self.selectFirstCell($element);
+   },
+   onClickCell: function(field, value, row, $cell){
+   self.selectCell($cell);
+   }
} );
+   $(document).keydown(function(e){
+   self.keyPressed(e);
+   });
};
 
/**
+* Select the first cell of the table
+*
+* @private
+* @param {jQuery} $table in which to select the first cell
+*/
+   SELF.prototype.selectFirstCell = function($table){
+   var $cell = $table.find( 'td' ).first();
+   this.selectCell($cell);
+   }
+
+   /**
+* Select and highlight a cell
+*
+* @private
+* @param {jQuery} $cell to be highlighted
+*/
+   SELF.prototype.selectCell = function($cell){
+   if($cell.length){ //if cell actually exists
+   if(this._$selectedCell.length)
+   this._$selectedCell.removeClass( 
'table-cell-selected' );
+   this._$selectedCell = $cell;
+   if(!this._$selectedCell.parent().hasClass( 
'no-records-found' )){ //make sure that the cell chosen isn't a 'No Matching 
Records Found' cell
+   this._$selectedCell.addClass( 
'table-cell-selected' );
+   var offset = this._$selectedCell.offset().top; 
//make sure the highlighed cell is visible 
(https://stackoverflow.com/questions/6215779/scroll-if-element-is-not-visible)
+   var visible_area_start = $(window).scrollTop();
+   var visible_area_end = visible_area_start + 
window.innerHeight;
+   if(offset < visible_area_start || offset > 
visible_area_end){
+ // Not in view so scroll to it
+ $( 'html,body' ).animate({scrollTop: offset - window.innerHeight/3}, 
100);
+   }
+   }
+   }
+   }
+
+   /**
+* Called when a key is pressed
+*
+* @private
+* @param e event element
+*/
+SELF.prototype.keyPressed = function(e){
+if($(document.activeElement).is( 'textarea, input' )){
+return;
+}
+if((e.ctrlKey || e.metaKey) && e.which === 67){ //if Ctrl + C 
is pressed
+this.copyToClipboard(this._$selectedCell);
+return;
+}
+if ( e.ctrlKey || e.metaKey || e.altKey ) {
+   return;
+   }
+
+   switch(e.which){
+   case 13: //When the enter key is pressed, 

[MediaWiki-commits] [Gerrit] labs...stashbot[master]: Guard against degenerate messages in #wikimedia-cloud

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401202 )

Change subject: Guard against degenerate messages in #wikimedia-cloud
..


Guard against degenerate messages in #wikimedia-cloud

Change-Id: I1a06d3bf807bda5772f328dc91c9d3f19448ee95
---
M stashbot/sal.py
1 file changed, 13 insertions(+), 1 deletion(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/stashbot/sal.py b/stashbot/sal.py
index 850b5ce..55efae1 100644
--- a/stashbot/sal.py
+++ b/stashbot/sal.py
@@ -91,7 +91,19 @@
 bang['nick'], bang['message'] = bang['message'].split(None, 1)
 
 if channel in ['#wikimedia-labs', '#wikimedia-cloud']:
-bang['project'], bang['message'] = bang['message'].split(None, 1)
+parts = bang['message'].split(None, 1)
+if len(parts) < 2:
+if respond_to_channel:
+self.irc.respond(
+conn, event,
+(
+'%s: Missing project or message? '
+'Expected !log  '
+) % bang['nick']
+)
+return
+
+bang['project'], bang['message'] = parts
 if bang['project'] not in self._get_projects():
 self.logger.warning('Invalid project "%s"', bang['project'])
 if respond_to_channel:

-- 
To view, visit https://gerrit.wikimedia.org/r/401202
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1a06d3bf807bda5772f328dc91c9d3f19448ee95
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/stashbot
Gerrit-Branch: master
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: BryanDavis 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Bump src/ to 5abd780 + add pn

[Arlolra (Code Review)]

Arlolra has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401809 )

Change subject: Bump src/ to 5abd780 + add pn
..

Bump src/ to 5abd780 + add pn

Change-Id: I136ce84512a512bf0abc9656853b579a6468b777
---
A node_modules/pn/.travis.yml
A node_modules/pn/README.md
A node_modules/pn/_promise.js
A node_modules/pn/_promisify.js
A node_modules/pn/assert.js
A node_modules/pn/async_hooks.js
A node_modules/pn/buffer.js
A node_modules/pn/child_process.js
A node_modules/pn/cluster.js
A node_modules/pn/console.js
A node_modules/pn/crypto.js
A node_modules/pn/dgram.js
A node_modules/pn/dns.js
A node_modules/pn/domain.js
A node_modules/pn/events.js
A node_modules/pn/fs.js
A node_modules/pn/http.js
A node_modules/pn/http2.js
A node_modules/pn/https.js
A node_modules/pn/inspector.js
A node_modules/pn/net.js
A node_modules/pn/os.js
A node_modules/pn/package.json
A node_modules/pn/path.js
A node_modules/pn/perf_hooks.js
A node_modules/pn/process.js
A node_modules/pn/punycode.js
A node_modules/pn/querystring.js
A node_modules/pn/readline.js
A node_modules/pn/repl.js
A node_modules/pn/scripts/generate.js
A node_modules/pn/stream.js
A node_modules/pn/string_decoder.js
A node_modules/pn/test/cp.js
A node_modules/pn/test/custom.js
A node_modules/pn/test/fs.js
A node_modules/pn/test/load.js
A node_modules/pn/test/timers.js
A node_modules/pn/timers.js
A node_modules/pn/tls.js
A node_modules/pn/tty.js
A node_modules/pn/url.js
A node_modules/pn/util.js
A node_modules/pn/v8.js
A node_modules/pn/vm.js
A node_modules/pn/zlib.js
M src
47 files changed, 1,251 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy 
refs/changes/09/401809/1

diff --git a/node_modules/pn/.travis.yml b/node_modules/pn/.travis.yml
new file mode 100644
index 000..e1519e4
--- /dev/null
+++ b/node_modules/pn/.travis.yml
@@ -0,0 +1,13 @@
+language: node_js
+node_js:
+  - "9.3.0"
+  - "8.9.4"
+  - "7.10.1"
+  - "6.12.3"
+  - "5.12.0"
+  - "4.8.7"
+  - "3.3.1"
+  - "2.5.0"
+  - "0.12"
+  - "0.11"
+  - "0.10"
diff --git a/node_modules/pn/README.md b/node_modules/pn/README.md
new file mode 100644
index 000..29ca995
--- /dev/null
+++ b/node_modules/pn/README.md
@@ -0,0 +1,148 @@
+# pn
+[![NPM][NPM1]][NPM2]
+
+[![Build Status][1]][2]
+
+The `pn` library gives you the Promise-using node standard library
+you've always dreamed of.  Think "Promised Node" when saying it.
+
+Just about every node standard library method that takes a callback will now
+return a `Promise` iff no callback is supplied.  But existing code
+that passes callbacks will still work fine --- and fast:  No unnecessary
+`Promise`s are created if you supply a callback.
+
+The wrappers are generated automatically by a script, with a table to
+handle exceptions and odd cases.  See below for more details.
+
+## Installation
+```
+npm install pn
+```
+## Usage
+```
+var fs = require('pn/fs');
+fs.writeFile('foo', 'bar', 'utf-8').then(function() { console.log('done'); });
+// But you can use callbacks, too -- existing code won't break.
+fs.writeFile('foo', 'bat', 'utf-8', function(err) { console.log('yay'); });
+```
+
+This library uses node native promises (ie `global.Promise`) by
+default, and thus works with node >= 0.11.
+
+You can use [`core-js`](https://www.npmjs.org/package/core-js) or
+[`es6-shim`](https://www.npmjs.org/package/es6-shim)
+to add ES6 Promises to earlier versions of node, for example:
+```
+require('es6-shim');
+var fs = require('pn/fs');
+```
+Just be sure that `es6-shim` is loaded before the `pn` package in that
+case.
+
+You might also want to look into packages like
+[`prfun`](https://www.npmjs.org/package/prfun)
+which add some helpers to make working with native promises much more
+fun.
+
+In particular, the `Promise#done` method is very useful when
+debugging, at least until v8's native Promise debugging
+capabilities are completed.
+
+## Custom Promise types
+
+You can also specify a custom `Promise` type to use, as follows:
+```
+var MyPromise = require('prfun');  // Use prfun's Promises, for example.
+require('pn/_promise')(MyPromise); // This only needs to be done once.
+```
+
+## Exceptions and odd cases
+
+The wrappers are automatically generated by `scripts/generate.js`;
+there is a table in that file which specifies all the odd cases.
+
+In general: if the node API has a callback which takes multiple
+value arguments, the `Promise` returned will be an object with
+named fields corresponding to the different values. If the node
+API takes a callback *and* returns a value, `pn` will return
+the original value with a nonenumerable field named `promise`
+corresponding to the callback.  Combining these two cases:
+```
+var child_process = require('pn/child_process');
+var cp = child_process.execFile('true');
+console.log('pid', cp.pid);
+cp.promise.then(function(result) {
+  console.log('stdout: ', result.stdout);
+  

[MediaWiki-commits] [Gerrit] operations/puppet[production]: microsites::peopleweb: convert role to profile

[Dzahn (Code Review)]

Dzahn has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400245 )

Change subject: microsites::peopleweb: convert role to profile
..


microsites::peopleweb: convert role to profile

Change-Id: Id4f0641bd382682ff3c5ae8d9a22efbfed0834a4
---
A modules/profile/manifests/microsites/peopleweb.pp
M modules/role/manifests/microsites/peopleweb.pp
2 files changed, 25 insertions(+), 18 deletions(-)

Approvals:
  jenkins-bot: Verified
  Dzahn: Looks good to me, approved



diff --git a/modules/profile/manifests/microsites/peopleweb.pp 
b/modules/profile/manifests/microsites/peopleweb.pp
new file mode 100644
index 000..0514bb9
--- /dev/null
+++ b/modules/profile/manifests/microsites/peopleweb.pp
@@ -0,0 +1,22 @@
+# let users publish their own HTML in their home dirs
+class profile::microsites::peopleweb {
+
+class { '::publichtml':
+sitename => 'people.wikimedia.org',
+server_admin => 'n...@wikimedia.org',
+}
+
+ferm::service { 'people-http':
+proto  => 'tcp',
+port   => '80',
+srange => '$CACHE_MISC',
+}
+
+motd::script { 'people-motd':
+ensure  => present,
+content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles 
you put in 'public_html' in your home dir will be accessible on the web.\nMore 
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
+}
+
+backup::set {'home': }
+}
+
diff --git a/modules/role/manifests/microsites/peopleweb.pp 
b/modules/role/manifests/microsites/peopleweb.pp
index 26c0cb8..f9a85e9 100644
--- a/modules/role/manifests/microsites/peopleweb.pp
+++ b/modules/role/manifests/microsites/peopleweb.pp
@@ -1,26 +1,11 @@
 # let users publish their own HTML in their home dirs
 class role::microsites::peopleweb {
 
+system::role { $name: }
+
 include ::standard
 include ::profile::base::firewall
 include ::profile::backup::host
-
-class { '::publichtml':
-sitename => 'people.wikimedia.org',
-server_admin => 'n...@wikimedia.org',
-}
-
-ferm::service { 'people-http':
-proto  => 'tcp',
-port   => '80',
-srange => '$CACHE_MISC',
-}
-
-motd::script { 'people-motd':
-ensure  => present,
-content => "#!/bin/sh\necho '\nThis is people.wikimedia.org.\nFiles 
you put in 'public_html' in your home dir will be accessible on the web.\nMore 
info on https://wikitech.wikimedia.org/wiki/People.wikimedia.org.\n'",
-}
-
-backup::set {'home': }
+include ::profile::microsites::peopleweb
 }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/400245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id4f0641bd382682ff3c5ae8d9a22efbfed0834a4
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix FAQ link

[Reedy (Code Review)]

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401743 )

Change subject: Fix FAQ link
..

Fix FAQ link

Change-Id: I15689b323413d1c6e6a7f474b98608d91806456c
---
M data/templates/base.html
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/wikimania-scholarships 
refs/changes/43/401743/2

diff --git a/data/templates/base.html b/data/templates/base.html
index fbbd291..b0740f4 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -78,7 +78,7 @@
   
   
 
-  http://wikimania2017.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
+  http://wikimania2018.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
   {{ 'footer-credits'|message 
}}
   {{ 'footer-privacy'|message 
}}
   {{ 
'footer-contact'|message }}

-- 
To view, visit https://gerrit.wikimedia.org/r/401743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15689b323413d1c6e6a7f474b98608d91806456c
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Reedy 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: aptly: Update published repo distributions

[Arturo Borrero Gonzalez (Code Review)]

Arturo Borrero Gonzalez has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/399667 )

Change subject: aptly: Update published repo distributions
..


aptly: Update published repo distributions

* Precise is no longer available in Cloud VPS
* Stretch is now available in Cloud VPS

Bug: T183235
Change-Id: Id3551fbfe554fcb22ad6dbf3f56b7ffdfd0a8dcb
---
M modules/role/manifests/aptly/server.pp
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Arturo Borrero Gonzalez: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/role/manifests/aptly/server.pp 
b/modules/role/manifests/aptly/server.pp
index 194b3e2..b4c1af0 100644
--- a/modules/role/manifests/aptly/server.pp
+++ b/modules/role/manifests/aptly/server.pp
@@ -6,11 +6,7 @@
 class role::aptly::server {
 include ::aptly
 
-# Auto setup published repositories for all 3 available distros
-aptly::repo { "precise-${::labsproject}":
-publish  => true,
-}
-
+# Auto setup published repositories for all available distros
 aptly::repo { "trusty-${::labsproject}":
 publish  => true,
 }
@@ -19,6 +15,10 @@
 publish  => true,
 }
 
+aptly::repo { "stretch-${::labsproject}":
+publish  => true,
+}
+
 ferm::service { 'aptly':
 proto  => 'tcp',
 port   => '80',

-- 
To view, visit https://gerrit.wikimedia.org/r/399667
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id3551fbfe554fcb22ad6dbf3f56b7ffdfd0a8dcb
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis 
Gerrit-Reviewer: Arturo Borrero Gonzalez 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: nova: fix dependency order on dir and mount for instances

[Rush (Code Review)]

Rush has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401742 )

Change subject: nova: fix dependency order on dir and mount for instances
..


nova: fix dependency order on dir and mount for instances

Bug: T171494
Change-Id: I5d935a2bb6ba00a126c8db9109d29b4c3889654e
---
M modules/profile/manifests/openstack/base/nova/compute/service.pp
1 file changed, 14 insertions(+), 11 deletions(-)

Approvals:
  Rush: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/profile/manifests/openstack/base/nova/compute/service.pp 
b/modules/profile/manifests/openstack/base/nova/compute/service.pp
index 27fc19a..e0f2bb3 100644
--- a/modules/profile/manifests/openstack/base/nova/compute/service.pp
+++ b/modules/profile/manifests/openstack/base/nova/compute/service.pp
@@ -11,10 +11,6 @@
 
 require_package('conntrack')
 
-if $::fqdn =~ /^labvirt100[0-9].eqiad.wmnet/ {
-openstack::nova::compute::partition{ '/dev/sdb':}
-}
-
 interface::tagged { $network_flat_interface:
 base_interface => $network_flat_tagged_base_interface,
 vlan_id=> $network_flat_interface_vlan,
@@ -23,18 +19,24 @@
 down   => 'ip link set $IFACE down',
 }
 
+if $::fqdn =~ /^labvirt100[0-9].eqiad.wmnet/ {
+openstack::nova::compute::partition{ '/dev/sdb':
+before => File['/var/lib/nova/instances'],
+}
+}
+
+file { '/var/lib/nova/instances':
+ensure => 'directory',
+owner  => 'nova',
+group  => 'nova',
+}
+
 mount { '/var/lib/nova/instances':
 ensure  => mounted,
 device  => $instance_dev,
 fstype  => 'xfs',
 options => 'defaults',
-}
-
-file { '/var/lib/nova/instances':
-ensure  => 'directory',
-owner   => 'nova',
-group   => 'nova',
-require => Mount['/var/lib/nova/instances'],
+require => File['/var/lib/nova/instances'],
 }
 
 # Increase the size of conntrack table size (default is 65536)
@@ -55,6 +57,7 @@
 libvirt_type => $libvirt_type,
 certname => $certname,
 ca_target=> $ca_target,
+require  => Mount['/var/lib/nova/instances'],
 }
 contain '::openstack::nova::compute::service'
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401742
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I5d935a2bb6ba00a126c8db9109d29b4c3889654e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush 
Gerrit-Reviewer: Rush 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpicePageTemplates[master]: add minusx support to composer.json

[OmkarJ (Code Review)]

OmkarJ has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401745 )

Change subject: add minusx support to composer.json
..

add minusx support to composer.json

Bug: T175794
Change-Id: I7d3dd4637025ce71534a562f7682f46c819cd4d7
---
M composer.json
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpicePageTemplates 
refs/changes/45/401745/1

diff --git a/composer.json b/composer.json
index 05828d6..d9cf1e9 100644
--- a/composer.json
+++ b/composer.json
@@ -13,11 +13,16 @@
},
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "jakub-onderka/php-console-highlighter": "0.3.2"
+   "jakub-onderka/php-console-highlighter": "0.3.2",
+   "mediawiki/minus-x": "0.2.1"
},
"scripts": {
"test": [
-   "parallel-lint . --exclude vendor --exclude 
node_modules"
+   "parallel-lint . --exclude vendor --exclude 
node_modules",
+   "minus-x check ."
+   ],
+   "fix": [
+   "minus-x fix ."
]
}
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/401745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7d3dd4637025ce71534a562f7682f46c819cd4d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpicePageTemplates
Gerrit-Branch: master
Gerrit-Owner: OmkarJ 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: mariadb: "Depool" pc2005 for maintenance

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401744 )

Change subject: mariadb: "Depool" pc2005 for maintenance
..


mariadb: "Depool" pc2005 for maintenance

In reality, just just point it to a different server and hope
maintenance doesn't happen for long.

Bug: T183750
Change-Id: I216e4ca2c0c804fb7ea375b987146387665d36fb
---
M wmf-config/db-codfw.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Jcrespo: Looks good to me, approved



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 77da252..b537223 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -9,7 +9,8 @@
 
 $wmgParserCacheDBs = [
'10.64.0.12'   => '10.192.16.170', # pc2004, B5 2.4TB 256GB
-   '10.64.32.72'  => '10.192.32.128', # pc2005, C5 2.4TB 256GB
+   # '10.64.32.72'  => '10.192.32.128', # pc2005, C5 2.4TB 256GB down for 
maintenance T183750
+   '10.64.32.72'  => '10.192.16.170', # pc2004 temp.
'10.64.48.128' => '10.192.48.39',  # pc2006, D5 2.4TB 256GB
 ];
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I216e4ca2c0c804fb7ea375b987146387665d36fb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Papaul 
Gerrit-Reviewer: Urbanecm 
Gerrit-Reviewer: Zoranzoki21 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: WIP DNM MCR RevisionStore::checkDatabaseWikiId use DatabaseD...

[Addshore (Code Review)]

Addshore has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401736 )

Change subject: WIP DNM MCR RevisionStore::checkDatabaseWikiId use 
DatabaseDomain
..

WIP DNM MCR RevisionStore::checkDatabaseWikiId use DatabaseDomain

This still doesn't work for the case in T183914 as the dbname includes
a - and wfSplitWikiID splits this off assuming it is a prefix..

> var_dump(wfSplitWikiID(wfWikiID()));
array(2) {
  [0] =>
  string(12) "s53402__wmde"
  [1] =>
  string(8) "uca-test"
}

We can not comapre a wikiId with a dbDomainId here.
So convert any wikiIds to dbDomainIds before comapring.

Bug: T183914
Change-Id: I45a151a332145438c484e02bbe96cd85dd602b9e
---
M includes/Storage/RevisionStore.php
1 file changed, 16 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/36/401736/3

diff --git a/includes/Storage/RevisionStore.php 
b/includes/Storage/RevisionStore.php
index ce56efc..8587148 100644
--- a/includes/Storage/RevisionStore.php
+++ b/includes/Storage/RevisionStore.php
@@ -49,6 +49,7 @@
 use WANObjectCache;
 use Wikimedia\Assert\Assert;
 use Wikimedia\Rdbms\Database;
+use Wikimedia\Rdbms\DatabaseDomain;
 use Wikimedia\Rdbms\DBConnRef;
 use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
@@ -1465,21 +1466,25 @@
 * @throws MWException
 */
private function checkDatabaseWikiId( IDatabase $db ) {
-   $storeWiki = $this->wikiId;
-   $dbWiki = $db->getDomainID();
+   $dbDomainId = $db->getDomainID();
 
-   if ( $dbWiki === $storeWiki ) {
+   if ( $this->wikiId ) {
+   $wikiId = $this->wikiId;
+   } else {
+   // XXX: we really want the default database ID...
+   $wikiId = wfWikiID();
+   }
+
+   list( $storeDbName, $storeDbPrefix ) = wfSplitWikiID( $wikiId );
+
+   $storeDomain = new DatabaseDomain( $storeDbName, null, 
$storeDbPrefix );
+   $storeDomainId = $storeDomain->getId();
+   if ( $storeDomainId === $dbDomainId ) {
return;
}
 
-   // XXX: we really want the default database ID...
-   $storeWiki = $storeWiki ?: wfWikiID();
-   $dbWiki = $dbWiki ?: wfWikiID();
-
-   if ( $dbWiki !== $storeWiki ) {
-   throw new MWException( "RevisionStore for $storeWiki "
-   . "cannot be used with a DB connection for 
$dbWiki" );
-   }
+   throw new MWException( "RevisionStore for $storeDomainId "
+   . "cannot be used with a DB connection for $dbDomainId" 
);
}
 
/**

-- 
To view, visit https://gerrit.wikimedia.org/r/401736
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45a151a332145438c484e02bbe96cd85dd602b9e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add message to the assert of ApiClearHasMsgTest

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401654 )

Change subject: Add message to the assert of ApiClearHasMsgTest
..


Add message to the assert of ApiClearHasMsgTest

This adds 'sanity check' message for one of asserts so it is more
clear that it is asserting a precondition.

Change-Id: I10d36c1bf69effd7bd83f4a2259144e9f6e114fc
---
M tests/phpunit/includes/api/ApiClearHasMsgTest.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Legoktm: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Anomie: Looks good to me, approved



diff --git a/tests/phpunit/includes/api/ApiClearHasMsgTest.php 
b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
index b7d3205..5b12407 100644
--- a/tests/phpunit/includes/api/ApiClearHasMsgTest.php
+++ b/tests/phpunit/includes/api/ApiClearHasMsgTest.php
@@ -13,7 +13,7 @@
public function testClearFlag() {
$user = self::$users['sysop']->getUser();
$user->setNewtalk( true );
-   $this->assertTrue( $user->getNewtalk() );
+   $this->assertTrue( $user->getNewtalk(), 'sanity check' );
 
$data = $this->doApiRequest( [ 'action' => 'clearhasmsg' ], [] 
);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401654
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I10d36c1bf69effd7bd83f4a2259144e9f6e114fc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Phantom42 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics/statsv[master]: Have to subscribe if using multiple kafka topics.

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401750 )

Change subject: Have to subscribe if using multiple kafka topics.
..


Have to subscribe if using multiple kafka topics.

Bug: T179093
Change-Id: I33be897a9170836de6d55fa3cb7a163dc988fce9
---
M statsv.py
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Ottomata: Verified; Looks good to me, approved



diff --git a/statsv.py b/statsv.py
index 627d79b..9d0b591 100644
--- a/statsv.py
+++ b/statsv.py
@@ -204,7 +204,6 @@
 
 # Create our Kafka Consumer instance.
 consumer = KafkaConsumer(
-kafka_topics,
 bootstrap_servers=kafka_bootstrap_servers,
 group_id=kafka_consumer_group,
 auto_offset_reset='latest',
@@ -213,6 +212,7 @@
 enable_auto_commit=False,
 consumer_timeout_ms=kafka_consumer_timeout_seconds * 1000
 )
+consumer.subscribe(kafka_topics)
 
 watchdog = Watchdog()
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I33be897a9170836de6d55fa3cb7a163dc988fce9
Gerrit-PatchSet: 1
Gerrit-Project: analytics/statsv
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Remove the old editor system

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/398682 )

Change subject: Remove the old editor system
..


Remove the old editor system

It was no longer used anywhere. This is a relatively minimal removal:
there are more pieces of the old UI code that are now unused, but I
haven't removed them yet. It's not trivial to figure out which parts of
the form handling/enhancement code are now unused, and which are still
used by the moderation dialog, so I'll deal with that in a separate
commit to avoid muddying the waters here.

Also remove an old message related to the old switching system (which
was already unused) and stop loading the textures module separately (we
no longer use the pending texture directly from HTML).

Change-Id: I95eee414de14c4f48c7773d7dc36698e3a939350
---
M FlowActions.php
M extension.json
D handlebars/flow_editor_switcher.partial.handlebars
M i18n/en.json
M i18n/qqq.json
M includes/View.php
D modules/editor/editors/ext.flow.editors.AbstractEditor.js
D modules/editor/editors/ext.flow.editors.none.js
D modules/editor/editors/visualeditor/ext.flow.editors.visualeditor.js
D modules/editor/ext.flow.editor.js
M modules/engine/components/board/base/flow-board-api-events.js
D modules/engine/components/board/features/flow-board-switcheditor.js
M modules/engine/components/board/flow-board.js
M modules/engine/components/common/flow-component-events.js
D modules/engine/components/flow-undo-page.js
M modules/engine/misc/mw-ui.enhance.js
M modules/flow/ui/tools/mw.flow.ui.MWEditModeTool.js
D modules/styles/board/editor-switcher.less
M modules/styles/common.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-apextheme.less
M modules/styles/flow/widgets/editor/mw.flow.ui.editor-wikimediauitheme.less
M modules/styles/flow/widgets/mw.flow.ui.NewTopicWidget.less
22 files changed, 17 insertions(+), 1,118 deletions(-)

Approvals:
  Sbisson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/FlowActions.php b/FlowActions.php
index 7543299..c2cd49f 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -110,18 +110,14 @@
'class' => 'flow-history-edit-header',
],
'handler-class' => 'Flow\Actions\FlowAction',
-   'modules' => [],
'editcount' => true,
// theis modules/moduleStyles is repeated in all the undo-* 
actions. Find a way to share.
-   'modules' => [ 'ext.flow.undo' ],
'moduleStyles' => [
'mediawiki.ui.button',
'mediawiki.ui.input',
'ext.flow.styles.base',
'ext.flow.board.styles',
'ext.flow.board.topic.styles',
-   // Needed for pending texture while switching editors
-   'oojs-ui.styles.textures'
],
],
 
@@ -213,17 +209,13 @@
'class' => 'flow-history-edit-topic-summary',
],
'handler-class' => 'Flow\Actions\FlowAction',
-   'modules' => [],
'editcount' => true,
-   'modules' => [ 'ext.flow.undo' ],
'moduleStyles' => [
'mediawiki.ui.button',
'mediawiki.ui.input',
'ext.flow.styles.base',
'ext.flow.board.styles',
'ext.flow.board.topic.styles',
-   // Needed for pending texture while switching editors
-   'oojs-ui.styles.textures'
],
],
 
@@ -352,20 +344,16 @@
'class' => 'flow-history-edit-post',
],
'handler-class' => 'Flow\Actions\FlowAction',
-   'modules' => [],
'watch' => [
'immediate' => [ 
'Flow\\Data\\Listener\\ImmediateWatchTopicListener', 'getCurrentUser' ],
],
'editcount' => true,
-   'modules' => [ 'ext.flow.undo' ],
'moduleStyles' => [
'mediawiki.ui.button',
'mediawiki.ui.input',
'ext.flow.styles.base',
'ext.flow.board.styles',
'ext.flow.board.topic.styles',
-   // Needed for pending texture while switching editors
-   'oojs-ui.styles.textures'
],
],
 
diff --git a/extension.json b/extension.json
index 1375a9c..d25769f 100644
--- a/extension.json
+++ b/extension.json
@@ -157,7 +157,6 @@

"handlebars/flow_board_navigation.partial.handlebars",
"handlebars/flow_edit_post.partial.handlebars",

[MediaWiki-commits] [Gerrit] mediawiki...apex[master]: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/400995 )

Change subject: build: Updating mediawiki/mediawiki-codesniffer to 15.0.0
..


build: Updating mediawiki/mediawiki-codesniffer to 15.0.0

The following sniffs are failing and were disabled:
* Squiz.Scope.MemberVarScope.Missing
* Squiz.Scope.MethodScope.Missing

The following sniffs now pass and were enabled:
* Generic.ControlStructures.InlineControlStructure.NotAllowed
* Generic.Formatting.DisallowMultipleStatements.SameLine
* MediaWiki.ControlStructures.IfElseStructure.SpaceAfterElse
* MediaWiki.ControlStructures.IfElseStructure.SpaceBeforeElse
* Squiz.WhiteSpace.ScopeClosingBrace.Indent

Change-Id: I6dcf52d28003087ff631cb69484280a29d2e327f
---
M .phpcs.xml
M ApexTemplate.php
M composer.json
3 files changed, 28 insertions(+), 15 deletions(-)

Approvals:
  Umherirrender: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/.phpcs.xml b/.phpcs.xml
index 6df021b..76de051 100644
--- a/.phpcs.xml
+++ b/.phpcs.xml
@@ -2,15 +2,12 @@
 


-   

-   

-   

-   
-   
-   
+   
+   
+   



diff --git a/ApexTemplate.php b/ApexTemplate.php
index 14f8b32..9c14d6c 100644
--- a/ApexTemplate.php
+++ b/ApexTemplate.php
@@ -212,7 +212,10 @@
}
?>
 >
-   >exists() ? $msgObj->text() : 
$msg ); ?>
+   >exists() ? $msgObj->text() : 
$msg );
+   ?>

 
@@ -260,7 +263,10 @@
switch ( $element ) {
case 'NAMESPACES':
 ?>
-
+
msg( 'namespaces' ) ?>
>
data['namespace_urls'] as $link ): ?>
@@ -272,7 +278,10 @@
break;
case 'VARIANTS':
 ?>
-
+

data['variant_urls'] as $link ): ?>

@@ -293,9 +302,10 @@
break;
case 'VIEWS':
 ?>
-
+
msg( 'views' ) ?>
>
data['view_urls'] as $link ): ?>
@@ -312,7 +322,10 @@
break;
case 'ACTIONS':
 ?>
-
+
msg( 'actions' ) ?>

>
@@ -326,7 +339,10 @@
break;
case 'PERSONAL':
 ?>
-
+
msg( 'personaltools' ) ?>
>
getPersonalTools() as $key => $item ): ?>
diff --git a/composer.json b/composer.json
index 9e7543c..67d750e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
"require-dev": {
"jakub-onderka/php-parallel-lint": "0.9.2",
-   "mediawiki/mediawiki-codesniffer": "14.1.0",
+   "mediawiki/mediawiki-codesniffer": "15.0.0",
"mediawiki/minus-x": "0.2.1",
"jakub-onderka/php-console-highlighter": "0.3.2"
},

-- 
To view, visit https://gerrit.wikimedia.org/r/400995
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6dcf52d28003087ff631cb69484280a29d2e327f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/apex
Gerrit-Branch: master
Gerrit-Owner: Libraryupgrader 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Umherirrender 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[wmf/1.31.0-wmf.15]: Revert "Do not collapse references on diffs/old revisions"

[Chad (Code Review)]

Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401753 )

Change subject: Revert "Do not collapse references on diffs/old revisions"
..

Revert "Do not collapse references on diffs/old revisions"

This reverts commit e70e72b3f124a4f8fcd8891bbb0595c7a2eff0e0.
This also reverts related commit
0864349b1db269d765b5689757b1223947b6bd05.

Change-Id: I9da46c36d8152a779ce7ac04a933197615c0cbbf
(cherry picked from commit e21bdc368b5a6e628800d0405d72a90384e75b43)
---
M repo/includes/Content/EntityContent.php
M repo/includes/ParserOutput/EntityParserOutputGenerator.php
M repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
M repo/resources/wikibase.ui.entityViewInit.js
M 
repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorFactoryTest.php
M repo/tests/phpunit/includes/ParserOutput/EntityParserOutputGeneratorTest.php
M view/autoload.php
M view/resources/wikibase/wikibase.less
A view/src/EmptyEditSectionGenerator.php
M view/src/StatementHtmlGenerator.php
A view/tests/phpunit/EmptyEditSectionGeneratorTest.php
M view/tests/phpunit/StatementHtmlGeneratorTest.php
12 files changed, 206 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase 
refs/changes/53/401753/1

diff --git a/repo/includes/Content/EntityContent.php 
b/repo/includes/Content/EntityContent.php
index bfe1061..e5605ff 100644
--- a/repo/includes/Content/EntityContent.php
+++ b/repo/includes/Content/EntityContent.php
@@ -262,7 +262,8 @@
$entityParserOutputGeneratorFactory = 
WikibaseRepo::getDefaultInstance()->getEntityParserOutputGeneratorFactory();
 
$outputGenerator = 
$entityParserOutputGeneratorFactory->getEntityParserOutputGenerator(
-   $options->getUserLang()
+   $options->getUserLang(),
+   true
);
 
$entityRevision = $this->getEntityRevision( $revisionId );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGenerator.php 
b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
index f779ae5..c7d92ca 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGenerator.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGenerator.php
@@ -24,6 +24,7 @@
 use Wikibase\Repo\MediaWikiLanguageDirectionalityLookup;
 use Wikibase\Repo\MediaWikiLocalizedTextProvider;
 use Wikibase\Repo\View\RepoSpecialPageLinker;
+use Wikibase\View\EmptyEditSectionGenerator;
 use Wikibase\View\LocalizedTextProvider;
 use Wikibase\View\Template\TemplateFactory;
 use Wikibase\View\TermsListView;
@@ -90,6 +91,11 @@
private $languageCode;
 
/**
+* @var bool
+*/
+   private $editable;
+
+   /**
 * @param DispatchingEntityViewFactory $entityViewFactory
 * @param ParserOutputJsConfigBuilder $configBuilder
 * @param EntityTitleLookup $entityTitleLookup
@@ -100,6 +106,7 @@
 * @param EntityDataFormatProvider $entityDataFormatProvider
 * @param ParserOutputDataUpdater[] $dataUpdaters
 * @param string $languageCode
+* @param bool $editable
 */
public function __construct(
DispatchingEntityViewFactory $entityViewFactory,
@@ -111,7 +118,8 @@
LocalizedTextProvider $textProvider,
EntityDataFormatProvider $entityDataFormatProvider,
array $dataUpdaters,
-   $languageCode
+   $languageCode,
+   $editable
) {
$this->entityViewFactory = $entityViewFactory;
$this->configBuilder = $configBuilder;
@@ -123,6 +131,7 @@
$this->entityDataFormatProvider = $entityDataFormatProvider;
$this->dataUpdaters = $dataUpdaters;
$this->languageCode = $languageCode;
+   $this->editable = $editable;
}
 
/**
@@ -284,11 +293,11 @@
$this->languageFallbackChain
);
 
-   $editSectionGenerator = new ToolbarEditSectionGenerator(
+   $editSectionGenerator = $this->editable ? new 
ToolbarEditSectionGenerator(
new RepoSpecialPageLinker(),
$this->templateFactory,
$this->textProvider
-   );
+   ) : new EmptyEditSectionGenerator();
 
$languageDirectionalityLookup = new 
MediaWikiLanguageDirectionalityLookup();
$languageNameLookup = new LanguageNameLookup( 
$this->languageCode );
diff --git a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php 
b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
index a614fca..481c971 100644
--- a/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
+++ b/repo/includes/ParserOutput/EntityParserOutputGeneratorFactory.php
@@ -131,10 +131,11 

[MediaWiki-commits] [Gerrit] wikimedia/wikimania-scholarships[master]: Fix FAQ link

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401743 )

Change subject: Fix FAQ link
..


Fix FAQ link

Change-Id: I15689b323413d1c6e6a7f474b98608d91806456c
---
M data/templates/base.html
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Niharika29: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/data/templates/base.html b/data/templates/base.html
index fbbd291..8a254a8 100644
--- a/data/templates/base.html
+++ b/data/templates/base.html
@@ -31,7 +31,7 @@
   
 {% block navbar %}
 {{ 'nav-apply'|message }}
-{{
 'nav-faq'|message }}
+{{
 'nav-faq'|message }}
 {{ 'nav-credits'|message }}
 {{ 'nav-privacy'|message }}
 {{ 'nav-contact'|message }}
@@ -78,7 +78,7 @@
   
   
 
-  http://wikimania2017.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
+  http://wikimania2018.wikimedia.org/wiki/Scholarships/FAQ;>{{ 
'footer-faq'|message }}
   {{ 'footer-credits'|message 
}}
   {{ 'footer-privacy'|message 
}}
   {{ 
'footer-contact'|message }}

-- 
To view, visit https://gerrit.wikimedia.org/r/401743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I15689b323413d1c6e6a7f474b98608d91806456c
Gerrit-PatchSet: 3
Gerrit-Project: wikimedia/wikimania-scholarships
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Niharika29 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...TwoColConflict[master]: Fix detection of WikiEditor and toolbar

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401728 )

Change subject: Fix detection of WikiEditor and toolbar
..


Fix detection of WikiEditor and toolbar

See changes done in I7677f0b597c33f236192aea1aaa347a36216fbb7

Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Depends-On: I7677f0b597c33f236192aea1aaa347a36216fbb7
---
M includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  jenkins-bot: Verified
  Jforrester: Looks good to me, approved



diff --git a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php 
b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
index 2f902c5..560eacd 100644
--- a/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
+++ b/includes/InlineTwoColConflict/InlineTwoColConflictHelper.php
@@ -555,7 +555,8 @@
}
 
private function wikiEditorIsEnabled() {
-   return class_exists( WikiEditorHooks::class ) && 
WikiEditorHooks::isEnabled( 'toolbar' );
+   return ExtensionRegistry::getInstance()->isLoaded( 'WikiEditor' 
) &&
+   $this->out->getUser()->getOption( 'usebetatoolbar' );
}
 
private function deactivateWikEd() {

-- 
To view, visit https://gerrit.wikimedia.org/r/401728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iba3ccb3b01bc4c6401d73111eff4440ffd39e281
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Andrew-WMDE 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Tobias Gritschacher 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Use Daniel Werners preferred email address

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401719 )

Change subject: Use Daniel Werners preferred email address
..


Use Daniel Werners preferred email address

I contacted Daniel Werner and asked him which email address he preferrs.
I had two reasons to touch this:
* Daniels wikimedia.de email does not exist any more.
* He used so many different @author tags and I wanted to unify them.

Change-Id: I40e21e3ca7429d15b41cf676dbf3e9c35709981c
---
M lib/includes/Modules/SitesModule.php
M lib/resources/wikibase.buildErrorOutput.js
M lib/resources/wikibase.js
M lib/resources/wikibase.sites.js
M lib/tests/qunit/wikibase.sites.tests.js
M lib/tests/qunit/wikibase.tests.js
M repo/includes/Modules/DataTypesModule.php
M repo/resources/dataTypes/wikibase.dataTypeStore.js
M repo/resources/experts/Entity.js
M repo/resources/experts/__namespace.js
M repo/resources/parsers/getApiBasedValueParserConstructor.js
M repo/resources/wikibase.ui.entityViewInit.js
M repo/tests/phpunit/includes/Modules/DataTypesModuleTest.php
M repo/tests/qunit/dataTypes/DataType.tests.js
M repo/tests/qunit/dataTypes/wikibase.dataTypeStore.tests.js
M view/lib/resources/wikibase-data-values-value-view/lib/resources.php
M view/lib/resources/wikibase-data-values-value-view/src/resources.php
M view/lib/resources/wikibase-data-values-value-view/tests/resources.php
M view/lib/resources/wikibase-data-values/lib/resources.php
M view/lib/resources/wikibase-data-values/src/resources.php
M view/lib/resources/wikibase-data-values/src/valueParsers/resources.php
M view/resources/jquery/ui/jquery.ui.TemplatedWidget.js
M view/resources/jquery/ui/jquery.ui.tagadata.js
M view/resources/jquery/wikibase/jquery.wikibase.listview.ListItemAdapter.js
M view/resources/jquery/wikibase/jquery.wikibase.listview.js
M view/resources/jquery/wikibase/jquery.wikibase.snaklistview.js
M view/resources/jquery/wikibase/jquery.wikibase.statementgrouplabelscroll.js
M view/resources/jquery/wikibase/jquery.wikibase.statementview.js
M view/resources/jquery/wikibase/snakview/snakview.SnakTypeSelector.js
M view/resources/jquery/wikibase/snakview/snakview.ViewState.js
M view/resources/jquery/wikibase/snakview/snakview.js
M view/resources/jquery/wikibase/snakview/snakview.variations.NoValue.js
M view/resources/jquery/wikibase/snakview/snakview.variations.SomeValue.js
M view/resources/jquery/wikibase/snakview/snakview.variations.Value.js
M view/resources/jquery/wikibase/snakview/snakview.variations.Variation.js
M view/resources/jquery/wikibase/snakview/snakview.variations.js
M view/resources/wikibase/store/store.js
M view/resources/wikibase/utilities/wikibase.utilities.ui.css
M view/resources/wikibase/utilities/wikibase.utilities.ui.js
M view/resources/wikibase/wikibase.getLanguageNameByCode.js
M 
view/tests/qunit/jquery/wikibase/jquery.wikibase.statementgrouplabelscroll.tests.js
M view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
42 files changed, 42 insertions(+), 42 deletions(-)

Approvals:
  Ladsgroup: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/lib/includes/Modules/SitesModule.php 
b/lib/includes/Modules/SitesModule.php
index ff507f1..0e5792b 100644
--- a/lib/includes/Modules/SitesModule.php
+++ b/lib/includes/Modules/SitesModule.php
@@ -10,7 +10,7 @@
 /**
  * @license GPL-2.0+
  * @author Jeroen De Dauw < jeroended...@gmail.com >
- * @author Daniel Werner < daniel.wer...@wikimedia.de >
+ * @author Daniel Werner < daniel.a.r.wer...@gmail.com >
  * @author Marius Hoch < h...@online.de >
  */
 class SitesModule extends ResourceLoaderModule {
diff --git a/lib/resources/wikibase.buildErrorOutput.js 
b/lib/resources/wikibase.buildErrorOutput.js
index 7a3b95b..9139e03 100644
--- a/lib/resources/wikibase.buildErrorOutput.js
+++ b/lib/resources/wikibase.buildErrorOutput.js
@@ -5,7 +5,7 @@
 * Generates standardized output for errors.
 *
 * @license GPL-2.0+
-* @author Daniel Werner < daniel.wer...@wikimedia.de >
+* @author Daniel Werner < daniel.a.r.wer...@gmail.com >
 *
 * @param {Error} error
 * @return {jQuery}
diff --git a/lib/resources/wikibase.js b/lib/resources/wikibase.js
index 2b4588d..6e50995 100644
--- a/lib/resources/wikibase.js
+++ b/lib/resources/wikibase.js
@@ -3,7 +3,7 @@
  * @see https://www.mediawiki.org/wiki/Extension:Wikibase
  *
  * @license GPL-2.0+
- * @author Daniel Werner < daniel.werner at wikimedia.de >
+ * @author Daniel Werner < daniel.a.r.wer...@gmail.com >
  */
 
 this.wikibase = this.wikibase || {};
diff --git a/lib/resources/wikibase.sites.js b/lib/resources/wikibase.sites.js
index 420e420..e0f4004 100644
--- a/lib/resources/wikibase.sites.js
+++ b/lib/resources/wikibase.sites.js
@@ -1,6 +1,6 @@
 /**
  * @license GPL-2.0+
- * @author Daniel Werner < daniel.werner at wikimedia.de >
+ * @author Daniel Werner < daniel.a.r.wer...@gmail.com >
  */
 ( 

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Make the tour module depend on ext.guidedTour

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401739 )

Change subject: Make the tour module depend on ext.guidedTour
..


Make the tour module depend on ext.guidedTour

Otherwise, JS errors happen because mw.guidedTour doesn't exist:

Uncaught TypeError: Cannot read property 'TourBuilder' of undefined

Change-Id: I41f6abc1fdf6b6f3b7ed6c1203aa6e56f611c153
---
M Hooks.php
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  KartikMistry: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Hooks.php b/Hooks.php
index ce482be..c236a06 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -83,7 +83,8 @@

"flow-guidedtour-optin-find-old-conversations-description",

"flow-guidedtour-optin-feedback",

"flow-guidedtour-optin-feedback-description"
-   ]
+   ],
+   'dependencies' => 'ext.guidedTour',
] );
}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401739
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I41f6abc1fdf6b6f3b7ed6c1203aa6e56f611c153
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Catrope 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Mattflaschen 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] VisualEditor/VisualEditor[master]: Convert single nbsp's to plain spaces on paste

[Esanders (Code Review)]

Esanders has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401751 )

Change subject: Convert single nbsp's to plain spaces on paste
..

Convert single nbsp's to plain spaces on paste

Change-Id: I88f015c14cde4ac5ae2b26424e64d2074bb350db
---
M src/dm/lineardata/ve.dm.ElementLinearData.js
M tests/dm/lineardata/ve.dm.ElementLinearData.test.js
2 files changed, 26 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor 
refs/changes/51/401751/1

diff --git a/src/dm/lineardata/ve.dm.ElementLinearData.js 
b/src/dm/lineardata/ve.dm.ElementLinearData.js
index 73ae828..f1f6c99 100644
--- a/src/dm/lineardata/ve.dm.ElementLinearData.js
+++ b/src/dm/lineardata/ve.dm.ElementLinearData.js
@@ -1324,6 +1324,23 @@
}
}
}
+   // Support: Chrome, Safari
+   // Sometimes all spaces are replaced with NBSP by the 
browser, so replace those
+   // which aren't adjacent to plain spaces. T183647
+   if (
+   this.getCharacterData( i ) === '\u00a0' &&
+   // Get last open type from the stack
+   
!ve.dm.nodeFactory.doesNodeHaveSignificantWhitespace( elementStack[ 
elementStack.length - 1 ].type )
+   ) {
+   if ( !( this.getCharacterData( i + 1 ) === ' ' 
|| this.getCharacterData( i - 1 ) === ' ' ) ) {
+   // Replace with a space
+   if ( typeof this.getData( i ) === 
'string' ) {
+   this.data[ i ] = ' ';
+   } else {
+   this.data[ i ][ 0 ] = ' ';
+   }
+   }
+   }
}
annotations = this.getAnnotationsFromOffset( i, true );
if ( !annotations.isEmpty() ) {
diff --git a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js 
b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
index 82289dc..0a96436 100644
--- a/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
+++ b/tests/dm/lineardata/ve.dm.ElementLinearData.test.js
@@ -1694,7 +1694,7 @@
msg: 'Breaks split content branch nodes'
},
{
-   html: 'Foo\nBar\n Baz \nQuux',
+   html: 'Foo\nBar\n Baz 
\nQuux',
data: [
{ type: 'paragraph' },
'F', 'o', 'o', ' ', 'B', 'a', 'r', ' ',
@@ -1704,30 +1704,34 @@
[ ' ', [ ve.dm.example.annIndex( 'b' ) 
] ],
[ 'Q', [ ve.dm.example.annIndex( 'b' ) 
] ],
[ 'u', [ ve.dm.example.annIndex( 'b' ) 
] ],
+   [ ' ', [ ve.dm.example.annIndex( 'b' ) 
] ],
[ 'u', [ ve.dm.example.annIndex( 'b' ) 
] ],
[ 'x', [ ve.dm.example.annIndex( 'b' ) 
] ],
{ type: '/paragraph' },
{ type: 'internalList' },
{ type: '/internalList' }
],
-   msg: 'Newline characters are stripped and 
replaced with spaces where necessary'
+   msg: 'Newline characters and NBSPs are replaced 
with spaces and/or stripped where necessary'
},
{
-   html: 'Foo\nBar\n Baz 
\nQuux\nWhee',
+   html: 'Foo\nBar\n Baz 
\nQuux\nWheeABC',
data: [
{ type: 'paragraph' },
'F', 'o', 'o', ' ', 'B', 'a', 'r',
{ type: '/paragraph' },
{ type: 'preformatted' },
-   'B', 'a', 'z', ' ', '\n', 'Q', 'u', 
'u', 'x',
+   'B', 'a', 'z', ' ', '\n', 'Q', 'u', 
'\u00a0', 'u', 'x',
{ type: 'comment', attributes: { text: 
'comment' } },
{ type: '/comment' },
'\n', 'W', 'h', 'e', 'e',
{ type: '/preformatted' },
+   { type: 'paragraph' },
+ 

[MediaWiki-commits] [Gerrit] analytics/statsv[master]: Have to subscribe if using multiple kafka topics.

[Ottomata (Code Review)]

Ottomata has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/401750 )

Change subject: Have to subscribe if using multiple kafka topics.
..

Have to subscribe if using multiple kafka topics.

Bug: T179093
Change-Id: I33be897a9170836de6d55fa3cb7a163dc988fce9
---
M statsv.py
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/statsv 
refs/changes/50/401750/1

diff --git a/statsv.py b/statsv.py
index 627d79b..9d0b591 100644
--- a/statsv.py
+++ b/statsv.py
@@ -204,7 +204,6 @@
 
 # Create our Kafka Consumer instance.
 consumer = KafkaConsumer(
-kafka_topics,
 bootstrap_servers=kafka_bootstrap_servers,
 group_id=kafka_consumer_group,
 auto_offset_reset='latest',
@@ -213,6 +212,7 @@
 enable_auto_commit=False,
 consumer_timeout_ms=kafka_consumer_timeout_seconds * 1000
 )
+consumer.subscribe(kafka_topics)
 
 watchdog = Watchdog()
 

-- 
To view, visit https://gerrit.wikimedia.org/r/401750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I33be897a9170836de6d55fa3cb7a163dc988fce9
Gerrit-PatchSet: 1
Gerrit-Project: analytics/statsv
Gerrit-Branch: master
Gerrit-Owner: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] operations/puppet[production]: smart: pin smartmontools to backports on Debian

[Filippo Giunchedi (Code Review)]

Filippo Giunchedi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/401707 )

Change subject: smart: pin smartmontools to backports on Debian
..


smart: pin smartmontools to backports on Debian

We are not enabling backports on (deprecated) Trusty.

Bug: T86552
Change-Id: I4510bd0d538502d158833560bb2e375cba23a9b2
---
M modules/smart/manifests/init.pp
1 file changed, 11 insertions(+), 4 deletions(-)

Approvals:
  jenkins-bot: Verified
  Filippo Giunchedi: Looks good to me, approved



diff --git a/modules/smart/manifests/init.pp b/modules/smart/manifests/init.pp
index 90d9dab..0e70724 100644
--- a/modules/smart/manifests/init.pp
+++ b/modules/smart/manifests/init.pp
@@ -9,11 +9,18 @@
 fail('smart module is not supported on virtual hosts')
 }
 
-# Prefer smartmontools version from backports (if any) because of newer
-# smart drivedb.
+# Prefer smartmontools version from backports (on Debian, if any) because 
of newer smart
+# drivedb.
+if os_version('debian >= jessie') {
+apt::pin { 'smartmontools_backports':
+pin  => "release a=${::lsbdistcodename}-backports",
+priority => '1001',
+before   => Package['smartmontools'],
+}
+}
+
 package { 'smartmontools':
-ensure  => $ensure,
-install_options => ['-t', "${::lsbdistcodename}-backports"],
+ensure => $ensure,
 }
 
 # Make sure we send smart alerts from smartd via syslog and not email.

-- 
To view, visit https://gerrit.wikimedia.org/r/401707
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4510bd0d538502d158833560bb2e375cba23a9b2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] analytics/statsv[master]: Support consumption from multiple topics

[Ottomata (Code Review)]

Ottomata has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/391703 )

Change subject: Support consumption from multiple topics
..


Support consumption from multiple topics

This will allow for DC prefixed topics for statsv

Bug: T179093
Change-Id: I1ee995a5b22a84e5c84f356494c22df3a4b0e03e
---
M statsv.py
1 file changed, 5 insertions(+), 4 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  Ottomata: Verified



diff --git a/statsv.py b/statsv.py
index afe7e9a..627d79b 100644
--- a/statsv.py
+++ b/statsv.py
@@ -39,8 +39,8 @@
 description='statsv - consumes from varnishkafka Kafka topic and writes 
metrics to statsd'
 )
 ap.add_argument(
-'--topic',
-help='Kafka topic from which to consume.  Default: statsv',
+'--topics',
+help='Comma separated list of Kafka topics from which to consume.  
Default: statsv',
 default='statsv'
 )
 ap.add_argument(
@@ -110,7 +110,8 @@
 worker_count = args.workers
 
 kafka_bootstrap_servers = tuple(args.brokers.split(','))
-kafka_topic = args.topic
+kafka_topics = args.topics.split(',')
+
 kafka_consumer_group = args.consumer_group
 kafka_consumer_timeout_seconds = args.consumer_timeout_seconds
 
@@ -203,7 +204,7 @@
 
 # Create our Kafka Consumer instance.
 consumer = KafkaConsumer(
-kafka_topic,
+kafka_topics,
 bootstrap_servers=kafka_bootstrap_servers,
 group_id=kafka_consumer_group,
 auto_offset_reset='latest',

-- 
To view, visit https://gerrit.wikimedia.org/r/391703
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1ee995a5b22a84e5c84f356494c22df3a4b0e03e
Gerrit-PatchSet: 1
Gerrit-Project: analytics/statsv
Gerrit-Branch: master
Gerrit-Owner: Ottomata 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Ottomata 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits