[MediaWiki-commits] [Gerrit] mediawiki/debian[master]: Get rid of unnecessary dh_installdeb override

[Legoktm (Code Review)]

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

Change subject: Get rid of unnecessary dh_installdeb override
..

Get rid of unnecessary dh_installdeb override

CVS hasn't been used in ages, .gitignore files are stripped out during the
tarball build process, and I haven't seen any .arch-ids files.

Change-Id: Id309ccbb820668e1fd41d0335075fb4fb9b62ade
---
M debian/changelog
M debian/rules
2 files changed, 2 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/82/392782/1

diff --git a/debian/changelog b/debian/changelog
index 0349d93..9adb278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@
   * Upgrade php-apcu to a Recommends
   * Use debhelper compat 10
   * Add a systemd unit to run runJobs.php as a service
+  * Get rid of unnecessary dh_installdeb override
 
- -- Kunal Mehta   Tue, 21 Nov 2017 22:10:02 -0800
+ -- Kunal Mehta   Tue, 21 Nov 2017 22:16:34 -0800
 
 mediawiki (1:1.27.4-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 57eb05d..efea41f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,10 +46,6 @@
# includes/libs is provided by mediawiki-classes
rm -rf debian/mediawiki/usr/share/mediawiki/includes/libs
 
-override_dh_installdeb:
-   find debian/mediawiki -depth \( -name ".cvsignore" -o -name 
".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
-   dh_installdeb
-
 override_dh_systemd_enable:
# Do not enable by default, the user needs to manually
# configure MediaWiki first.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id309ccbb820668e1fd41d0335075fb4fb9b62ade
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Move db1051 to s5

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Move db1051 to s5
..

db-eqiad.php: Move db1051 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: I1250ebdd06f5e9838254bcc4129da0a39633a056
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 7 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f1645cc..519d75b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -103,7 +103,6 @@
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
-   # 'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #T177208
'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
@@ -144,7 +143,8 @@
],
's5' => [
'db1070' => 0,   # D1 2.8TB 160GB, master
-   # 'db1063' => 0,   # C5 2.8TB 128GB, master, crashed #T180714
+   # 'db1051' => 1,  # B3 2.8TB  96GB, vslow, dump in s5
+   # 'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump in s8
# 'db1071' => 1,   # D1 2.8TB 160GB, future s8 master
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
@@ -249,27 +249,22 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Move db1051 to s5

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Move db1051 to s5
..


db-eqiad.php: Move db1051 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: I1250ebdd06f5e9838254bcc4129da0a39633a056
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 7 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 f1645cc..519d75b 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -103,7 +103,6 @@
's1' => [
'db1052' => 0,   # B3 2.8TB  96GB, master
'db1067' => 0,   # D1 2.8TB 160GB, old master
-   # 'db1051' => 1,  # B3 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager #T177208
'db1055' => 1,   # C2 2.8TB  96GB, watchlist, recentchanges, 
contributions, logpager
'db1065' => 0,   # D1 2.8TB 160GB, vslow, dump, master for 
sanitarium
'db1066' => 50,  # D1 2.8TB 160GB, api
@@ -144,7 +143,8 @@
],
's5' => [
'db1070' => 0,   # D1 2.8TB 160GB, master
-   # 'db1063' => 0,   # C5 2.8TB 128GB, master, crashed #T180714
+   # 'db1051' => 1,  # B3 2.8TB  96GB, vslow, dump in s5
+   # 'db1063' => 0,   # C5 2.8TB 128GB, vslow, dump in s8
# 'db1071' => 1,   # D1 2.8TB 160GB, future s8 master
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
@@ -249,27 +249,22 @@
 'groupLoadsBySection' => [
's1' => [
'watchlist' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'recentchanges' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'recentchangeslinked' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'contributions' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],
'logpager' => [
-   # 'db1051' => 1,
'db1055' => 1,
'db1105:3311' => 1,
],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1250ebdd06f5e9838254bcc4129da0a39633a056
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/software[master]: s1, s5.hosts: Move db1051 from s1 to s5

[jenkins-bot (Code Review)]

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

Change subject: s1,s5.hosts: Move db1051 from s1 to s5
..


s1,s5.hosts: Move db1051 from s1 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: Ib4669161dc6a61d68e78c2cc9c9acc755a301a9e
---
M dbtools/s1.hosts
M dbtools/s5.hosts
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/dbtools/s1.hosts b/dbtools/s1.hosts
index 32cdc7c..1fb5084 100644
--- a/dbtools/s1.hosts
+++ b/dbtools/s1.hosts
@@ -26,7 +26,6 @@
 db1066.eqiad.wmnet 3306
 db1065.eqiad.wmnet 3306
 db1055.eqiad.wmnet 3306
-db1051.eqiad.wmnet 3306
 db1067.eqiad.wmnet 3306
 db1105.eqiad.wmnet 3311
 db1052.eqiad.wmnet 3306
diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index a791d60..cff2b7a 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -36,4 +36,5 @@
 db1109.eqiad.wmnet 3306
 db1110.eqiad.wmnet 3306
 db1063.eqiad.wmnet 3306
+db1051.eqiad.wmnet 3306
 db1070.eqiad.wmnet 3306

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib4669161dc6a61d68e78c2cc9c9acc755a301a9e
Gerrit-PatchSet: 1
Gerrit-Project: operations/software
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
Gerrit-Reviewer: Jcrespo 
Gerrit-Reviewer: Marostegui 
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] mediawiki/debian[master]: Remove dead code to mess with $wgVersion

[Legoktm (Code Review)]

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

Change subject: Remove dead code to mess with $wgVersion
..

Remove dead code to mess with $wgVersion

This code was supposed to set the Debian version of the package as $wgVersion,
but it was broken. Regardless of that, it's a bad idea as it would break the
compatibility checking used in extension.json since the version number would
no longer be semver compliant.

Change-Id: I83d1ba1f51a45d352000df840106c488b78485ca
---
M debian/changelog
M debian/rules
2 files changed, 2 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/84/392784/1

diff --git a/debian/changelog b/debian/changelog
index 9adb278..61435fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@
   * Use debhelper compat 10
   * Add a systemd unit to run runJobs.php as a service
   * Get rid of unnecessary dh_installdeb override
+  * Remove dead code to mess with $wgVersion
 
- -- Kunal Mehta   Tue, 21 Nov 2017 22:16:34 -0800
+ -- Kunal Mehta   Tue, 21 Nov 2017 22:20:52 -0800
 
 mediawiki (1:1.27.4-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index efea41f..ab8ace8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,5 @@
 #!/usr/bin/make -f
 
-DEB_VERSION:=$(shell dpkg-parsechangelog -n1 | sed -n '/^Version: /s///p')
-DEB_NOEPOCH_VERSION:=$(shell DEB_VERSION=${DEB_VERSION}; echo 
$${DEB_VERSION\#*:})
-DEB_UPSTREAM_VERSION:=$(shell DEB_NOEPOCH_VERSION=${DEB_NOEPOCH_VERSION}; echo 
$${DEB_NOEPOCH_VERSION%+dfsg-*})
-
 override_dh_install:
dh_install
# Now some tidying up is required
@@ -28,9 +24,6 @@
done
# Remove Makefiles
find debian/mediawiki/ -iname makefile -exec rm {} \;
-   # Put debian version for mediawiki version..
-   sed -e "s#$(DEB_UPSTREAM_VERSION)#$(DEB_NOEPOCH_VERSION)#" \
-   -i 
debian/mediawiki/usr/share/mediawiki/includes/DefaultSettings.php
# Move extensions
mkdir -p debian/mediawiki/usr/share/doc/mediawiki
mv debian/mediawiki/var/lib/mediawiki/extensions/README \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I83d1ba1f51a45d352000df840106c488b78485ca
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db1051 from s1 to s5

[Marostegui (Code Review)]

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

Change subject: mariadb: Move db1051 from s1 to s5
..


mariadb: Move db1051 from s1 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: I993d25153548d0bf4267c8d11f9679236ee530cc
---
M hieradata/hosts/db1051.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 4 insertions(+), 5 deletions(-)

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



diff --git a/hieradata/hosts/db1051.yaml b/hieradata/hosts/db1051.yaml
index b1bf6dc..0d8bce2 100644
--- a/hieradata/hosts/db1051.yaml
+++ b/hieradata/hosts/db1051.yaml
@@ -1,2 +1 @@
-mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'
+mariadb::shard: 's5'
diff --git a/manifests/site.pp b/manifests/site.pp
index 1a8ebb3..c1d8a57 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -331,7 +331,7 @@
 role(mariadb::core)
 }
 # eqiad replicas
-node /^db10(51|55|65|66|67|73|80|83|89)\.eqiad\.wmnet/ {
+node /^db10(55|65|66|67|73|80|83|89)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -430,7 +430,7 @@
 role(mariadb::core)
 }
 
-node /^db1(063|071|082|087|092|096|099|100|104|106|109|110)\.eqiad\.wmnet/ {
+node /^db1(051|063|071|082|087|092|096|099|100|104|106|109|110)\.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 97ce308..5170fe2 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -2,7 +2,6 @@
 shard: s1
 role: slave
   targets:
-  - db1051:9104
   - db1055:9104
   - db1065:9104
   - db1066:9104
@@ -71,6 +70,7 @@
 shard: s5
 role: slave
   targets:
+  - db1051:9104
   - db1070:9104
   - db1071:9104
   - db1082:9104

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I993d25153548d0bf4267c8d11f9679236ee530cc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
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] mediawiki/debian[master]: Add a systemd unit to run runJobs.php as a service

[Legoktm (Code Review)]

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

Change subject: Add a systemd unit to run runJobs.php as a service
..

Add a systemd unit to run runJobs.php as a service

Using --wait, the script will act as a daemon and just wait for new jobs
to come in and then immediately process them.

The main concern with such a setup is that runJobs.php needs to restart to
pick up code and configuration changes. We set --maxjobs=50 so it restarts
somewhat regularly, and set a timeout of 5 minutes, after which it will sleep
for 15 seconds and then restart.

This service is not enabled by default since after installing the package you
still need to manually install MediaWiki before this can be run.

Ideally we could set something like `After=mysql.service` but we don't
actually know the database backend being used. It's possible this will
be a race condition but the script will just crash and restart in 15
seconds, hopefully by then MySQL would be up.

This is inspired by the setup translatewiki.net has, and thanks to Nikerabbit
for explaining it to me.

Bug: T160035
Change-Id: Iec3ee0ab72f8caf8cbc1da005cd53b7b6d20e2c1
---
A debian/mediawiki.mediawiki-jobrunner.service
M debian/rules
2 files changed, 28 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/debian 
refs/changes/81/392781/1

diff --git a/debian/mediawiki.mediawiki-jobrunner.service 
b/debian/mediawiki.mediawiki-jobrunner.service
new file mode 100644
index 000..6ac53da
--- /dev/null
+++ b/debian/mediawiki.mediawiki-jobrunner.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=MediaWiki job runner
+Documentation=https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:RunJobs.php
+
+[Service]
+User=www-data
+Group=www-data
+ExecStart=/usr/bin/php /var/lib/mediawiki/maintenance/runJobs.php --wait 
--maxjobs=50
+Restart=always
+RestartSec=15
+RuntimeMaxSec=300
+PrivateDevices=true
+PrivateTmp=true
+ProtectHome=read-only
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/debian/rules b/debian/rules
index 5f43c70..57eb05d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,5 +50,15 @@
find debian/mediawiki -depth \( -name ".cvsignore" -o -name 
".gitignore" -o -name ".arch-ids" \) -exec rm -rf {} \;
dh_installdeb
 
+override_dh_systemd_enable:
+   # Do not enable by default, the user needs to manually
+   # configure MediaWiki first.
+   dh_systemd_enable --no-enable --name=mediawiki-jobrunner
+
+override_dh_installinit:
+   # We only have a systemd unit, not sysvinit.
+   # Can be removed in debhelper compat 11
+   dh_installinit -Nmediawiki
+
 %:
dh $@ --with apache2

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iec3ee0ab72f8caf8cbc1da005cd53b7b6d20e2c1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/debian
Gerrit-Branch: master
Gerrit-Owner: Legoktm 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Move db1051 from s1 to s5

[Marostegui (Code Review)]

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

Change subject: mariadb: Move db1051 from s1 to s5
..

mariadb: Move db1051 from s1 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: I993d25153548d0bf4267c8d11f9679236ee530cc
---
M hieradata/hosts/db1051.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/86/392786/1

diff --git a/hieradata/hosts/db1051.yaml b/hieradata/hosts/db1051.yaml
index b1bf6dc..0d8bce2 100644
--- a/hieradata/hosts/db1051.yaml
+++ b/hieradata/hosts/db1051.yaml
@@ -1,2 +1 @@
-mariadb::shard: 's1'
-mariadb::socket: '/tmp/mysql.sock'
+mariadb::shard: 's5'
diff --git a/manifests/site.pp b/manifests/site.pp
index 1a8ebb3..c1d8a57 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -331,7 +331,7 @@
 role(mariadb::core)
 }
 # eqiad replicas
-node /^db10(51|55|65|66|67|73|80|83|89)\.eqiad\.wmnet/ {
+node /^db10(55|65|66|67|73|80|83|89)\.eqiad\.wmnet/ {
 role(mariadb::core)
 }
 
@@ -430,7 +430,7 @@
 role(mariadb::core)
 }
 
-node /^db1(063|071|082|087|092|096|099|100|104|106|109|110)\.eqiad\.wmnet/ {
+node /^db1(051|063|071|082|087|092|096|099|100|104|106|109|110)\.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 97ce308..5170fe2 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -2,7 +2,6 @@
 shard: s1
 role: slave
   targets:
-  - db1051:9104
   - db1055:9104
   - db1065:9104
   - db1066:9104
@@ -71,6 +70,7 @@
 shard: s5
 role: slave
   targets:
+  - db1051:9104
   - db1070:9104
   - db1071:9104
   - db1082:9104

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

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

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

[MediaWiki-commits] [Gerrit] operations/software[master]: s1, s5.hosts: Move db1051 from s1 to s5

[Marostegui (Code Review)]

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

Change subject: s1,s5.hosts: Move db1051 from s1 to s5
..

s1,s5.hosts: Move db1051 from s1 to s5

Remove db1051 from s1 and move it to s5. It will become the new
vslow,dump server for s5.
It will be cloned from db1063 which will be vslow,dump for s8.

Bug: T177208
Change-Id: Ib4669161dc6a61d68e78c2cc9c9acc755a301a9e
---
M dbtools/s1.hosts
M dbtools/s5.hosts
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software 
refs/changes/87/392787/1

diff --git a/dbtools/s1.hosts b/dbtools/s1.hosts
index 32cdc7c..1fb5084 100644
--- a/dbtools/s1.hosts
+++ b/dbtools/s1.hosts
@@ -26,7 +26,6 @@
 db1066.eqiad.wmnet 3306
 db1065.eqiad.wmnet 3306
 db1055.eqiad.wmnet 3306
-db1051.eqiad.wmnet 3306
 db1067.eqiad.wmnet 3306
 db1105.eqiad.wmnet 3311
 db1052.eqiad.wmnet 3306
diff --git a/dbtools/s5.hosts b/dbtools/s5.hosts
index a791d60..cff2b7a 100644
--- a/dbtools/s5.hosts
+++ b/dbtools/s5.hosts
@@ -36,4 +36,5 @@
 db1109.eqiad.wmnet 3306
 db1110.eqiad.wmnet 3306
 db1063.eqiad.wmnet 3306
+db1051.eqiad.wmnet 3306
 db1070.eqiad.wmnet 3306

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add references to the documentation of all DataModel classes

[jenkins-bot (Code Review)]

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

Change subject: Add references to the documentation of all DataModel classes
..


Add references to the documentation of all DataModel classes

Change-Id: Ife9c2d74e8046e00ee89648024882407e6acaca0
---
M src/DataModel/Form.php
M src/DataModel/FormId.php
M src/DataModel/Lexeme.php
M src/DataModel/LexemeId.php
M src/DataModel/Sense.php
M src/DataModel/SenseId.php
6 files changed, 25 insertions(+), 2 deletions(-)

Approvals:
  Jonas Kress (WMDE): Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/DataModel/Form.php b/src/DataModel/Form.php
index 2ba1464..f536893 100644
--- a/src/DataModel/Form.php
+++ b/src/DataModel/Form.php
@@ -10,6 +10,11 @@
 use Wikimedia\Assert\Assert;
 
 /**
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme's form in the
+ * lexiographical data model.
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Form
+ *
  * @license GPL-2.0+
  */
 class Form implements StatementListProvider {
diff --git a/src/DataModel/FormId.php b/src/DataModel/FormId.php
index 63a1c3f..8ae3cd4 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -5,6 +5,10 @@
 use Wikimedia\Assert\Assert;
 
 /**
+ * Immutable ID of a Lexeme' form in the lexiographical data model.
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Form
+ *
  * @license GPL-2.0+
  * @author Thiemo Mättig
  */
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 2f5dd43..2b64c7d 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -13,6 +13,11 @@
 use Wikibase\DataModel\Term\TermList;
 
 /**
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme in the
+ * lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Lexeme
+ *
  * @license GPL-2.0+
  */
 class Lexeme implements EntityDocument, StatementListProvider {
diff --git a/src/DataModel/LexemeId.php b/src/DataModel/LexemeId.php
index 9a95d9a..28312b7 100644
--- a/src/DataModel/LexemeId.php
+++ b/src/DataModel/LexemeId.php
@@ -9,6 +9,10 @@
 use RuntimeException;
 
 /**
+ * Immutable ID of a Lexeme in the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Lexeme
+ *
  * @license GPL-2.0+
  */
 class LexemeId extends EntityId implements Int32EntityId {
diff --git a/src/DataModel/Sense.php b/src/DataModel/Sense.php
index bf48aab..e8469bd 100644
--- a/src/DataModel/Sense.php
+++ b/src/DataModel/Sense.php
@@ -6,7 +6,10 @@
 use Wikibase\DataModel\Term\TermList;
 
 /**
- * A sense of a Lexeme.
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme's sense in
+ * the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Sense
  *
  * @license GPL-2.0+
  */
diff --git a/src/DataModel/SenseId.php b/src/DataModel/SenseId.php
index 61e8060..b5437b6 100644
--- a/src/DataModel/SenseId.php
+++ b/src/DataModel/SenseId.php
@@ -3,7 +3,9 @@
 namespace Wikibase\Lexeme\DataModel;
 
 /**
- * An ID of a sense of a lexeme.
+ * Immutable ID of a Lexeme's sense in the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Sense
  *
  * @license GPL-2.0+
  */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife9c2d74e8046e00ee89648024882407e6acaca0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Jonas Kress (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]: profile::mariadb::misc::el::replication: fix el cleaner cronjob

[Elukey (Code Review)]

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

Change subject: profile::mariadb::misc::el::replication: fix el cleaner cronjob
..

profile::mariadb::misc::el::replication: fix el cleaner cronjob

Bug: T156933
Change-Id: I5ee086190e48e1dfb75058ca4d3d7f480e1adb50
---
M modules/profile/files/mariadb/misc/eventlogging/eventlogging_sync_rsyslog.conf
M modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
2 files changed, 17 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/88/392788/1

diff --git 
a/modules/profile/files/mariadb/misc/eventlogging/eventlogging_sync_rsyslog.conf
 
b/modules/profile/files/mariadb/misc/eventlogging/eventlogging_sync_rsyslog.conf
index bf8daca..8ef2eba 100644
--- 
a/modules/profile/files/mariadb/misc/eventlogging/eventlogging_sync_rsyslog.conf
+++ 
b/modules/profile/files/mariadb/misc/eventlogging/eventlogging_sync_rsyslog.conf
@@ -1,3 +1,3 @@
 # rsyslogd(8) configuration file for eventlogging_sync.
 # This file is managed by Puppet.
-:programname, startswith, "eventlogging_sync" /var/log/eventlogging_sync.log
+:programname, startswith, "eventlogging_sync" 
/var/log/eventlogging/eventlogging_sync.log
diff --git a/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp 
b/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
index 2697e43..7d7ede5 100644
--- a/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
+++ b/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
@@ -57,6 +57,13 @@
 mode   => '0755',
 }
 
+file { '/var/log/eventlogging':
+ensure => 'directory',
+owner  => 'root',
+group  => 'eventlog',
+mode   => '0775',
+}
+
 file { '/etc/eventlogging/whitelist.tsv':
 ensure  => 'present',
 owner   => 'root',
@@ -76,7 +83,7 @@
 
 logrotate::rule { 'eventlogging':
 ensure=> present,
-file_glob => '/var/log/eventlogging_*.log',
+file_glob => '/var/log/eventlogging/eventlogging_*.log',
 frequency => 'daily',
 copy_truncate => true,
 compress  => true,
@@ -123,15 +130,18 @@
 # without doing any action to the db. This is useful to avoid gaps in
 # records sanitized if the script fails and does not commit a new 
timestamp.
 $eventlogging_cleaner_command = '/usr/local/bin/eventlogging_cleaner 
--whitelist /etc/eventlogging/whitelist.tsv --older-than 90 --start-ts-file 
/var/run/eventlogging_cleaner --batch-size 1 --sleep-between-batches 2'
-$command = "/usr/bin/flock --verbose -n /var/lock/eventlogging_cleaner 
${eventlogging_cleaner_command} >> /var/log/eventlogging_cleaner.log"
+$command = "/usr/bin/flock --verbose -n /var/lock/eventlogging_cleaner 
${eventlogging_cleaner_command} >> 
/var/log/eventlogging/eventlogging_cleaner.log"
 cron { 'eventlogging_cleaner daily sanitization':
-ensure  => present,
-command => $command,
-user=> 'eventlogcleaner',
-hour=> 1,
+ensure  => present,
+command => $command,
+user=> 'eventlogcleaner',
+minute  => 0,
+hour=> 11,
+environment => 'MAILTO=analytics-ale...@wikimedia.org',
 require => [
 File['/usr/local/bin/eventlogging_cleaner'],
 File['/etc/eventlogging/whitelist.tsv'],
+File['/var/log/eventlogging'],
 User['eventlogcleaner'],
 ]
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5ee086190e48e1dfb75058ca4d3d7f480e1adb50
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...cxserver[master]: Build the lineardoc in Pageloader and pass to segmenter

[jenkins-bot (Code Review)]

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

Change subject: Build the lineardoc in Pageloader and pass to segmenter
..


Build the lineardoc in Pageloader and pass to segmenter

This will allow us to segmentation, section wrapping, category
adaptation etc in pageloader without requiring to build the doc
more than once.

Change-Id: I49204f07a11e149e2867b35d250d46023eecbcc5
Ref: I94d5250847a6287becf411eacfc1bdd64bfe7ad3
---
M bin/segment
M lib/mw/MWPageLoader.js
M lib/segmentation/CXSegmenter.js
M test/segmentation/CXSegmenter.test.js
4 files changed, 41 insertions(+), 38 deletions(-)

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



diff --git a/bin/segment b/bin/segment
index c32dc2a..2a18675 100755
--- a/bin/segment
+++ b/bin/segment
@@ -10,6 +10,13 @@
return normalizer.getHtml();
 }
 
+function getParsedDoc( content ) {
+   const parser = new LinearDoc.Parser( new LinearDoc.MwContextualizer() );
+   parser.init();
+   parser.write( content );
+   return parser.builder.doc;
+}
+
 const html = fs.readFileSync( '/dev/stdin', 'utf8' );
 if ( html.trim() === '' ) {
const script = process.argv[ 1 ];
@@ -21,7 +28,8 @@
 
 }
 
-const segmenter = new Segmenter( html, 'en' );
-segmenter.segment();
-const result = normalize( segmenter.getSegmentedContent() );
+let parsedDoc = getParsedDoc( html );
+let segmenter = new Segmenter();
+let segmentedLinearDoc = segmenter.segment( parsedDoc, 'en' );
+const result = normalize( segmentedLinearDoc.getHtml() );
 process.stdout.write( result + '\n' );
diff --git a/lib/mw/MWPageLoader.js b/lib/mw/MWPageLoader.js
index 57147fd..e9c5941 100644
--- a/lib/mw/MWPageLoader.js
+++ b/lib/mw/MWPageLoader.js
@@ -1,18 +1,27 @@
 'use strict';
 
 const ApiRequest = require( '../mw/ApiRequest' ),
+   LinearDoc = require( '../lineardoc' ),
CXSegmenter = require( '../segmentation/CXSegmenter' );
 
 class MWPageLoader extends ApiRequest {
getPage( page, revision ) {
return this.fetch( page, revision ).then( ( response ) => {
-   let segmentedDoc = this.segment( response.body );
+   const parsedDoc = this.getParsedDoc( response.body );
+   const segmentedDoc = new CXSegmenter().segment( 
parsedDoc, this.sourceLanguage );
// TODO: segmentedDoc.wrapSections();
return {
content: segmentedDoc.getHtml(),
revision: response.revision
};
} );
+   }
+
+   getParsedDoc( content ) {
+   const parser = new LinearDoc.Parser( new 
LinearDoc.MwContextualizer() );
+   parser.init();
+   parser.write( content );
+   return parser.builder.doc;
}
 
/**
@@ -46,13 +55,6 @@
};
} );
}
-
-   segment( pageContent ) {
-   const segmenter = new CXSegmenter( pageContent, 
this.sourceLanguage );
-   segmenter.segment();
-   return segmenter.getSegmentedDoc();
-   }
-
 }
 
 module.exports = MWPageLoader;
diff --git a/lib/segmentation/CXSegmenter.js b/lib/segmentation/CXSegmenter.js
index a1f793c..0df6630 100644
--- a/lib/segmentation/CXSegmenter.js
+++ b/lib/segmentation/CXSegmenter.js
@@ -1,22 +1,17 @@
 'use strict';
 
-var LinearDoc = require( '../lineardoc' ),
-   segmenters = require( __dirname + '/languages' ).Segmenters;
+var segmenters = require( __dirname + '/languages' ).Segmenters;
 
 class CXSegmenter {
-   constructor( content, language ) {
-   this.parser = new LinearDoc.Parser( new 
LinearDoc.MwContextualizer() );
-   this.parser.init();
-   this.getBoundaries = this.getSegmenter( language );
-   this.content = content;
-   this.originalDoc = null;
-   this.segmentedDoc = null;
-   }
 
-   segment() {
-   this.parser.write( this.content );
-   this.originalDoc = this.parser.builder.doc;
-   this.segmentedDoc = this.originalDoc.segment( 
this.getBoundaries );
+   /**
+* Segment the given parsed linear document object
+* @param {Object} parsedDoc
+* @param {string} language
+* @return {Object}
+*/
+   segment( parsedDoc, language ) {
+   return parsedDoc.segment( this.getSegmenter( language ) );
}
 
/**
@@ -36,15 +31,6 @@
 
return segmenter.getBoundaries;
}
-
-   getSegmentedContent() {
-   return this.segmentedDoc.getHtml();
-   }
-
-   getSegmentedDoc() {
-   return this.segmentedDoc;
-   }
-
 }
 
 module.exports = CXSegmenter;
diff --git 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Allow FormId to be prefixed, as required via EntityId

[jenkins-bot (Code Review)]

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

Change subject: Allow FormId to be prefixed, as required via EntityId
..


Allow FormId to be prefixed, as required via EntityId

Bug: T180469
Change-Id: Ieee80058fb1b2de7a4a13c6ab108ce2db6ffa7c4
---
M src/DataModel/FormId.php
M tests/phpunit/composer/DataModel/FormIdTest.php
2 files changed, 20 insertions(+), 15 deletions(-)

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



diff --git a/src/DataModel/FormId.php b/src/DataModel/FormId.php
index f5008eb..af6fe77 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -17,16 +17,14 @@
 * @param string $serialization
 */
public function __construct( $serialization ) {
-   Assert::parameterType( 'string', $serialization, 
'$serialization' );
-   Assert::parameter(
-   preg_match( self::PATTERN, $serialization ),
-   '$serialization',
-   'Form ID must match "' . self::PATTERN . '", given: ' . 
$serialization
-   );
+   parent::__construct( $serialization );
 
-   $this->serialization = $serialization;
-   $this->repositoryName = '';
-   $this->localPart = $serialization;
+   list( , , $id ) = self::splitSerialization( $this->localPart );
+   Assert::parameter(
+   preg_match( self::PATTERN, $id ),
+   '$serialization',
+   'Form ID must match "' . self::PATTERN . '", given: ' . 
$id
+   );
}
 
/**
@@ -55,8 +53,9 @@
 */
public function unserialize( $serialized ) {
$this->serialization = $serialized;
-   $this->repositoryName = '';
-   $this->localPart = $serialized;
+   list( $this->repositoryName, $this->localPart ) = 
$this->extractRepositoryNameAndLocalPart(
+   $serialized
+   );
}
 
 }
diff --git a/tests/phpunit/composer/DataModel/FormIdTest.php 
b/tests/phpunit/composer/DataModel/FormIdTest.php
index 9b3df39..57ae229 100644
--- a/tests/phpunit/composer/DataModel/FormIdTest.php
+++ b/tests/phpunit/composer/DataModel/FormIdTest.php
@@ -16,11 +16,19 @@
 class FormIdTest extends PHPUnit_Framework_TestCase {
 
public function 
testGivenValidSerialization_allGettersBehaveConsistent() {
-   $id = new FormId( 'L1-F1' );
+   $id = new FormId( ':L1-F1' );
$this->assertSame( 'L1-F1', $id->getSerialization() );
$this->assertSame( '', $id->getRepositoryName(), 
'getRepositoryName' );
$this->assertSame( 'L1-F1', $id->getLocalPart(), 'getLocalPart' 
);
$this->assertFalse( $id->isForeign(), 'isForeign' );
+   }
+
+   public function testGivenNonEmptyPrefix_allGettersBehaveConsistent() {
+   $id = new FormId( 'repo:L1-F1' );
+   $this->assertSame( 'repo:L1-F1', $id->getSerialization() );
+   $this->assertSame( 'repo', $id->getRepositoryName(), 
'getRepositoryName' );
+   $this->assertSame( 'L1-F1', $id->getLocalPart(), 'getLocalPart' 
);
+   $this->assertTrue( $id->isForeign(), 'isForeign' );
}
 
public function provideInvalidSerializations() {
@@ -35,8 +43,6 @@
[ '  L1-F1  ' ],
[ "L1-F1\n" ],
[ 'P1' ],
-   [ ':L1-F1' ],
-   [ 'repo:L1-F1' ],
];
}
 
@@ -49,7 +55,7 @@
}
 
public function testPhpSerializationRoundtrip() {
-   $id = new FormId( 'L1-F1' );
+   $id = new FormId( 'repo:L1-F1' );
$this->assertEquals( $id, unserialize( serialize( $id ) ) );
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ieee80058fb1b2de7a4a13c6ab108ce2db6ffa7c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (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] mediawiki...WikibaseLexeme[master]: Make FormId extend EntityId

[jenkins-bot (Code Review)]

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

Change subject: Make FormId extend EntityId
..


Make FormId extend EntityId

This patch is intentionally as small as it can be. The FormId class is
now an EntityId, but it does not allow prefixed ("foreign") IDs. This is
currently not needed. I'm aware this violates LSP, but I suggest to accept
this for now and change it later when we need FormIds that point to foreign
Wikibase repositories.

Bug: T180469
Change-Id: I505e5dd96d665196885a019c73754aea350b1ac0
---
M src/DataModel/FormId.php
M tests/phpunit/composer/DataModel/FormIdTest.php
2 files changed, 38 insertions(+), 7 deletions(-)

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



diff --git a/src/DataModel/FormId.php b/src/DataModel/FormId.php
index 63a1c3f..f5008eb 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -2,20 +2,16 @@
 
 namespace Wikibase\Lexeme\DataModel;
 
+use Wikibase\DataModel\Entity\EntityId;
 use Wikimedia\Assert\Assert;
 
 /**
  * @license GPL-2.0+
  * @author Thiemo Mättig
  */
-class FormId {
+class FormId extends EntityId {
 
const PATTERN = '/^L[1-9]\d*-F[1-9]\d*\z/';
-
-   /**
-* @var string
-*/
-   private $serialization;
 
/**
 * @param string $serialization
@@ -29,6 +25,15 @@
);
 
$this->serialization = $serialization;
+   $this->repositoryName = '';
+   $this->localPart = $serialization;
+   }
+
+   /**
+* @return string
+*/
+   public function getEntityType() {
+   return 'form';
}
 
/**
@@ -38,4 +43,20 @@
return $this->serialization;
}
 
+   /**
+* @return string
+*/
+   public function serialize() {
+   return $this->serialization;
+   }
+
+   /**
+* @param string $serialized
+*/
+   public function unserialize( $serialized ) {
+   $this->serialization = $serialized;
+   $this->repositoryName = '';
+   $this->localPart = $serialized;
+   }
+
 }
diff --git a/tests/phpunit/composer/DataModel/FormIdTest.php 
b/tests/phpunit/composer/DataModel/FormIdTest.php
index 65052c7..9b3df39 100644
--- a/tests/phpunit/composer/DataModel/FormIdTest.php
+++ b/tests/phpunit/composer/DataModel/FormIdTest.php
@@ -15,9 +15,12 @@
  */
 class FormIdTest extends PHPUnit_Framework_TestCase {
 
-   public function testGivenValidSerialization_getSerializationReturnsIt() 
{
+   public function 
testGivenValidSerialization_allGettersBehaveConsistent() {
$id = new FormId( 'L1-F1' );
$this->assertSame( 'L1-F1', $id->getSerialization() );
+   $this->assertSame( '', $id->getRepositoryName(), 
'getRepositoryName' );
+   $this->assertSame( 'L1-F1', $id->getLocalPart(), 'getLocalPart' 
);
+   $this->assertFalse( $id->isForeign(), 'isForeign' );
}
 
public function provideInvalidSerializations() {
@@ -32,6 +35,8 @@
[ '  L1-F1  ' ],
[ "L1-F1\n" ],
[ 'P1' ],
+   [ ':L1-F1' ],
+   [ 'repo:L1-F1' ],
];
}
 
@@ -43,4 +48,9 @@
new FormId( $id );
}
 
+   public function testPhpSerializationRoundtrip() {
+   $id = new FormId( 'L1-F1' );
+   $this->assertEquals( $id, unserialize( serialize( $id ) ) );
+   }
+
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I505e5dd96d665196885a019c73754aea350b1ac0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: Jonas Kress (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (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] mediawiki/core[fundraising/REL1_27]: Update DonationInterface submodule

[jenkins-bot (Code Review)]

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

Change subject: Update DonationInterface submodule
..


Update DonationInterface submodule

Change-Id: I6e2c2d53a0e325de52c0a5d5c018611d83f0161a
---
M extensions/DonationInterface
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/extensions/DonationInterface b/extensions/DonationInterface
index f03cbc2..cb15382 16
--- a/extensions/DonationInterface
+++ b/extensions/DonationInterface
@@ -1 +1 @@
-Subproject commit f03cbc2c9431624afcac7ef60d1ce1a6ac7cc408
+Subproject commit cb15382dbc4c8cef6c4d50fade56a6b1e8dee772

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6e2c2d53a0e325de52c0a5d5c018611d83f0161a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: fundraising/REL1_27
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Ejegg 
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]: SpecialUnblock: Remove addModules( 'mediawiki.special' )

[Fomafix (Code Review)]

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

Change subject: SpecialUnblock: Remove addModules( 'mediawiki.special' )
..

SpecialUnblock: Remove addModules( 'mediawiki.special' )

The special page Special:Unblock does not use the styles from the style
module 'mediawiki.special'.

Change-Id: Ia24a71b1b1fc7c7da9423a07adf9b67db336a1ff
---
M includes/specials/SpecialUnblock.php
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/83/392783/1

diff --git a/includes/specials/SpecialUnblock.php 
b/includes/specials/SpecialUnblock.php
index 0da9b7a..b2d5a16 100644
--- a/includes/specials/SpecialUnblock.php
+++ b/includes/specials/SpecialUnblock.php
@@ -57,7 +57,7 @@
 
$out = $this->getOutput();
$out->setPageTitle( $this->msg( 'unblockip' ) );
-   $out->addModules( [ 'mediawiki.special', 
'mediawiki.userSuggest' ] );
+   $out->addModules( [ 'mediawiki.userSuggest' ] );
 
$form = HTMLForm::factory( 'ooui', $this->getFields(), 
$this->getContext() );
$form->setWrapperLegendMsg( 'unblockip' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia24a71b1b1fc7c7da9423a07adf9b67db336a1ff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Fomafix 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Fully poll db1109, db1110

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Fully poll db1109,db1110
..


db-eqiad.php: Fully poll db1109,db1110

Bug: T180700
Change-Id: I68a086cf0ac1aff463bdd70e88b9a485db06ab79
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 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 f60ab0a..4cf33ff 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,8 +154,8 @@
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 300,  # B3 3.6TB 512GB, api
'db1106' => 500,  # D3 3.6TB 512GB
-   'db1109' => 300,  # D8 3.6TB 512GB
-   'db1110' => 300,  # C3 3.6TB 512GB
+   'db1109' => 500,  # D8 3.6TB 512GB
+   'db1110' => 500,  # C3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68a086cf0ac1aff463bdd70e88b9a485db06ab79
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
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]: [logstash] add debug_blob field

[DCausse (Code Review)]

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

Change subject: [logstash] add debug_blob field
..

[logstash] add debug_blob field

Add a new field debug_blob that is ignored by elastic to allow
storing random data for debug purposes.

Bug: T180051
Change-Id: I0c0bca1fe330fecf453151cad72936d33a1e5f01
---
M modules/role/files/logstash/elasticsearch-template.json
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/90/392590/1

diff --git a/modules/role/files/logstash/elasticsearch-template.json 
b/modules/role/files/logstash/elasticsearch-template.json
index 43af20c..7351e96 100644
--- a/modules/role/files/logstash/elasticsearch-template.json
+++ b/modules/role/files/logstash/elasticsearch-template.json
@@ -113,6 +113,9 @@
 }
   }
 },
+"debug_blob" : {
+  "enabled": false
+},
 "host" : {
   "type" : "keyword",
   "index" : true,

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix RdfVocabulary instantiations

[jenkins-bot (Code Review)]

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

Change subject: Fix RdfVocabulary instantiations
..


Fix RdfVocabulary instantiations

Change I1fe6c6ba92 (Wikibase commit 0b3d4aa8b5) changed the first
parameter of RdfVocabulary to be an array instead of a single string, so
a few instantiations in the tests need to be updated. (In the main code,
we never instantiate an RdfVocabulary ourselves, we get it from the
Wikibase repotitory.)

Change-Id: I54dee4745bad93b16bd642b08eecedf21136becd
---
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Helper/SparqlHelperTest.php
2 files changed, 7 insertions(+), 7 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/tests/phpunit/DelegatingConstraintCheckerTest.php 
b/tests/phpunit/DelegatingConstraintCheckerTest.php
index 72b9a60..a137413 100644
--- a/tests/phpunit/DelegatingConstraintCheckerTest.php
+++ b/tests/phpunit/DelegatingConstraintCheckerTest.php
@@ -84,7 +84,7 @@
] );
$config = $this->getDefaultConfig();
$rdfVocabulary = new RdfVocabulary(
-   'http://www.wikidata.org/entity/',
+   [ '' => 'http://www.wikidata.org/entity/' ],
'http://www.wikidata.org/wiki/Special:EntityData/'
);
$titleParser = $this->getTitleParserMock();
diff --git a/tests/phpunit/Helper/SparqlHelperTest.php 
b/tests/phpunit/Helper/SparqlHelperTest.php
index b03fda6..b071f5c 100644
--- a/tests/phpunit/Helper/SparqlHelperTest.php
+++ b/tests/phpunit/Helper/SparqlHelperTest.php
@@ -59,7 +59,7 @@
  ->setConstructorArgs( [
  $this->getDefaultConfig(),
  new RdfVocabulary(
- 
'http://www.wikidata.org/entity/',
+ [ '' => 
'http://www.wikidata.org/entity/' ],
  
'http://www.wikidata.org/wiki/Special:EntityData/'
  ),
  new ItemIdParser(),
@@ -98,7 +98,7 @@
  ->setConstructorArgs( [
  $this->getDefaultConfig(),
  new RdfVocabulary(
- 
'http://www.wikidata.org/entity/',
+ [ '' => 
'http://www.wikidata.org/entity/' ],
  
'http://www.wikidata.org/wiki/Special:EntityData/'
  ),
  new ItemIdParser(),
@@ -154,7 +154,7 @@
->setConstructorArgs( [
$this->getDefaultConfig(),
new RdfVocabulary(
-   'http://www.wikidata.org/entity/',
+   [ '' => 
'http://www.wikidata.org/entity/' ],

'http://www.wikidata.org/wiki/Special:EntityData/'
),
new ItemIdParser(),
@@ -354,7 +354,7 @@
$sparqlHelper = new SparqlHelper(
$this->getDefaultConfig(),
new RdfVocabulary(
-   'http://www.wikidata.org/entity/',
+   [ '' => 'http://www.wikidata.org/entity/' ],

'http://www.wikidata.org/wiki/Special:EntityData/'
),
 
@@ -378,7 +378,7 @@
]
] ),
new RdfVocabulary(
-   'http://www.wikidata.org/entity/',
+   [ '' => 'http://www.wikidata.org/entity/' ],

'http://www.wikidata.org/wiki/Special:EntityData/'
),
new ItemIdParser(),
@@ -430,7 +430,7 @@
$sparqlHelper = new SparqlHelper(
$this->getDefaultConfig(),
new RdfVocabulary(
-   'http://www.wikidata.org/entity/',
+   [ '' => 'http://www.wikidata.org/entity/' ],

'http://www.wikidata.org/wiki/Special:EntityData/'
),
new ItemIdParser(),

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

[MediaWiki-commits] [Gerrit] analytics...scripts[master]: Add advancedsearch to betafeature count script

[jenkins-bot (Code Review)]

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

Change subject: Add advancedsearch to betafeature count script
..


Add advancedsearch to betafeature count script

Bug: T180570
Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index 3b60da1..a619d36 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -21,6 +21,7 @@
'twocolconflict',
'rcenhancedfilters',
'codemirror-syntax-highlight',
+   'advancedsearch',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
Gerrit-PatchSet: 2
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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] analytics...scripts[master]: Add .editorconfig

[jenkins-bot (Code Review)]

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

Change subject: Add .editorconfig
..


Add .editorconfig

Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
---
A .editorconfig
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..455a243
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = tab

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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] analytics...scripts[production]: Add .editorconfig

[Addshore (Code Review)]

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

Change subject: Add .editorconfig
..

Add .editorconfig

Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
---
A .editorconfig
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/98/392598/1

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..455a243
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = tab

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] analytics...scripts[master]: Add .editorconfig

[Addshore (Code Review)]

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

Change subject: Add .editorconfig
..

Add .editorconfig

Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
---
A .editorconfig
1 file changed, 12 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/97/392597/1

diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..455a243
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = tab

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1096

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Increase weight for db1096
..

db-eqiad.php: Increase weight for db1096

Change-Id: I80ec5e74991fc2f4040abbae8f98f658c60abe88
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index eb75627..d68eded 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -399,7 +399,7 @@
'db1099' => 1,
],
'recentchanges' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'recentchangeslinked' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mediawiki::maintenance::wikidata: remove a trailing semicolon

[Elukey (Code Review)]

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

Change subject: mediawiki::maintenance::wikidata: remove a trailing semicolon
..


mediawiki::maintenance::wikidata: remove a trailing semicolon

Picked from deployment-prep puppet master.

Change-Id: I97e453aab1c120a0902a8372076018145c9d0b4e
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp 
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index 365e985..0bff2f8 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -4,7 +4,8 @@
 # Starts a dispatcher instance every 3 minutes
 # They will run for a maximum of 9 minutes, so we can only have 3 
concurrent instances.
 # This handles inserting jobs into client job queue, which then process 
the changes
-$dispatch_log_file = '/var/log/wikidata/dispatchChanges-wikidatawiki.log';
+$dispatch_log_file = '/var/log/wikidata/dispatchChanges-wikidatawiki.log'
+
 cron { 'wikibase-dispatch-changes4':
 ensure  => $ensure,
 command => "echo \"\$\$: Starting dispatcher\" >> 
${dispatch_log_file}; /usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php 
--wiki wikidatawiki --max-time 540 --batch-size 420 --dispatch-interval 25 
--lock-grace-interval 200 >> ${dispatch_log_file} 2>&1; echo \"\$\$: Dispatcher 
exited with $?\" >> ${dispatch_log_file}",

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I97e453aab1c120a0902a8372076018145c9d0b4e
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Giuseppe Lavagetto 
Gerrit-Reviewer: Hoo man 
Gerrit-Reviewer: Ladsgroup 
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]: [logstash] log all elastic queries

[DCausse (Code Review)]

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

Change subject: [logstash] log all elastic queries
..

[logstash] log all elastic queries

meant to be activated for a short period of time (1 week?).
The idea is to collect fields being used. The purpose is to
create a fixed mapping in the eventually we cannot continue
with dynamic mappings.

Bug: T180051
Change-Id: Ibb43c8778823063e648ef7dbdfcdd4a53bdfca59
---
M modules/role/files/logstash/elasticsearch-template.json
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/03/392603/1

diff --git a/modules/role/files/logstash/elasticsearch-template.json 
b/modules/role/files/logstash/elasticsearch-template.json
index 43af20c..a484f78 100644
--- a/modules/role/files/logstash/elasticsearch-template.json
+++ b/modules/role/files/logstash/elasticsearch-template.json
@@ -4,6 +4,7 @@
 "number_of_shards" : 1,
 "number_of_replicas" : 2,
 "index.refresh_interval" : "5s",
+"index.search.slowlog.threshold.query.info": "1nanos",
 "analysis" : {
   "analyzer" : {
 "default" : {

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove deleted repo operations/containers

[Hashar (Code Review)]

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

Change subject: Remove deleted repo operations/containers
..

Remove deleted repo operations/containers

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/04/392604/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4c3dce5..8106be1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2184,10 +2184,6 @@
 test:
   - debian-glue-non-voting
 
-  - name: operations/containers
-test:
-  - debian-glue-non-voting
-
   # TIP:
   # gerrit ls-projects -p operations/debs/
   # Nice alignement in vim obtained via: !column -t

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice580961639f5150525f2124250a7054dded4b1e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Icinga web: add icons for multiple notes_url items

[Volans (Code Review)]

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

Change subject: Icinga web: add icons for multiple notes_url items
..

Icinga web: add icons for multiple notes_url items

* Icinga allow to link multiple URLs in the notes_url parameter, if they
  are single-quoted and space-separated. In this case the shown icons
  will be 1-notes.gif, 2-notes.gif, etc.
* Add the above mentioned icons, up to 5, all linking the stats.gif
  built-in icon, so that when using single-quoted URLs the stats.gif
  icon is used, more approriate for Grafana dashboard links as they are
  used right now (instead of the default folder icon).

Bug: T170353
Change-Id: Ifeb80bb8a650d7872f3f43b6906ef16267fecf06
---
M modules/icinga/manifests/web.pp
1 file changed, 8 insertions(+), 0 deletions(-)


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

diff --git a/modules/icinga/manifests/web.pp b/modules/icinga/manifests/web.pp
index d034617..9af7038 100644
--- a/modules/icinga/manifests/web.pp
+++ b/modules/icinga/manifests/web.pp
@@ -36,6 +36,14 @@
 mode   => '0644',
 }
 
+# Allow up to 5 notes_url URLs
+['1', '2', '3', '4', '5'].each |$note_id| {
+file { "/usr/share/icinga/htdocs/images/${note_id}-notes.gif":
+ensure => link,
+target => 'stats.gif',
+}
+}
+
 # install the Icinga Apache site
 include ::apache::mod::rewrite
 include ::apache::mod::authnz_ldap

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Metric alarms: convert dashboad_link to array

[Volans (Code Review)]

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

Change subject: Metric alarms: convert dashboad_link to array
..

Metric alarms: convert dashboad_link to array

* Convert the dashboad_link parameter to dashboad_links, it must be an
  array.
* Ensure that there is at least one item and that the first item is a
  link to Grafana.
* Populate the Icinga's notes_url parameter with all the URLs in
  dashboad_links, using the single-quoted syntax even when only one link
  is present, to force Icinga to use the 1-notes.gif image instead of
  the default notes.gif one.

Bug: T170353
Change-Id: I9d1f8b440844ad556281c0c30eac2c98422fe4ef
---
M modules/confluent/manifests/kafka/broker/alerts.pp
M modules/eventlogging/manifests/monitoring/graphite.pp
M modules/graphite/manifests/monitoring/graphite.pp
M modules/icinga/manifests/monitor/wdqs.pp
M modules/labstore/manifests/monitoring/interfaces.pp
M modules/mediawiki/manifests/monitoring/graphite.pp
M modules/monitoring/manifests/check_prometheus.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/profile/manifests/cache/kafka/webrequest.pp
M modules/profile/manifests/kafka/broker/monitoring.pp
M modules/profile/manifests/zookeeper/server.pp
M modules/role/manifests/analytics_cluster/hadoop/master.pp
M modules/role/manifests/analytics_cluster/hadoop/standby.pp
M modules/role/manifests/analytics_cluster/hadoop/worker.pp
M modules/role/manifests/elasticsearch/alerts.pp
M modules/role/manifests/graphite/alerts.pp
M modules/role/manifests/graphite/alerts/reqstats.pp
M modules/role/manifests/restbase/alerts.pp
M modules/swift/manifests/monitoring/graphite_alerts.pp
M modules/varnish/manifests/instance.pp
M modules/wdqs/manifests/monitor/services.pp
M modules/zuul/manifests/monitoring/server.pp
23 files changed, 473 insertions(+), 431 deletions(-)


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

diff --git a/modules/confluent/manifests/kafka/broker/alerts.pp 
b/modules/confluent/manifests/kafka/broker/alerts.pp
index 66844b8..8844987 100644
--- a/modules/confluent/manifests/kafka/broker/alerts.pp
+++ b/modules/confluent/manifests/kafka/broker/alerts.pp
@@ -40,29 +40,29 @@
 # If it does, this means a broker replica is falling behind
 # and will be removed from the ISR.
 monitoring::graphite_threshold { 'kafka-broker-UnderReplicatedPartitions':
-description=> 'Kafka Broker Under Replicated Partitions',
-dashboard_link => 
'https://grafana.wikimedia.org/dashboard/db/kafka?panelId=29=1',
-metric => 
"${group_prefix}kafka.${graphite_broker_key}.kafka.server.ReplicaManager.UnderReplicatedPartitions.Value",
-warning=> '1',
-critical   => '10',
+description => 'Kafka Broker Under Replicated Partitions',
+dashboard_links => 
['https://grafana.wikimedia.org/dashboard/db/kafka?panelId=29=1'],
+metric  => 
"${group_prefix}kafka.${graphite_broker_key}.kafka.server.ReplicaManager.UnderReplicatedPartitions.Value",
+warning => '1',
+critical=> '10',
 # Alert if any undereplicated for more than 50%
 # of the time in the last 30 minutes.
-from   => '30min',
-percentage => 50,
-group  => $nagios_servicegroup,
+from=> '30min',
+percentage  => 50,
+group   => $nagios_servicegroup,
 }
 
 # Alert if any Kafka Broker replica lag is too high
 monitoring::graphite_threshold { 'kafka-broker-Replica-MaxLag':
-description=> 'Kafka Broker Replica Max Lag',
-dashboard_link => 
'https://grafana.wikimedia.org/dashboard/db/kafka?panelId=16=1',
-metric => 
"${group_prefix}kafka.${graphite_broker_key}.kafka.server.ReplicaFetcherManager.MaxLag.Value",
-warning=> $replica_maxlag_warning,
-critical   => $replica_maxlag_critical,
+description => 'Kafka Broker Replica Max Lag',
+dashboard_links => 
['https://grafana.wikimedia.org/dashboard/db/kafka?panelId=16=1'],
+metric  => 
"${group_prefix}kafka.${graphite_broker_key}.kafka.server.ReplicaFetcherManager.MaxLag.Value",
+warning => $replica_maxlag_warning,
+critical=> $replica_maxlag_critical,
 # Alert if large replica lag for more than 50%
 # of the time in the last 30 minutes.
-from   => '30min',
-percentage => 50,
-group  => $nagios_servicegroup,
+from=> '30min',
+percentage  => 50,
+group   => $nagios_servicegroup,
 }
 }
diff --git a/modules/eventlogging/manifests/monitoring/graphite.pp 
b/modules/eventlogging/manifests/monitoring/graphite.pp
index 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1096

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Increase weight for db1096
..


db-eqiad.php: Increase weight for db1096

Give it more weight

Change-Id: Ia5e8d082bdd4f22240bd5d101bca97e3306c4d27
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 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 d68eded..ddc3eb7 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -403,11 +403,11 @@
'db1099' => 1,
],
'recentchangeslinked' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'contributions' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'logpager' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia5e8d082bdd4f22240bd5d101bca97e3306c4d27
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]: db2068.yaml: Update socket location

[Marostegui (Code Review)]

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

Change subject: db2068.yaml: Update socket location
..

db2068.yaml: Update socket location

As db2068 has MariaDB down, let's update its socket location

Bug: T180927
Change-Id: Ifb8340a02ff37a5faec7e17eaf9430ff0caa9848
---
M hieradata/hosts/db2068.yaml
1 file changed, 0 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/09/392609/1

diff --git a/hieradata/hosts/db2068.yaml b/hieradata/hosts/db2068.yaml
index bc07613..e7f2f00 100644
--- a/hieradata/hosts/db2068.yaml
+++ b/hieradata/hosts/db2068.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's7'
-mariadb::socket: '/tmp/mysql.sock'

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: db2068.yaml: Update socket location

[Marostegui (Code Review)]

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

Change subject: db2068.yaml: Update socket location
..


db2068.yaml: Update socket location

As db2068 has MariaDB down, let's update its socket location

Bug: T180927
Change-Id: Ifb8340a02ff37a5faec7e17eaf9430ff0caa9848
---
M hieradata/hosts/db2068.yaml
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/hieradata/hosts/db2068.yaml b/hieradata/hosts/db2068.yaml
index bc07613..e7f2f00 100644
--- a/hieradata/hosts/db2068.yaml
+++ b/hieradata/hosts/db2068.yaml
@@ -1,2 +1 @@
 mariadb::shard: 's7'
-mariadb::socket: '/tmp/mysql.sock'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifb8340a02ff37a5faec7e17eaf9430ff0caa9848
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
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]: db-eqiad.php: Fully poll db1109, db1110

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Fully poll db1109,db1110
..

db-eqiad.php: Fully poll db1109,db1110

Bug: T180700
Change-Id: I68a086cf0ac1aff463bdd70e88b9a485db06ab79
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index f60ab0a..4cf33ff 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,8 +154,8 @@
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 300,  # B3 3.6TB 512GB, api
'db1106' => 500,  # D3 3.6TB 512GB
-   'db1109' => 300,  # D8 3.6TB 512GB
-   'db1110' => 300,  # C3 3.6TB 512GB
+   'db1109' => 500,  # D8 3.6TB 512GB
+   'db1110' => 500,  # C3 3.6TB 512GB
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1096 with low weight

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Repool db1096 with low weight
..

db-eqiad.php: Repool db1096 with low weight

db1096 was down to clone db1101 and for kernel upgrade

Bug: T178359
Change-Id: I525b4fd79bf21a951b4fd905bd9ebd1054d9337b
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 4cf33ff..eb75627 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -149,7 +149,7 @@
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
-   # 'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
+   'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 300,  # B3 3.6TB 512GB, api
@@ -395,7 +395,7 @@
'db1104' => 1,
],
'watchlist' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'recentchanges' => [

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceChecklist[master]: BlueSpiceChecklist: Change licence and version

[Mglaser (Code Review)]

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

Change subject: BlueSpiceChecklist: Change licence and version
..


BlueSpiceChecklist: Change licence and version

Changed GPL version to 3.0.

Raised extension version number to 3.0.0-alpha.

Changed GPL version to 3.0.

Added COPYING-file.

Corrected licence-disclaimer.

Removed @version-comments

Change-Id: Id3f2c06ab9a355335a90957a70f0e7cc23573df2
---
A COPYING
M Checklist.class.php
M extension.json
M resources/bluespice.checklist.js
4 files changed, 679 insertions(+), 7 deletions(-)

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



diff --git a/COPYING b/COPYING
new file mode 100644
index 000..e72bfdd
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+   TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Repool db1096 with low weight

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Repool db1096 with low weight
..


db-eqiad.php: Repool db1096 with low weight

db1096 was down to clone db1101 and for kernel upgrade

Bug: T178359
Change-Id: I525b4fd79bf21a951b4fd905bd9ebd1054d9337b
---
M wmf-config/db-eqiad.php
1 file changed, 2 insertions(+), 2 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 4cf33ff..eb75627 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -149,7 +149,7 @@
'db1082' => 300, # A2 3.6TB 512GB, api
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
-   # 'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T178359
+   'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1099' => 1,   # B2 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 300,  # B3 3.6TB 512GB, api
@@ -395,7 +395,7 @@
'db1104' => 1,
],
'watchlist' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'recentchanges' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I525b4fd79bf21a951b4fd905bd9ebd1054d9337b
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] analytics...scripts[production]: Add advancedsearch to betafeature count script

[jenkins-bot (Code Review)]

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

Change subject: Add advancedsearch to betafeature count script
..


Add advancedsearch to betafeature count script

Bug: T180570
Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
(cherry picked from commit f5b8195c73b8f546850a7a2b8fba1e53cb2e1e86)
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index 3b60da1..a619d36 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -21,6 +21,7 @@
'twocolconflict',
'rcenhancedfilters',
'codemirror-syntax-highlight',
+   'advancedsearch',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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] analytics...scripts[master]: Note about deployment in README

[jenkins-bot (Code Review)]

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

Change subject: Note about deployment in README
..


Note about deployment in README

Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
---
M README.md
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 60cf37a..278eda0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@
 
 This repo is cloned in the statistics::wmde role in the wmf puppet repo.
 
+## Deployment
+
+The master branch is a development branch.
+The production branch is automatically deployed and run on WMF analytics 
servers.
+
 ## Configuration
 
 Some of the social scripts require configuration settings to work.
@@ -26,4 +31,4 @@
 wikidata.*
 daily.wikidata.*
 
-The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.
\ No newline at end of file
+The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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] analytics...scripts[master]: Note about deployment in README

[Addshore (Code Review)]

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

Change subject: Note about deployment in README
..

Note about deployment in README

Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
---
M README.md
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/99/392599/1

diff --git a/README.md b/README.md
index 60cf37a..278eda0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@
 
 This repo is cloned in the statistics::wmde role in the wmf puppet repo.
 
+## Deployment
+
+The master branch is a development branch.
+The production branch is automatically deployed and run on WMF analytics 
servers.
+
 ## Configuration
 
 Some of the social scripts require configuration settings to work.
@@ -26,4 +31,4 @@
 wikidata.*
 daily.wikidata.*
 
-The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.
\ No newline at end of file
+The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] analytics...scripts[production]: Note about deployment in README

[jenkins-bot (Code Review)]

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

Change subject: Note about deployment in README
..


Note about deployment in README

Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
---
M README.md
1 file changed, 6 insertions(+), 1 deletion(-)

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



diff --git a/README.md b/README.md
index 60cf37a..278eda0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@
 
 This repo is cloned in the statistics::wmde role in the wmf puppet repo.
 
+## Deployment
+
+The master branch is a development branch.
+The production branch is automatically deployed and run on WMF analytics 
servers.
+
 ## Configuration
 
 Some of the social scripts require configuration settings to work.
@@ -26,4 +31,4 @@
 wikidata.*
 daily.wikidata.*
 
-The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.
\ No newline at end of file
+The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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] analytics...scripts[production]: Note about deployment in README

[Addshore (Code Review)]

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

Change subject: Note about deployment in README
..

Note about deployment in README

Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
---
M README.md
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/00/392600/1

diff --git a/README.md b/README.md
index 60cf37a..278eda0 100644
--- a/README.md
+++ b/README.md
@@ -4,6 +4,11 @@
 
 This repo is cloned in the statistics::wmde role in the wmf puppet repo.
 
+## Deployment
+
+The master branch is a development branch.
+The production branch is automatically deployed and run on WMF analytics 
servers.
+
 ## Configuration
 
 Some of the social scripts require configuration settings to work.
@@ -26,4 +31,4 @@
 wikidata.*
 daily.wikidata.*
 
-The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.
\ No newline at end of file
+The paths to **statsd.eqiad.wmnet** and **graphite.eqiad.wmnet** are hardcoded 
everywhere.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79bbe32fe3bb3b427ec81a716b3f0f9b3070d17b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Remove deleted repo operations/containers

[jenkins-bot (Code Review)]

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

Change subject: Remove deleted repo operations/containers
..


Remove deleted repo operations/containers

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 4c3dce5..8106be1 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2184,10 +2184,6 @@
 test:
   - debian-glue-non-voting
 
-  - name: operations/containers
-test:
-  - debian-glue-non-voting
-
   # TIP:
   # gerrit ls-projects -p operations/debs/
   # Nice alignement in vim obtained via: !column -t

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice580961639f5150525f2124250a7054dded4b1e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 
Gerrit-Reviewer: Hashar 
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...BlueSpiceFoundation[master]: BSFoundation: Used ReaderParams for PrimarayDataProvider

[Pwirth (Code Review)]

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

Change subject: BSFoundation: Used ReaderParams for PrimarayDataProvider
..

BSFoundation: Used ReaderParams for PrimarayDataProvider

* this makes sorting limit etc. also avaiable for pre-filtering

Change-Id: Ib1fd5d45f11338408774329987b590b8fba83ad5
---
M src/Data/IPrimaryDataProvider.php
M src/Data/Reader.php
M src/Data/Settings/PrimaryDataProvider.php
M src/Data/Watchlist/PrimaryDataProvider.php
4 files changed, 11 insertions(+), 16 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation 
refs/changes/10/392610/1

diff --git a/src/Data/IPrimaryDataProvider.php 
b/src/Data/IPrimaryDataProvider.php
index 5871aab..4f390f7 100644
--- a/src/Data/IPrimaryDataProvider.php
+++ b/src/Data/IPrimaryDataProvider.php
@@ -6,12 +6,9 @@
 
/**
 *
-* @param string $query Special simple filter that aims at one specific
-* field that the DataProvider needs to define.
-* @param Filter[] $preFilters Complete set of filters that will also be
-* applied later during the process by the "Filterer" step. Having it 
here
-* allows us to prefilter and tweak performance
-* @return \BlueSpice\Data\Record[]
+* @param ReaderParams $params Having it here allows us to prefilter and
+* tweak performance
+* @return Record[]
 */
-   public function makeData( $query = '', $preFilters = [] );
+   public function makeData( $params );
 }
\ No newline at end of file
diff --git a/src/Data/Reader.php b/src/Data/Reader.php
index 5e1d519..98a2d90 100644
--- a/src/Data/Reader.php
+++ b/src/Data/Reader.php
@@ -58,7 +58,7 @@
 */
public function read( $params ) {
$primaryDataProvider = $this->makePrimaryDataProvider( $params 
);
-   $dataSets = $primaryDataProvider->makeData( 
$params->getQuery(), $params->getFilter() );
+   $dataSets = $primaryDataProvider->makeData( $params );
 
$filterer = $this->makeFilterer( $params );
$dataSets = $filterer->filter( $dataSets );
@@ -78,7 +78,7 @@
$dataSets = $secondaryDataProvider->extend( $dataSets );
}
 
-   $resultSet = new ResultSet( $dataSets, $total  );
+   $resultSet = new ResultSet( $dataSets, $total );
return $resultSet;
}
 
diff --git a/src/Data/Settings/PrimaryDataProvider.php 
b/src/Data/Settings/PrimaryDataProvider.php
index df98328..c3cf5b8 100644
--- a/src/Data/Settings/PrimaryDataProvider.php
+++ b/src/Data/Settings/PrimaryDataProvider.php
@@ -28,10 +28,9 @@
 
/**
 *
-* @param string $query
-* @param type $preFilters
+* @param \BlueSpice\Data\ReaderParams $params
 */
-   public function makeData( $query = '', $preFilters = [] ) {
+   public function makeData( $params ) {
$this->data = [];
//workaround for the upgrade process. The new settings cannot be
//accessed before they are migrated
diff --git a/src/Data/Watchlist/PrimaryDataProvider.php 
b/src/Data/Watchlist/PrimaryDataProvider.php
index 1de86d5..aa1f8b6 100644
--- a/src/Data/Watchlist/PrimaryDataProvider.php
+++ b/src/Data/Watchlist/PrimaryDataProvider.php
@@ -42,14 +42,13 @@
 
/**
 *
-* @param string $query
-* @param type $preFilters
+* @param \BlueSpice\Data\ReaderParams $params
 */
-   public function makeData( $query = '', $preFilters = [] ) {
+   public function makeData( $params ) {
$res = $this->db->select(
'watchlist',
'*',
-   $this->makePreFilterConds( $preFilters )
+   $this->makePreFilterConds( $params->getFilter() )
);
 
$distinctUserIds = [];

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib1fd5d45f11338408774329987b590b8fba83ad5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: [WIP] [logstash] Add a way to move some data to debug_blob

[DCausse (Code Review)]

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

Change subject: [WIP] [logstash] Add a way to move some data to debug_blob
..

[WIP] [logstash] Add a way to move some data to debug_blob

NOTE: do not work with logstash 5.5.
(5.6 is required)

Bug: T180051
Change-Id: Id0e8d3b16c55a937096aef9ad9a81865cf17b544
---
A modules/role/files/logstash/filter-debug_blob.conf
M modules/role/manifests/logstash/collector.pp
2 files changed, 14 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/91/392591/1

diff --git a/modules/role/files/logstash/filter-debug_blob.conf 
b/modules/role/files/logstash/filter-debug_blob.conf
new file mode 100644
index 000..938d967
--- /dev/null
+++ b/modules/role/files/logstash/filter-debug_blob.conf
@@ -0,0 +1,9 @@
+filter {
+  if "es" in [tags] {
+if [channel] == "EventBus" {
+  mutate {
+rename => { "[events][params]" => 
"[debug_blob][eventbus][events][params]" }
+  }
+}
+  }
+}
diff --git a/modules/role/manifests/logstash/collector.pp 
b/modules/role/manifests/logstash/collector.pp
index 7113d5a..941472f 100644
--- a/modules/role/manifests/logstash/collector.pp
+++ b/modules/role/manifests/logstash/collector.pp
@@ -181,6 +181,11 @@
 priority => 70,
 }
 
+logstash::conf { 'filter_debug_blob':
+source   => 'puppet:///modules/role/logstash/filter-debug_blob.conf',
+priority => 70,
+}
+
 ## Outputs (90)
 # Template for Elasticsearch index creation
 file { '/etc/logstash/elasticsearch-template.json':

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceAvatars[master]: BlueSpiceAvatars: Change gpl licence to v3

[Mglaser (Code Review)]

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

Change subject: BlueSpiceAvatars: Change gpl licence to v3
..


BlueSpiceAvatars: Change gpl licence to v3

Changed GPL version to 3.0 and raised extension version number to
3.0.0-alpha.

Corrected Licence-disclaimer.

Added COPYING-file

Removed @version-comments

Added code-header to main classes

Removed code-header to main classes

Corrected Licence-disclaimer

Change-Id: Iad37af91a482bc8d3f9f6f3d550254ebcdb92d6f
---
M Avatars.php
A COPYING
M extension.json
3 files changed, 678 insertions(+), 5 deletions(-)

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



diff --git a/Avatars.php b/Avatars.php
index a1dc32c..e89c609 100644
--- a/Avatars.php
+++ b/Avatars.php
@@ -7,8 +7,7 @@
  *
  * 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.
+ * the Free Software Foundation, version 3.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -23,11 +22,10 @@
  * For further information visit http://www.bluespice.com
  *
  * @author Marc Reymann 
- * @version3.0.0
  * @packageBlueSpiceAvatars
  * @subpackage Avatars
  * @copyright  Copyright (C) 2016 Hallo Welt! GmbH, All rights reserved.
- * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v2 or 
later
+ * @licensehttp://www.gnu.org/copyleft/gpl.html GNU Public License v3
  * @filesource
  */
 
diff --git a/COPYING b/COPYING
new file mode 100644
index 000..e72bfdd
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,674 @@
+GNU GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this 

[MediaWiki-commits] [Gerrit] analytics...scripts[master]: Add advancedsearch to betafeature sount script

[Addshore (Code Review)]

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

Change subject: Add advancedsearch to betafeature sount script
..

Add advancedsearch to betafeature sount script

Bug: T180570
Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/93/392593/1

diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index 3b60da1..a619d36 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -21,6 +21,7 @@
'twocolconflict',
'rcenhancedfilters',
'codemirror-syntax-highlight',
+   'advancedsearch',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] analytics...scripts[production]: Add codemirror-syntax-highlight beta feature

[Addshore (Code Review)]

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

Change subject: Add codemirror-syntax-highlight beta feature
..

Add codemirror-syntax-highlight beta feature

Was deployed on July 5th and un-deployed and re-deployed and re-un-deployed
on later dates.

Change-Id: Ic5c89d836fa55c6dcb5a7b1295961a536b9300b4
(cherry picked from commit 3b8ffdd52656f2aea37b5b69889f6f6a9931b65a)
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/95/392595/1

diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index d8d64f7..3b60da1 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -20,6 +20,7 @@
'visualeditor-newwikitext',
'twocolconflict',
'rcenhancedfilters',
+   'codemirror-syntax-highlight',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5c89d836fa55c6dcb5a7b1295961a536b9300b4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Catrope 

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

[MediaWiki-commits] [Gerrit] analytics...scripts[production]: Add codemirror-syntax-highlight beta feature

[jenkins-bot (Code Review)]

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

Change subject: Add codemirror-syntax-highlight beta feature
..


Add codemirror-syntax-highlight beta feature

Was deployed on July 5th and un-deployed and re-deployed and re-un-deployed
on later dates.

Change-Id: Ic5c89d836fa55c6dcb5a7b1295961a536b9300b4
(cherry picked from commit 3b8ffdd52656f2aea37b5b69889f6f6a9931b65a)
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index d8d64f7..3b60da1 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -20,6 +20,7 @@
'visualeditor-newwikitext',
'twocolconflict',
'rcenhancedfilters',
+   'codemirror-syntax-highlight',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5c89d836fa55c6dcb5a7b1295961a536b9300b4
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
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] analytics...scripts[production]: Add advancedsearch to betafeature count script

[Addshore (Code Review)]

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

Change subject: Add advancedsearch to betafeature count script
..

Add advancedsearch to betafeature count script

Bug: T180570
Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
(cherry picked from commit f5b8195c73b8f546850a7a2b8fba1e53cb2e1e86)
---
M src/betafeatures/counts.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/wmde/scripts 
refs/changes/96/392596/1

diff --git a/src/betafeatures/counts.php b/src/betafeatures/counts.php
index 3b60da1..a619d36 100755
--- a/src/betafeatures/counts.php
+++ b/src/betafeatures/counts.php
@@ -21,6 +21,7 @@
'twocolconflict',
'rcenhancedfilters',
'codemirror-syntax-highlight',
+   'advancedsearch',
 );
 
 require_once( __DIR__ . '/../../lib/load.php' );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3145c6c28ffd37ac0dce39d7a29190ef2e39ef31
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove a trail semicolon, breaking deployment-tin

[Hashar (Code Review)]

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

Change subject: Remove a trail semicolon, breaking deployment-tin
..

Remove a trail semicolon, breaking deployment-tin

Picked from deployment-prep puppet master.

Change-Id: I97e453aab1c120a0902a8372076018145c9d0b4e
---
M modules/mediawiki/manifests/maintenance/wikidata.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/94/392594/1

diff --git a/modules/mediawiki/manifests/maintenance/wikidata.pp 
b/modules/mediawiki/manifests/maintenance/wikidata.pp
index 365e985..0bff2f8 100644
--- a/modules/mediawiki/manifests/maintenance/wikidata.pp
+++ b/modules/mediawiki/manifests/maintenance/wikidata.pp
@@ -4,7 +4,8 @@
 # Starts a dispatcher instance every 3 minutes
 # They will run for a maximum of 9 minutes, so we can only have 3 
concurrent instances.
 # This handles inserting jobs into client job queue, which then process 
the changes
-$dispatch_log_file = '/var/log/wikidata/dispatchChanges-wikidatawiki.log';
+$dispatch_log_file = '/var/log/wikidata/dispatchChanges-wikidatawiki.log'
+
 cron { 'wikibase-dispatch-changes4':
 ensure  => $ensure,
 command => "echo \"\$\$: Starting dispatcher\" >> 
${dispatch_log_file}; /usr/local/bin/mwscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dispatchChanges.php 
--wiki wikidatawiki --max-time 540 --batch-size 420 --dispatch-interval 25 
--lock-grace-interval 200 >> ${dispatch_log_file} 2>&1; echo \"\$\$: Dispatcher 
exited with $?\" >> ${dispatch_log_file}",

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1096

[jenkins-bot (Code Review)]

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

Change subject: db-eqiad.php: Increase weight for db1096
..


db-eqiad.php: Increase weight for db1096

Change-Id: I80ec5e74991fc2f4040abbae8f98f658c60abe88
---
M wmf-config/db-eqiad.php
1 file changed, 1 insertion(+), 1 deletion(-)

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 eb75627..d68eded 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -399,7 +399,7 @@
'db1099' => 1,
],
'recentchanges' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'recentchangeslinked' => [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I80ec5e74991fc2f4040abbae8f98f658c60abe88
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Marostegui 
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...WikibaseQualityConstraints[master]: Fix a series of code smell issues as reported by PHPStorm

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392602 )

Change subject: Fix a series of code smell issues as reported by PHPStorm
..

Fix a series of code smell issues as reported by PHPStorm

I realize this patch probably does to many things at the same time. I
wanted to submit it as a remark. Feel free to pick it up, split smaller
issues up into separate patches, or merge it as it is.

Change-Id: Iac8c2d6a3fdada4c717087c266c2e51085ba934d
---
M WikibaseQualityConstraintsHooks.php
M api/CheckConstraints.php
M includes/ConstraintCheck/Cache/CachedEntityIds.php
M includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M includes/ConstraintCheck/Checker/FormatChecker.php
M includes/ConstraintCheck/DelegatingConstraintChecker.php
M includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php
M includes/ConstraintCheck/Helper/ConstraintParameterParser.php
M includes/ConstraintCheck/Helper/SparqlHelper.php
M includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M includes/ConstraintCheck/ItemIdSnakValue.php
M includes/ConstraintRepository.php
M tests/phpunit/Api/CheckConstraintsTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php
M tests/phpunit/SparqlHelperMock.php
16 files changed, 61 insertions(+), 27 deletions(-)


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

diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 948e281..7be5106 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -43,6 +43,7 @@
if ( MediaWikiServices::getInstance()->getMainConfig()->get( 
'WBQualityConstraintsEnableConstraintsImportFromStatements' ) &&
self::isPropertyStatementsChange( $change )
) {
+   /** @var EntityChange $change */
$title = Title::newMainPage();
$params = [ 'propertyId' => 
$change->getEntityId()->getSerialization() ];
JobQueueGroup::singleton()->push(
diff --git a/api/CheckConstraints.php b/api/CheckConstraints.php
index 798bb17..167b4c1 100644
--- a/api/CheckConstraints.php
+++ b/api/CheckConstraints.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
-use Wikibase\DataModel\Services\Statement\StatementGuidParser;
 use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityTitleLookup;
@@ -52,11 +51,6 @@
 * @var StatementGuidValidator
 */
private $statementGuidValidator;
-
-   /**
-* @var StatementGuidParser
-*/
-   private $statementGuidParser;
 
/**
 * @var DelegatingConstraintChecker
@@ -122,7 +116,6 @@
$entityIdHtmlLinkFormatter = 
$entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( 
$labelDescriptionLookup );
$entityIdLabelFormatterFactory = new 
EntityIdLabelFormatterFactory();
$entityIdLabelFormatter = 
$entityIdLabelFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
-   $statementGuidParser = $repo->getStatementGuidParser();
$constraintParameterRenderer = new ConstraintParameterRenderer( 
$entityIdHtmlLinkFormatter, $valueFormatter );
$config = MediaWikiServices::getInstance()->getMainConfig();
$titleParser = 
MediaWikiServices::getInstance()->getTitleParser();
@@ -130,7 +123,7 @@
$constraintReportFactory = new ConstraintReportFactory(
$repo->getEntityLookup(),
$repo->getPropertyDataTypeLookup(),
-   $statementGuidParser,
+   $repo->getStatementGuidParser(),
$config,
$constraintParameterRenderer,
new ConstraintParameterParser(
@@ -144,13 +137,19 @@
$unitConverter
);
 
-   return new CheckConstraints( $main, $name, $prefix, 
$repo->getEntityIdParser(),
-   $repo->getStatementGuidValidator(), 
$statementGuidParser, $constraintReportFactory->getConstraintChecker(),
+   return new CheckConstraints(
+   $main,
+   $name,
+   $prefix,
+   $repo->getEntityIdParser(),
+   $repo->getStatementGuidValidator(),
+   $constraintReportFactory->getConstraintChecker(),
$constraintParameterRenderer,
$repo->getApiHelperFactory( 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad.php: Increase weight for db1096

[Marostegui (Code Review)]

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

Change subject: db-eqiad.php: Increase weight for db1096
..

db-eqiad.php: Increase weight for db1096

Give it more weight

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


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

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index d68eded..ddc3eb7 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -403,11 +403,11 @@
'db1099' => 1,
],
'recentchangeslinked' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'contributions' => [
-   # 'db1096' => 1,
+   'db1096' => 1,
'db1099' => 1,
],
'logpager' => [

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

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

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

[MediaWiki-commits] [Gerrit] operations...druid_exporter[debian]: Release version 0.4

[Elukey (Code Review)]

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

Change subject: Release version 0.4
..

Release version 0.4

Change-Id: I2ed552a05bdafd29284b40860e011fc1c03c0a93
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/druid_exporter 
refs/changes/11/392611/1

diff --git a/debian/changelog b/debian/changelog
index 66fc3d1..ab8ae97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-druid-exporter (0.4-1) unstable; urgency=low
+
+  * Remove unused query/node/* metrics support.
+
+ -- Luca Toscano   Tue, 21 Nov 2017 10:53:36 +
+
 prometheus-druid-exporter (0.3-1) unstable; urgency=low
 
   * Fix decoding of JSON data in python3

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ed552a05bdafd29284b40860e011fc1c03c0a93
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/druid_exporter
Gerrit-Branch: debian
Gerrit-Owner: Elukey 

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

[MediaWiki-commits] [Gerrit] operations...druid_exporter[debian]: Release version 0.4

[Elukey (Code Review)]

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

Change subject: Release version 0.4
..


Release version 0.4

Change-Id: I2ed552a05bdafd29284b40860e011fc1c03c0a93
---
M debian/changelog
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/debian/changelog b/debian/changelog
index 66fc3d1..ab8ae97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-druid-exporter (0.4-1) unstable; urgency=low
+
+  * Remove unused query/node/* metrics support.
+
+ -- Luca Toscano   Tue, 21 Nov 2017 10:53:36 +
+
 prometheus-druid-exporter (0.3-1) unstable; urgency=low
 
   * Fix decoding of JSON data in python3

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2ed552a05bdafd29284b40860e011fc1c03c0a93
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/druid_exporter
Gerrit-Branch: debian
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Close transitionteamwiki

[MarcoAurelio (Code Review)]

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

Change subject: Close transitionteamwiki
..

Close transitionteamwiki

Bug: T181000
Change-Id: I6fdb302e6eef0f654c0e2e3be85684d336cf8987
---
0 files changed, 0 insertions(+), 0 deletions(-)


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


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fdb302e6eef0f654c0e2e3be85684d336cf8987
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: MarcoAurelio 
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...plugins[master]: Upgrade logstash plugins to 5.5.2

[DCausse (Code Review)]

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

Change subject: Upgrade logstash plugins to 5.5.2
..

Upgrade logstash plugins to 5.5.2

- Changed license because ruby complained
- removed sentry to pull it like other plugins (not sure about de dot it seems
  to contain some tweaks event.get vs event.include?)
- install plugins first then prepare offline pack

Bug: T178412
Change-Id: I3673cda254731a695b92cce0eb9fff135d52b45a
---
M build.sh
D logstash-filters-wikimedia/lib/logstash/outputs/sentry.rb
M logstash-filters-wikimedia/logstash-filters-wikimedia.gemspec
A target/releases/plugins-5.5.2.zip
M target/releases/plugins-latest.zip
5 files changed, 19 insertions(+), 139 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/operations/software/logstash/plugins 
refs/changes/21/392621/1

diff --git a/build.sh b/build.sh
index 8e07bb6..f88f03c 100755
--- a/build.sh
+++ b/build.sh
@@ -19,6 +19,7 @@
 PLUGIN_PACK_PATH="$(realpath target/releases)/${PLUGIN_PACK}"
 LS_HOME=${LS_HOME:=/usr/share/logstash}
 LS_PLUGIN="${LS_HOME}/bin/logstash-plugin"
+PATH=$PATH:${LS_HOME}/bin
 
 if [ -f "$PLUGIN_PACK_PATH" -a "$IS_SNAPSHOT" = "no" ]; then
 echo Plugin pack already exists, please use a higher version number.
@@ -64,11 +65,24 @@
 echo 
 echo Build initial plugin pack with logstash-plugin prepare-offline-pack
 echo
+pushd $LS_HOME # 
https://github.com/logstash-plugins/logstash-filter-anonymize/issues/11
+
+# Install first otherwize prepare-offline-pack will fail
+$LS_PLUGIN install \
+logstash-filter-anonymize \
+logstash-filter-multiline \
+logstash-filter-prune \
+logstash-filter-json_encode \
+logstash-output-sentry
+
 $LS_PLUGIN prepare-offline-pack \
 --output "$PLUGIN_PACK_PATH" \
 logstash-filter-anonymize \
 logstash-filter-multiline \
-logstash-filter-prune
+logstash-filter-prune \
+logstash-filter-json_encode \
+logstash-output-sentry
+popd
 echo
 
 echo 
diff --git a/logstash-filters-wikimedia/lib/logstash/outputs/sentry.rb 
b/logstash-filters-wikimedia/lib/logstash/outputs/sentry.rb
deleted file mode 100644
index 584918b..000
--- a/logstash-filters-wikimedia/lib/logstash/outputs/sentry.rb
+++ /dev/null
@@ -1,135 +0,0 @@
-# from 
https://github.com/antho31/logstash-output-sentry/blob/master/lib/logstash/outputs/sentry.rb
-# (C) 2014 Dave Clark, MIT license
-
-# encoding: utf-8
-require 'logstash/outputs/base'
-require 'logstash/namespace'
-require 'json'
-
-# Sentry is a modern error logging and aggregation platform.
-# * https://getsentry.com/
-#
-# It’s important to note that Sentry should not be thought of as a log stream, 
but as an aggregator. 
-# It fits somewhere in-between a simple metrics solution (such as Graphite) 
and a full-on log stream aggregator (like Logstash).
-#
-# Generate and inform your client key (Settings -> Client key)
-# The client key has this form  * https://[key]:[secret]@[host]/[project_id] *
-#
-# More informations : 
-# * https://sentry.readthedocs.org/en/latest/
-
-
-class LogStash::Outputs::Sentry < LogStash::Outputs::Base
- 
-  config_name 'sentry'
-  
-  
-  # The key of the client key 
-  config :key, :validate => :string, :required => true
-  
-  # The secret  of the client key
-  config :secret, :validate => :string, :required => true
-  
-  # The project id of the client key
-  config :project_id, :validate => :string, :required => true
-  
-  # The Sentry host 
-  config :host, :validate => :string, :default => "https://app.getsentry.com;, 
:required => false 
-  
-  # This sets the message value in Sentry (the title of your event)
-  config :msg, :validate => :string, :default => "Message from logstash", 
:required => false
-  
-  # This sets the level value in Sentry (the level tag)
-  config :level_tag, :validate => :string, :default => "error", :required => 
false
-  
-  # Is the protocole https ? By default yes (host is 
"https://app.getsentry.com;) 
-  # If you have installed Sentry in your own machine, maybe you do use http, 
-  # so you have to disable ssl ( "use_ssl" => false ) 
-  config :use_ssl, :validate => :boolean, :default => true, :required => false 
-  
-  # If set to true automatically map all logstash defined fields to Sentry 
extra fields.
-  # As an example, the logstash event:
-  # [source,ruby]
-  #{
-  #  "@timestamp":"2013-12-10T14:36:26.151+",
-  #  "@version": 1,
-  #  "message":"log message",
-  #  "host": "host.domain.com",
-  #  "nested_field": {
-  #"key": "value"
-  #  }
-  #}
-  # Is mapped to this Sentry  event:
-  # [source,ruby]
-  # extra {
-  #  "@timestamp":"2013-12-10T14:36:26.151+",
-  #  "@version": 1,
-  #  "message":"log message",
-  #  "host": "host.domain.com",
-  #  "nested_field": {
-  # 

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Bumping portals to master

[Jdrewniak (Code Review)]

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

Change subject: Bumping portals to master
..

Bumping portals to master

Bug: T128546
Change-Id: If6cff9f904a7c4c771fc3eb453404cf53a844d62
---
M portals
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/portals b/portals
index 3862e2f..b5ca708 16
--- a/portals
+++ b/portals
@@ -1 +1 @@
-Subproject commit 3862e2f5c2c3196872b960a6e63cc5f1a70e9a2b
+Subproject commit b5ca70872f50e831ab35f1981fe46ae3aa71b1db

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: profile::pmacct: move configuration to Kafka Jumbo

[Elukey (Code Review)]

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

Change subject: profile::pmacct: move configuration to Kafka Jumbo
..


profile::pmacct: move configuration to Kafka Jumbo

In T172681 pmacct was causing issues to the Analytics Kafka
cluster due to a bug with librdkafka 0.11 and Kafka API <= 0.9.
This issue is not true anymore on Kafka Jumbo (Kafka API 0.11).

Bug: T173489
Change-Id: I22847da8acb60bcf7d2e057606207d2bc285552b
---
M hieradata/role/common/pmacct.yaml
M modules/pmacct/manifests/init.pp
M modules/profile/manifests/pmacct.pp
3 files changed, 26 insertions(+), 14 deletions(-)

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



diff --git a/hieradata/role/common/pmacct.yaml 
b/hieradata/role/common/pmacct.yaml
index 2fd9d4d..cd57b82 100644
--- a/hieradata/role/common/pmacct.yaml
+++ b/hieradata/role/common/pmacct.yaml
@@ -1,8 +1,2 @@
-# The analytics Kafka cluster is currently running the 0.9.0.1
-# protocol version, librkafka 0.11 needs to be explicity configured
-# as stated in:
-# https://github.com/edenhill/librdkafka/wiki/Broker-version-compatibility
-# https://github.com/edenhill/librdkafka/releases/tag/v0.11.0
-profile::pmacct::librdkafka_config:
-  - 'global, api.version.request, false'
-  - 'global, broker.version.fallback, 0.9.0.1'
\ No newline at end of file
+profile::pmacct::kafka_cluster: 'jumbo-eqiad'
+profile::pmacct::librdkafka_config: []
\ No newline at end of file
diff --git a/modules/pmacct/manifests/init.pp b/modules/pmacct/manifests/init.pp
index 254ac2e..7d82305 100644
--- a/modules/pmacct/manifests/init.pp
+++ b/modules/pmacct/manifests/init.pp
@@ -4,10 +4,19 @@
 #
 # === Parameters
 #
-# === Examples
+#  [*kafka_brokers*]
+#List of Kafka Brokers hostname:port combination to contact.
+#Default: undef
 #
-#  include pmacct
-
+#  [*librdkafka_config*]
+#List of librdkafka configs settings specified in the format indicated by 
upstream:
+#
+#topic, settingX, valueX
+#global, settingY, valueY
+#
+#Only available for pmacct >= 1.6.2, otherwise the configuration is a 
no-op.
+#Default: undef
+#
 class pmacct(
   $kafka_brokers = undef,
   $librdkafka_config = undef,
diff --git a/modules/profile/manifests/pmacct.pp 
b/modules/profile/manifests/pmacct.pp
index 1b0bf6d..0805532 100644
--- a/modules/profile/manifests/pmacct.pp
+++ b/modules/profile/manifests/pmacct.pp
@@ -2,7 +2,7 @@
 # Sets up a pmacct passive monitoring deployment (http://www.pmacct.net/).
 # It can also produce statistics/data to kafka if configured.
 #
-# [*kafka_config*]
+# [*kafka_cluster*]
 #   Kafka cluster configuration to use.
 #   FIXME: The default version uses an indirect hiera call via kafka_config(),
 #   so eventually this parameter would need to be replaced with an explicit
@@ -15,17 +15,26 @@
 #   topic, settingX, valueX
 #   global, settingY, valueY
 #
+#   The special value [] (empty list) can be used to avoid the creation of a 
librdkafka
+#   configuration file and use its defaults instead.
+#
 class profile::pmacct (
-$kafka_config  = kafka_config('analytics'),
+$kafka_cluster = hiera('profile::pmacct::kafka_cluster'),
 $librdkafka_config = hiera('profile::pmacct::librdkafka_config'),
 ) {
 system::role { 'pmacct':
 description => 'pmacct netflow accounting',
 }
 
+$kafka_config = kafka_config($kafka_cluster)
+$pmacct_librdkafka_conf = $librdkafka_config ? {
+[]  => undef,
+default => $librdkafka_config,
+}
+
 class { '::pmacct':
 kafka_brokers => $kafka_config['brokers']['string'],
-librdkafka_config => $librdkafka_config,
+librdkafka_config => $pmacct_librdkafka_conf,
 }
 
 include ::standard

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I22847da8acb60bcf7d2e057606207d2bc285552b
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Faidon Liambotis 
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] analytics...source[master]: Update MR cassandra loader to local quorum write

[Joal (Code Review)]

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

Change subject: Update MR cassandra loader to local quorum write
..

Update MR cassandra loader to local quorum write

So far it used the default LOCAL_ONE.

Change-Id: Ief832df84e7239d87d0739495600cd71c0d95f2d
---
M 
refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery/source 
refs/changes/23/392623/1

diff --git 
a/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
 
b/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
index ee2bf83..3f6891f 100644
--- 
a/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
+++ 
b/refinery-cassandra/src/main/java/org/wikimedia/analytics/refinery/cassandra/CassandraXSVLoader.java
@@ -305,6 +305,9 @@
 conf.get(CASSANDRA_USER_PROP),
 conf.get(CASSANDRA_PASSWD_PROP));
 
+// Force cassandra to write LOCAL_QUORUM
+ConfigHelper.setWriteConsistencyLevel(job.getConfiguration(), 
"LOCAL_QUORUM");
+
 // If batch size parameters are set, use them
 if ((conf.getInt(CASSANDRA_NODES, 0) > 0) && 
(conf.getInt(BATCH_SIZE_PROP, 0) > 0)) {
 conf.setInt(ColumnFamilyOutputFormat.BATCH_THRESHOLD, 
conf.getInt(BATCH_SIZE_PROP, 0));

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief832df84e7239d87d0739495600cd71c0d95f2d
Gerrit-PatchSet: 1
Gerrit-Project: analytics/refinery/source
Gerrit-Branch: master
Gerrit-Owner: Joal 

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

[MediaWiki-commits] [Gerrit] analytics/refinery[master]: Update cassandra load jobs to local quorum write

[Joal (Code Review)]

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

Change subject: Update cassandra load jobs to local quorum write
..

Update cassandra load jobs to local quorum write

So far they used the default LOCAL_ONE.

Change-Id: Id139a6024cf61dca5b0d2e781d89a588f7f2db53
---
M oozie/cassandra/bundle.properties
M oozie/cassandra/bundle.xml
M oozie/cassandra/coord_per_article_daily.properties
M oozie/cassandra/coord_per_project_daily.properties
M oozie/cassandra/coord_per_project_hourly.properties
M oozie/cassandra/coord_per_project_monthly.properties
M oozie/cassandra/coord_top_articles_daily.properties
M oozie/cassandra/coord_top_articles_monthly.properties
M oozie/cassandra/coord_unique_devices_daily.properties
M oozie/cassandra/coord_unique_devices_monthly.properties
M oozie/cassandra/daily/coordinator.xml
M oozie/cassandra/daily/workflow.xml
M oozie/cassandra/historical/pagecounts_per_project.properties
M oozie/cassandra/historical/workflow.xml
M oozie/cassandra/hourly/coordinator.xml
M oozie/cassandra/hourly/workflow.xml
M oozie/cassandra/monthly/coordinator.xml
M oozie/cassandra/monthly/workflow.xml
18 files changed, 51 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/analytics/refinery 
refs/changes/24/392624/1

diff --git a/oozie/cassandra/bundle.properties 
b/oozie/cassandra/bundle.properties
index de90779..e29e0e4 100644
--- a/oozie/cassandra/bundle.properties
+++ b/oozie/cassandra/bundle.properties
@@ -68,6 +68,7 @@
 cassandra_password = cassandra
 cassandra_nodes= 6
 batch_size = 1024
+cassandra_write_consistency= LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator   = \\t
diff --git a/oozie/cassandra/bundle.xml b/oozie/cassandra/bundle.xml
index 0a4e656..2c56ba5 100644
--- a/oozie/cassandra/bundle.xml
+++ b/oozie/cassandra/bundle.xml
@@ -38,6 +38,7 @@
 cassandra_port
 cassandra_username
 cassandra_password
+cassandra_write_consistency
 
 hive_value_separator
 cassandra_table
diff --git a/oozie/cassandra/coord_per_article_daily.properties 
b/oozie/cassandra/coord_per_article_daily.properties
index 1fa8382..0104790 100644
--- a/oozie/cassandra/coord_per_article_daily.properties
+++ b/oozie/cassandra/coord_per_article_daily.properties
@@ -67,6 +67,7 @@
 cassandra_password= cassandra
 cassandra_nodes   = 6
 batch_size= 1024
+cassandra_write_consistency   = LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator  = \\t
diff --git a/oozie/cassandra/coord_per_project_daily.properties 
b/oozie/cassandra/coord_per_project_daily.properties
index a6baf2f..a37b372 100644
--- a/oozie/cassandra/coord_per_project_daily.properties
+++ b/oozie/cassandra/coord_per_project_daily.properties
@@ -67,6 +67,7 @@
 cassandra_password= cassandra
 cassandra_nodes   = 6
 batch_size= 1024
+cassandra_write_consistency   = LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator  = \\t
diff --git a/oozie/cassandra/coord_per_project_hourly.properties 
b/oozie/cassandra/coord_per_project_hourly.properties
index 43f83ac..6b289b7 100644
--- a/oozie/cassandra/coord_per_project_hourly.properties
+++ b/oozie/cassandra/coord_per_project_hourly.properties
@@ -66,6 +66,7 @@
 cassandra_password= cassandra
 cassandra_nodes   = 6
 batch_size= 1024
+cassandra_write_consistency   = LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator  = \\t
diff --git a/oozie/cassandra/coord_per_project_monthly.properties 
b/oozie/cassandra/coord_per_project_monthly.properties
index 4a60f0a..d8fddbf 100644
--- a/oozie/cassandra/coord_per_project_monthly.properties
+++ b/oozie/cassandra/coord_per_project_monthly.properties
@@ -69,6 +69,7 @@
 cassandra_password= cassandra
 cassandra_nodes   = 6
 batch_size= 1024
+cassandra_write_consistency   = LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator  = \\t
diff --git a/oozie/cassandra/coord_top_articles_daily.properties 
b/oozie/cassandra/coord_top_articles_daily.properties
index 0c4c7c1..bf88644 100644
--- a/oozie/cassandra/coord_top_articles_daily.properties
+++ b/oozie/cassandra/coord_top_articles_daily.properties
@@ -67,6 +67,7 @@
 cassandra_password= cassandra
 cassandra_nodes   = 6
 batch_size= 1024
+cassandra_write_consistency   = LOCAL_QUORUM
 
 # Hive value separator
 hive_value_separator  = \\t
diff --git a/oozie/cassandra/coord_top_articles_monthly.properties 
b/oozie/cassandra/coord_top_articles_monthly.properties
index 4bae414..fe29ce1 100644
--- 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: rsync misc dumps (everything but xml/sql) to fallback hosts, ...

[ArielGlenn (Code Review)]

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

Change subject: rsync misc dumps (everything but xml/sql) to fallback hosts, 
labstore1006
..

rsync misc dumps (everything but xml/sql) to fallback hosts, labstore1006

Not everything is generated on the source host yet, but this
will rsync jobs as they get moved over.

Bug: T179942
Change-Id: I78de4a6d913427b278a376cfe1384966582f1672
---
M modules/dumps/files/generation/rsync-to-peers.sh
M modules/dumps/manifests/generation/server/rsyncer.pp
M modules/dumps/templates/initscripts/dumps-rsync-peers.systemd.erb
M modules/dumps/templates/initscripts/dumps-rsync-peers.upstart.erb
M modules/profile/manifests/dumps/generation/server/primary.pp
5 files changed, 59 insertions(+), 29 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/25/392625/1

diff --git a/modules/dumps/files/generation/rsync-to-peers.sh 
b/modules/dumps/files/generation/rsync-to-peers.sh
index 8193c50..a7b4a43 100644
--- a/modules/dumps/files/generation/rsync-to-peers.sh
+++ b/modules/dumps/files/generation/rsync-to-peers.sh
@@ -5,35 +5,49 @@
 # puppet:///modules/dumps/generation/rsync-to-peers.sh
 ##
 
-# This script rsyncs xml/sql dumps to fallback dumps generation nfs servers,
-# i.e. to its peers.
-# Eventually it will also rsync all output from misc dump cron jobs to
-# these servers.
+# This script rsyncs xml/sql dumps and misc dumps to fallback dumps
+# generation nfs servers, i.e. to its peers.
+#
 # This ensures that we never have more than one rsync connection going
 # at a time on the host where dumps are written as they are generated.
 
 usage() {
 cat< --remotedirs ,,...
+Usage: $0 --dumpsdir  --xmlremotedirs ,,...
 
-  --dumpsdir   path to root of dumps tree for rsync to peer hosts
-  --remotedir  comma-separated list of remote destinations to which to rsync
+  --xmldumpsdir   path to root of xml/sql dumps tree for rsync to peer hosts
+  --xmlremotedirs  comma-separated list of remote destinations to which to 
rsync
 
-Example: $0 --dumpsdir /data/xmldatadumps \\
-   --remotedirs 
dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dumpsdata1003.eqiad.wmnet::data/xmldatadumps/public/
+  --miscdumpsdir   path to root of misc dumps tree for rsync to peer hosts
+  --miscremotedirs  comma-separated list of remote destinations to which to 
rsync
+
+Example:
+
+ $0 --xmldumpsdir /data/xmldatadumps \\
+   --xmlremotedirs 
dumpsdata1002.eqiad.wmnet::data/xmldatadumps/public/,dumpsdata1003.eqiad.wmnet::data/xmldatadumps/public/
 \\
+   --miscdumpsdir /data/otherdumps \\
+   --miscremotedirs 
dumpsdata1002.eqiad.wmnet::data/otherdumps/,dumpsdata1003.eqiad.wmnet::data/otherdumps/
 EOF
 exit 1
 }
 
-dumpsdir=""
-remotedirs=""
+xmldumpsdir=""
+xmlremotedirs=""
+miscdumpsdir=""
+miscremotedirs=""
 
 while [ $# -gt 0 ]; do
-if [ $1 == "--dumpsdir" ]; then
-dumpsdir="$2"
+if [ $1 == "--xmldumpsdir" ]; then
+xmldumpsdir="$2"
 shift; shift
-elif [ $1 == "--remotedirs" ]; then
-remotedirs="$2"
+elif [ $1 == "--xmlremotedirs" ]; then
+xmlremotedirs="$2"
+shift; shift
+elif [ $1 == "--miscdumpdir" ]; then
+xmlremotedirs="$2"
+shift; shift
+elif [ $1 == "--miscremotedirs" ]; then
+xmlremotedirs="$2"
 shift; shift
 else
 echo "$0: Unknown option $1" >& 2
@@ -41,27 +55,39 @@
 fi
 done
 
-if [ -z "$dumpsdir" ]; then
-echo "$0: missing argument --dumpsdir"
+if [ -z "$xmldumpsdir" ]; then
+echo "$0: missing argument --xmldumpsdir"
 usage && exit 1
-fi
-if [ -z "$remotedirs" ]; then
-echo "$0: missing argument --remotedirs"
+elif [ -z "$xmlremotedirs" ]; then
+echo "$0: missing argument --xmlremotedirs"
+usage && exit 1
+elif [ -z "$miscdumpsdir" ]; then
+echo "$0: missing argument --miscdumpsdir"
+usage && exit 1
+elif [ -z "$miscemotedirs" ]; then
+echo "$0: missing argument --miscremotedirs"
 usage && exit 1
 fi
 
 IFS_SAVE=$IFS
 IFS=','
-read -a remotedirs_list <<<$remotedirs
+read -a xmlremotedirs_list <<<$xmlremotedirs
+read -a miscremotedirs_list <<<$miscremotedirs
 IFS=$IFS_SAVE
 
 while [ 1 ]; do
 
-for dest in $remotedirs_list; do
-   /usr/bin/rsync -a  --contimeout=600 --timeout=600 
${dumpsdir}/public/*html "$dest" > /dev/null 2>&1
+# rsync of xml/sql dumps for public wikis
+for dest in $xmlremotedirs_list; do
+   /usr/bin/rsync -a  --contimeout=600 --timeout=600 
${xmldumpsdir}/public/*html "$dest" > /dev/null 2>&1
 /usr/bin/rsync -a  --contimeout=600 --timeout=600 --exclude='**bad/' 
--exclude='**save/' --exclude='**not/' --exclude='**temp/' --exclude='**tmp/' 
--exclude='*.inprog'  ${dumpsdir}/public/*wik* "$dest" > /dev/null 2>&1
 done
 
+# rsync of misc dumps, not necessarily to/from the same tree as the public 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Icinga notification: use notes_url in messages

[Volans (Code Review)]

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

Change subject: Icinga notification: use notes_url in messages
..


Icinga notification: use notes_url in messages

* Use the notes_url in some of the alert notification messages, to
  include the links to Grafana dashboards, when set.
  Don't include them in the notification by SMS for readability and to
  avoid them being cut by the SMS length limitations.

Bug: T170353
Change-Id: I4b3b38646d7ec082fcf0129f9537bfa0b21dca0c
---
M modules/nagios_common/templates/notification_commands.cfg.erb
1 file changed, 13 insertions(+), 13 deletions(-)

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



diff --git a/modules/nagios_common/templates/notification_commands.cfg.erb 
b/modules/nagios_common/templates/notification_commands.cfg.erb
index 61eb75e..f3281fe 100644
--- a/modules/nagios_common/templates/notification_commands.cfg.erb
+++ b/modules/nagios_common/templates/notification_commands.cfg.erb
@@ -33,7 +33,7 @@
 # 'notify-by-email' command definition
 define command{
command_namenotify-by-email
-   command_line/usr/bin/printf "%b" "Notification Type: 
$NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: 
$HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nAdditional 
Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s "** $NOTIFICATIONTYPE$ alert - 
$HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" $CONTACTEMAIL$
+   command_line/usr/bin/printf "%b" "Notification Type: 
$NOTIFICATIONTYPE$\n\nService: $SERVICEDESC$\nHost: $HOSTALIAS$\nAddress: 
$HOSTADDRESS$\nState: $SERVICESTATE$\n\nDate/Time: $LONGDATETIME$\n\nNotes URL: 
$SERVICENOTESURL$\n\nAdditional Info:\n\n$SERVICEOUTPUT$" | /usr/bin/mail -s 
"** $NOTIFICATIONTYPE$ alert - $HOSTALIAS$/$SERVICEDESC$ is $SERVICESTATE$ **" 
$CONTACTEMAIL$
}
 
 # 'notify-by-sms-gateway' command definitions
@@ -54,7 +54,7 @@
 
 define command{
command_namenotify-service-by-irc
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path %>/irc.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc.log
}
 
 # IRC output for wikidata
@@ -65,7 +65,7 @@
 
 define command{
command_namenotify-service-by-irc-wikidata
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path %>/irc-wikidata.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-wikidata.log
}
 
 # IRC output for interactive
@@ -76,7 +76,7 @@
 
 define command{
command_namenotify-service-by-irc-interactive
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path %>/irc-interactive.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-interactive.log
}
 
# IRC output for RelEng team
@@ -87,7 +87,7 @@
 
 define command{
command_namenotify-service-by-irc-releng
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path %>/irc-releng.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-releng.log
}
 
 # IRC output for (tool)labs
@@ -98,7 +98,7 @@
 
 define command{
command_namenotify-service-by-irc-labs
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path %>/irc-labs.log
+   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$ 
$SERVICENOTESURL$" >> <%= @irc_dir_path %>/irc-labs.log
}
 
 # IRC output for Analytics
@@ -109,7 +109,7 @@
 
 define command{
command_namenotify-service-by-irc-analytics
-   command_lineecho "$NOTIFICATIONTYPE$ - $SERVICEDESC$ on $HOSTNAME$ 
is $SERVICESTATE$: $SERVICEOUTPUT$ $SERVICEACKAUTHOR$ $SERVICEACKCOMMENT$" >> 
<%= @irc_dir_path 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Add references to the documentation of all DataModel classes

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392626 )

Change subject: Add references to the documentation of all DataModel classes
..

Add references to the documentation of all DataModel classes

Change-Id: Ife9c2d74e8046e00ee89648024882407e6acaca0
---
M src/DataModel/Form.php
M src/DataModel/FormId.php
M src/DataModel/Lexeme.php
M src/DataModel/LexemeId.php
M src/DataModel/Sense.php
M src/DataModel/SenseId.php
6 files changed, 25 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme 
refs/changes/26/392626/1

diff --git a/src/DataModel/Form.php b/src/DataModel/Form.php
index 2ba1464..f536893 100644
--- a/src/DataModel/Form.php
+++ b/src/DataModel/Form.php
@@ -10,6 +10,11 @@
 use Wikimedia\Assert\Assert;
 
 /**
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme's form in the
+ * lexiographical data model.
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Form
+ *
  * @license GPL-2.0+
  */
 class Form implements StatementListProvider {
diff --git a/src/DataModel/FormId.php b/src/DataModel/FormId.php
index 63a1c3f..8ae3cd4 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -5,6 +5,10 @@
 use Wikimedia\Assert\Assert;
 
 /**
+ * Immutable ID of a Lexeme' form in the lexiographical data model.
+ *
+ * @see https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Form
+ *
  * @license GPL-2.0+
  * @author Thiemo Mättig
  */
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index 2f5dd43..2b64c7d 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -13,6 +13,11 @@
 use Wikibase\DataModel\Term\TermList;
 
 /**
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme in the
+ * lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Lexeme
+ *
  * @license GPL-2.0+
  */
 class Lexeme implements EntityDocument, StatementListProvider {
diff --git a/src/DataModel/LexemeId.php b/src/DataModel/LexemeId.php
index 9a95d9a..28312b7 100644
--- a/src/DataModel/LexemeId.php
+++ b/src/DataModel/LexemeId.php
@@ -9,6 +9,10 @@
 use RuntimeException;
 
 /**
+ * Immutable ID of a Lexeme in the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Lexeme
+ *
  * @license GPL-2.0+
  */
 class LexemeId extends EntityId implements Int32EntityId {
diff --git a/src/DataModel/Sense.php b/src/DataModel/Sense.php
index bf48aab..e8469bd 100644
--- a/src/DataModel/Sense.php
+++ b/src/DataModel/Sense.php
@@ -6,7 +6,10 @@
 use Wikibase\DataModel\Term\TermList;
 
 /**
- * A sense of a Lexeme.
+ * Mutable (e.g. the provided StatementList can be changed) implementation of 
a Lexeme's sense in
+ * the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Sense
  *
  * @license GPL-2.0+
  */
diff --git a/src/DataModel/SenseId.php b/src/DataModel/SenseId.php
index 61e8060..b5437b6 100644
--- a/src/DataModel/SenseId.php
+++ b/src/DataModel/SenseId.php
@@ -3,7 +3,9 @@
 namespace Wikibase\Lexeme\DataModel;
 
 /**
- * An ID of a sense of a lexeme.
+ * Immutable ID of a Lexeme's sense in the lexiographical data model.
+ *
+ * @see 
https://www.mediawiki.org/wiki/Extension:WikibaseLexeme/Data_Model#Sense
  *
  * @license GPL-2.0+
  */

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife9c2d74e8046e00ee89648024882407e6acaca0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Temporary set consumer_batch_size to 10

[Ppchelko (Code Review)]

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

Change subject: [Config] Temporary set consumer_batch_size to 10
..

[Config] Temporary set consumer_batch_size to 10

Change-Id: I1169174689d2ec15ec351f6f4e8f535bfbfb854d
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/services/change-propagation/jobqueue-deploy
 refs/changes/15/392615/1

diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 3dacc09..d13e71d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -36,7 +36,7 @@
   job:
 <%- if env == 'production' %>
 topic: 
'/(?:^mediawiki\.job\.RecordLintJob$)|(?:^mediawiki\.job\.deleteLinks$)|(?:^mediawiki\.job\.MessageIndexRebuildJob$)|(?:^mediawiki\.job\.flaggedrevs_CacheUpdate$)|(?:^mediawiki\.job\.updateBetaFeaturesUserCounts$)/'
-consumer_batch_size: 50 # Temporary for testing
+consumer_batch_size: 10 # Temporary for testing
 <%- else %>
 topic: '/^mediawiki\.job\..*/'
 <%- endif %>

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1169174689d2ec15ec351f6f4e8f535bfbfb854d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 

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

[MediaWiki-commits] [Gerrit] analytics...scripts[production]: Add .editorconfig

[jenkins-bot (Code Review)]

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

Change subject: Add .editorconfig
..


Add .editorconfig

Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
---
A .editorconfig
1 file changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000..455a243
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,12 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+[*.php]
+indent_style = tab

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a804762c02c177ea5e6fe1a9deae93e9b21ec55
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wmde/scripts
Gerrit-Branch: production
Gerrit-Owner: Addshore 
Gerrit-Reviewer: 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...WikibaseQualityConstraints[master]: Use parent selector in SpecialConstraintReportPage.less

[jenkins-bot (Code Review)]

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

Change subject: Use parent selector in SpecialConstraintReportPage.less
..


Use parent selector in SpecialConstraintReportPage.less

I think this makes the rules for notices and statuses more readable.

Change-Id: I6c0731681027aafd279f0803ec6e7f14163caf80
---
M modules/SpecialConstraintReportPage.less
1 file changed, 26 insertions(+), 26 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/modules/SpecialConstraintReportPage.less 
b/modules/SpecialConstraintReportPage.less
index 448cfbe..8fbcbcb 100644
--- a/modules/SpecialConstraintReportPage.less
+++ b/modules/SpecialConstraintReportPage.less
@@ -9,45 +9,45 @@
 /* Notices */
 .wbqc-constraintreport-notice {
font-style: italic;
-}
 
-.wbqc-constraintreport-notice-error {
-   font-weight: bold;
-   color: @colorErrorText;
+   &-error {
+   font-weight: bold;
+   color: @colorErrorText;
+   }
 }
 
 /* Statuses */
 .wbqc-status {
font-weight: bold;
-}
 
-.wbqc-status-compliance {
-   color: @wmui-color-green50;
-}
+   &-compliance {
+   color: @wmui-color-green50;
+   }
 
-.wbqc-status-exception {
-   color: @wmui-color-green30;
-}
+   &-exception {
+   color: @wmui-color-green30;
+   }
 
-.wbqc-status-violation {
-   color: @colorErrorText;
-}
+   &-violation {
+   color: @colorErrorText;
+   }
 
-.wbqc-status-todo {
-   color: @colorTextLight;
-}
+   &-todo {
+   color: @colorTextLight;
+   }
 
-.wbqc-status-bad-parameters {
-   color: @colorDestructiveActive;
-}
+   &-bad-parameters {
+   color: @colorDestructiveActive;
+   }
 
-.wbqc-status-deprecated,
-.wbqc-status-not-main-snak {
-   color: @colorNeutral;
-}
+   &-deprecated,
+   &-not-main-snak {
+   color: @colorNeutral;
+   }
 
-.wbqc-status-warning {
-   color: @wmui-color-yellow30;
+   &-warning {
+   color: @wmui-color-yellow30;
+   }
 }
 
 /* Tooltip */

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6c0731681027aafd279f0803ec6e7f14163caf80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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...WikibaseQualityConstraints[master]: Don’t use JsonFileEntityLookup in RangeCheckerTest

[jenkins-bot (Code Review)]

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

Change subject: Don’t use JsonFileEntityLookup in RangeCheckerTest
..


Don’t use JsonFileEntityLookup in RangeCheckerTest

Bug: T168240
Change-Id: Idf6ce5a1ac4d11638d7d37d583977c261f6dcbcf
---
D tests/phpunit/Checker/RangeChecker/P1.json
D tests/phpunit/Checker/RangeChecker/P2.json
M tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
3 files changed, 5 insertions(+), 19 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/tests/phpunit/Checker/RangeChecker/P1.json 
b/tests/phpunit/Checker/RangeChecker/P1.json
deleted file mode 100644
index c5c32ad..000
--- a/tests/phpunit/Checker/RangeChecker/P1.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "P1",
-  "type": "property",
-  "datatype": "time"
-}
diff --git a/tests/phpunit/Checker/RangeChecker/P2.json 
b/tests/phpunit/Checker/RangeChecker/P2.json
deleted file mode 100644
index 13ce8a6..000
--- a/tests/phpunit/Checker/RangeChecker/P2.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "id": "P1",
-  "type": "property",
-  "datatype": "quantity"
-}
diff --git a/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php 
b/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
index 46ffc63..df3cf8b 100644
--- a/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
+++ b/tests/phpunit/Checker/RangeChecker/RangeCheckerTest.php
@@ -3,7 +3,7 @@
 namespace WikibaseQuality\ConstraintReport\Test\RangeChecker;
 
 use Wikibase\DataModel\Entity\EntityDocument;
-use Wikibase\DataModel\Services\Lookup\EntityRetrievingDataTypeLookup;
+use Wikibase\DataModel\Services\Lookup\InMemoryDataTypeLookup;
 use Wikibase\DataModel\Snak\PropertyValueSnak;
 use DataValues\DecimalValue;
 use DataValues\QuantityValue;
@@ -24,7 +24,6 @@
 use WikibaseQuality\ConstraintReport\Tests\ConstraintParameters;
 use WikibaseQuality\ConstraintReport\Tests\Fake\FakeSnakContext;
 use WikibaseQuality\ConstraintReport\Tests\ResultAssertions;
-use WikibaseQuality\Tests\Helper\JsonFileEntityLookup;
 
 /**
  * @covers 
\WikibaseQuality\ConstraintReport\ConstraintCheck\Checker\RangeChecker
@@ -42,11 +41,6 @@
use ConstraintParameters, ResultAssertions;
 
/**
-* @var JsonFileEntityLookup
-*/
-   private $lookup;
-
-   /**
 * @var TimeValue
 */
private $timeValue;
@@ -58,14 +52,16 @@
 
protected function setUp() {
parent::setUp();
-   $this->lookup = new JsonFileEntityLookup( __DIR__ );
$this->timeValue = new TimeValue( 
'+0001970-01-01T00:00:00Z', 0, 0, 0, 11, 
'http://www.wikidata.org/entity/Q1985727' );
$rangeCheckerHelper = new RangeCheckerHelper(
$this->getDefaultConfig(),
new UnitConverter( new CSVUnitStorage( __DIR__ . 
'/units.csv' ), '' )
);
+   $dataTypeLookup = new InMemoryDataTypeLookup();
+   $dataTypeLookup->setDataTypeForProperty( new PropertyId( 'P1' 
), 'time' );
+   $dataTypeLookup->setDataTypeForProperty( new PropertyId( 'P2' 
), 'quantity' );
$this->checker = new RangeChecker(
-   new EntityRetrievingDataTypeLookup( $this->lookup ),
+   $dataTypeLookup,
$this->getConstraintParameterParser(),
$rangeCheckerHelper,
$this->getConstraintParameterRenderer()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idf6ce5a1ac4d11638d7d37d583977c261f6dcbcf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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]: profile::mariadb::misc::eventlogging:replication: add EL san...

[Elukey (Code Review)]

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

Change subject: profile::mariadb::misc::eventlogging:replication: add EL 
sanitization cron
..


profile::mariadb::misc::eventlogging:replication: add EL sanitization cron

The eventlogging_cleaner.py script will run daily only for the newer db1108
(not the other replicas that are going to be decommed).

Bug: T156933
Change-Id: I2e4f77ac7dd519327e07e5799742cd6829eb8aeb
---
M modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
1 file changed, 22 insertions(+), 2 deletions(-)

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



diff --git a/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp 
b/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
index d2a94a5..2697e43 100644
--- a/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
+++ b/modules/profile/manifests/mariadb/misc/eventlogging/replication.pp
@@ -74,9 +74,9 @@
 source => 
'puppet:///modules/profile/mariadb/misc/eventlogging/eventlogging_sync.sh',
 }
 
-logrotate::rule { 'eventlogging_sync':
+logrotate::rule { 'eventlogging':
 ensure=> present,
-file_glob => '/var/log/eventlogging_sync*.log',
+file_glob => '/var/log/eventlogging_*.log',
 frequency => 'daily',
 copy_truncate => true,
 compress  => true,
@@ -115,6 +115,26 @@
 ensure  => present,
 systemd => 
systemd_template('mariadb/misc/eventlogging/eventlogging_sync'),
 }
+
+# Sanitization of data in the log database via a custom script
+# The eventlogging_cleaner script uses the --start-ts-file file option,
+# that forces it to look for a file containing a timestamp in the 
format
+# %Y%m%d%H%M%S. If the file is not existent, the script will fail 
gracefully
+# without doing any action to the db. This is useful to avoid gaps in
+# records sanitized if the script fails and does not commit a new 
timestamp.
+$eventlogging_cleaner_command = '/usr/local/bin/eventlogging_cleaner 
--whitelist /etc/eventlogging/whitelist.tsv --older-than 90 --start-ts-file 
/var/run/eventlogging_cleaner --batch-size 1 --sleep-between-batches 2'
+$command = "/usr/bin/flock --verbose -n /var/lock/eventlogging_cleaner 
${eventlogging_cleaner_command} >> /var/log/eventlogging_cleaner.log"
+cron { 'eventlogging_cleaner daily sanitization':
+ensure  => present,
+command => $command,
+user=> 'eventlogcleaner',
+hour=> 1,
+require => [
+File['/usr/local/bin/eventlogging_cleaner'],
+File['/etc/eventlogging/whitelist.tsv'],
+User['eventlogcleaner'],
+]
+}
 }
 
 nrpe::monitor_service { 'eventlogging_sync':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2e4f77ac7dd519327e07e5799742cd6829eb8aeb
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Marostegui 
Gerrit-Reviewer: Mforns 
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]: install_server: Assign VMs the correct tty

[Alexandros Kosiaris (Code Review)]

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

Change subject: install_server: Assign VMs the correct tty
..


install_server: Assign VMs the correct tty

Ganeti VMs do not have 2 serial ports as our hardware fleet does, but
rather just one. Move all VMs from ttyS1-115200 to ttyS0-115200

Bug: T179036
Change-Id: I8480443c7c5c56c636bf489410e976f3338be2d3
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 48 insertions(+), 47 deletions(-)

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



diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index db0a29e..20dd1e6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -156,6 +156,24 @@
 fixed-address hassium.eqiad.wmnet;
 }
 
+host install1002 {
+hardware ethernet aa:00:00:3c:d7:80;
+fixed-address install1002.wikimedia.org;
+
+next-server 208.80.153.53; # install2002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "lpxelinux.0";
+}
+
+host install2002 {
+hardware ethernet aa:00:00:6b:d7:3f;
+fixed-address install2002.wikimedia.org;
+
+next-server 208.80.154.22; # install1002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "lpxelinux.0";
+}
+
 host kraz {
 hardware ethernet aa:00:00:e9:b4:28;
 fixed-address kraz.wikimedia.org;
@@ -267,9 +285,19 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host netmon1003 {
+hardware ethernet aa:00:00:79:17:b5;
+fixed-address netmon1003.wikimedia.org;
+}
+
 host nitrogen {
  hardware ethernet aa:00:00:e8:68:1f;
  fixed-address nitrogen.eqiad.wmnet;
+}
+
+host oresrdb2001 {
+hardware ethernet aa:00:00:3b:a3:0e;
+fixed-address oresrdb2001.codfw.wmnet;
 }
 
 host planet1001 {
@@ -393,3 +421,23 @@
 fixed-address tureis.codfw.wmnet;
 }
 
+host ununpentium {
+hardware ethernet aa:00:00:66:fb:d9;
+fixed-address ununpentium.wikimedia.org;
+}
+
+host webperf1001 {
+hardware ethernet aa:00:00:5e:f4:43;
+fixed-address webperf1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host webperf2001 {
+hardware ethernet aa:00:00:02:8b:11;
+fixed-address webperf2001.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 76f6a5e..f336af5 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2503,24 +2503,6 @@
 fixed-address hydrogen.wikimedia.org;
 }
 
-host install1002 {
-hardware ethernet aa:00:00:3c:d7:80;
-fixed-address install1002.wikimedia.org;
-
-next-server 208.80.153.53; # install2002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
-host install2002 {
-hardware ethernet aa:00:00:6b:d7:3f;
-fixed-address install2002.wikimedia.org;
-
-next-server 208.80.154.22; # install1002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
 host iridium {
 hardware ethernet f0:1f:af:e8:c5:27;
 fixed-address iridium.eqiad.wmnet;
@@ -5766,11 +5748,6 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host netmon1003 {
-hardware ethernet aa:00:00:79:17:b5;
-fixed-address netmon1003.wikimedia.org;
-}
-
 host netmon2001 {
 hardware ethernet 30:e1:71:70:2b:94;
 fixed-address netmon2001.wikimedia.org;
@@ -5907,11 +5884,6 @@
 host oresrdb1002{
 hardware ethernet C8:1F:66:BF:81:12;
 fixed-address oresrdb1002.eqiad.wmnet;
-}
-
-host oresrdb2001 {
-hardware ethernet aa:00:00:3b:a3:0e;
-fixed-address oresrdb2001.codfw.wmnet;
 }
 
 host oresrdb2002 {
@@ -6398,11 +6370,6 @@
 fixed-address tungsten.eqiad.wmnet;
 }
 
-host ununpentium {
-hardware ethernet aa:00:00:66:fb:d9;
-fixed-address ununpentium.wikimedia.org;
-}
-
 host uranium {
 hardware ethernet 84:2b:2b:fb:a6:67;
 fixed-address uranium.wikimedia.org;
@@ -6413,20 +6380,6 @@
 host wasat {
 hardware ethernet 14:02:ec:3f:47:8c;
 fixed-address wasat.codfw.wmnet;
-}
-
-host 

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Updating stats and translations

[Jdrewniak (Code Review)]

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

Change subject: Updating stats and translations
..

Updating stats and translations

Also fixes the blue link color around the globe and places the link to
Davvisámegiella wiki in the correct alphabetical order

Bug: T178981, T128546
Change-Id: I114737c4f80744ff1d178fac15033ecee24d821b
---
M data/site-stats.json
M dev/wikipedia.org/assets/css/style.css
M dev/wikipedia.org/assets/img/sprite-6e35f464.png
M prod/wikipedia.org/assets/img/sprite-6e35f464.png
A prod/wikipedia.org/assets/l10n/ab-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ab-d3866765.json
A prod/wikipedia.org/assets/l10n/ace-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ace-d3866765.json
A prod/wikipedia.org/assets/l10n/af-03ecca8f.json
D prod/wikipedia.org/assets/l10n/af-d3866765.json
A prod/wikipedia.org/assets/l10n/ak-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ak-d3866765.json
A prod/wikipedia.org/assets/l10n/als-03ecca8f.json
D prod/wikipedia.org/assets/l10n/als-d3866765.json
A prod/wikipedia.org/assets/l10n/am-03ecca8f.json
D prod/wikipedia.org/assets/l10n/am-d3866765.json
A prod/wikipedia.org/assets/l10n/an-03ecca8f.json
D prod/wikipedia.org/assets/l10n/an-d3866765.json
A prod/wikipedia.org/assets/l10n/ang-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ang-d3866765.json
A prod/wikipedia.org/assets/l10n/ar-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ar-d3866765.json
A prod/wikipedia.org/assets/l10n/arc-03ecca8f.json
D prod/wikipedia.org/assets/l10n/arc-d3866765.json
A prod/wikipedia.org/assets/l10n/arz-03ecca8f.json
D prod/wikipedia.org/assets/l10n/arz-d3866765.json
A prod/wikipedia.org/assets/l10n/as-03ecca8f.json
D prod/wikipedia.org/assets/l10n/as-d3866765.json
A prod/wikipedia.org/assets/l10n/ast-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ast-d3866765.json
A prod/wikipedia.org/assets/l10n/av-03ecca8f.json
D prod/wikipedia.org/assets/l10n/av-d3866765.json
A prod/wikipedia.org/assets/l10n/ay-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ay-d3866765.json
A prod/wikipedia.org/assets/l10n/az-03ecca8f.json
D prod/wikipedia.org/assets/l10n/az-d3866765.json
A prod/wikipedia.org/assets/l10n/azb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/azb-d3866765.json
A prod/wikipedia.org/assets/l10n/ba-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ba-d3866765.json
A prod/wikipedia.org/assets/l10n/bar-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bar-d3866765.json
A prod/wikipedia.org/assets/l10n/bat-smg-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bat-smg-d3866765.json
A prod/wikipedia.org/assets/l10n/bcl-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bcl-d3866765.json
A prod/wikipedia.org/assets/l10n/be-03ecca8f.json
D prod/wikipedia.org/assets/l10n/be-d3866765.json
A prod/wikipedia.org/assets/l10n/bg-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bg-d3866765.json
A prod/wikipedia.org/assets/l10n/bh-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bh-d3866765.json
A prod/wikipedia.org/assets/l10n/bi-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bi-d3866765.json
A prod/wikipedia.org/assets/l10n/bjn-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bjn-d3866765.json
A prod/wikipedia.org/assets/l10n/bm-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bm-d3866765.json
A prod/wikipedia.org/assets/l10n/bn-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bn-d3866765.json
A prod/wikipedia.org/assets/l10n/bo-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bo-d3866765.json
A prod/wikipedia.org/assets/l10n/bpy-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bpy-d3866765.json
A prod/wikipedia.org/assets/l10n/br-03ecca8f.json
D prod/wikipedia.org/assets/l10n/br-d3866765.json
A prod/wikipedia.org/assets/l10n/bs-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bs-d3866765.json
A prod/wikipedia.org/assets/l10n/bug-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bug-d3866765.json
A prod/wikipedia.org/assets/l10n/bxr-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bxr-d3866765.json
A prod/wikipedia.org/assets/l10n/ca-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ca-d3866765.json
A prod/wikipedia.org/assets/l10n/cbk-zam-03ecca8f.json
D prod/wikipedia.org/assets/l10n/cbk-zam-d3866765.json
A prod/wikipedia.org/assets/l10n/cdo-03ecca8f.json
D prod/wikipedia.org/assets/l10n/cdo-d3866765.json
A prod/wikipedia.org/assets/l10n/ce-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ce-d3866765.json
A prod/wikipedia.org/assets/l10n/ceb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ceb-d3866765.json
A prod/wikipedia.org/assets/l10n/ch-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ch-d3866765.json
A prod/wikipedia.org/assets/l10n/chr-03ecca8f.json
D prod/wikipedia.org/assets/l10n/chr-d3866765.json
A prod/wikipedia.org/assets/l10n/chy-03ecca8f.json
D prod/wikipedia.org/assets/l10n/chy-d3866765.json
A prod/wikipedia.org/assets/l10n/ckb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ckb-d3866765.json
A 

[MediaWiki-commits] [Gerrit] operations/deployment-charts[master]: First version of the helm chart scaffolding for production s...

[Giuseppe Lavagetto (Code Review)]

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

Change subject: First version of the helm chart scaffolding for production 
services
..

First version of the helm chart scaffolding for production services

There are still some missing pieces, but fundamentally what we do here
is to autogenerate helm charts that are tailored to work either in
minikube or our production environment given the following data is
provided:

* the service name
* the service port
* the name of the docker image to use
* the kubernetes namespace to operate on

Bug: T177397
Change-Id: I1b872c36d9b5c343a212bff2515f237c6c5dbb01
---
A _scaffold/.helmignore
A _scaffold/Chart.yaml
A _scaffold/config/prometheus-statsd.conf
A _scaffold/templates/_helpers.tpl
A _scaffold/templates/configmap.yaml
A _scaffold/templates/deployment.yaml
A _scaffold/templates/service.yaml
A _scaffold/values.yaml
A charts/.gitkeep
A create_new_service.sh
10 files changed, 204 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/deployment-charts 
refs/changes/19/392619/1

diff --git a/_scaffold/.helmignore b/_scaffold/.helmignore
new file mode 100644
index 000..f0c1319
--- /dev/null
+++ b/_scaffold/.helmignore
@@ -0,0 +1,21 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
diff --git a/_scaffold/Chart.yaml b/_scaffold/Chart.yaml
new file mode 100644
index 000..b9e67c4
--- /dev/null
+++ b/_scaffold/Chart.yaml
@@ -0,0 +1,4 @@
+apiVersion: v1
+description: A Helm chart for Kubernetes
+name: $SERVICE_NAME
+version: 0.0.1
diff --git a/_scaffold/config/prometheus-statsd.conf 
b/_scaffold/config/prometheus-statsd.conf
new file mode 100644
index 000..5bb921e
--- /dev/null
+++ b/_scaffold/config/prometheus-statsd.conf
@@ -0,0 +1,19 @@
+# This file should contain the prometheus-statsd-exporter configuration
+# For reference on how to write it, see
+# https://github.com/prometheus/statsd_exporter/blob/master/README.md
+#
+# You can map your statsd metrics to prometheus ones, by mapping the 
hierarchical
+#  names you get for statsd into prometheus labels; so say you have a metric
+# called serviceA.dcA.serverA.endpoints.foobar.time   and you want to transform
+# it to a metrics called "mean_response_time" with labels 
+#  {service: serviceA, datacenter: dcA, host: serverA, endpoint: foobar} you
+# need to create a mapping as follows:
+#
+#  mappings:
+#- match: serviceA.*.*.endpoints.*.mean_response_time
+#  name: "mean_response_time"
+#  labels:
+#service: $1
+#datacenter: $2
+#host: $3
+#endpoint: $4
diff --git a/_scaffold/templates/_helpers.tpl b/_scaffold/templates/_helpers.tpl
new file mode 100644
index 000..0d4fd8f
--- /dev/null
+++ b/_scaffold/templates/_helpers.tpl
@@ -0,0 +1,16 @@
+{{/* standard boilerplate safe names for kubernetes:
+ - wmf.chartname is the chart name safely truncated to 63 chars
+ - wmf.releasename is the current release name truncated to 63 chars
+ The reason to limit ourselves to 63 chars is that the DNS spec in kubernetes
+ limits names to that.
+ We also allow overriding the chart name via the chart.name value
+*/}}
+
+{{- define "wmf.chartname" -}}
+{{- default .Chart.Name .Values.chart.name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{- define "wmf.releasename" -}}
+{{- $name := default .Chart.Name .Values.chart.name -}}
+{{- printf "%s-%s" $name .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
diff --git a/_scaffold/templates/configmap.yaml 
b/_scaffold/templates/configmap.yaml
new file mode 100644
index 000..56763d2
--- /dev/null
+++ b/_scaffold/templates/configmap.yaml
@@ -0,0 +1,9 @@
+{{- if .Values.monitoring.enabled -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}-metrics-config
+data:
+  "prometheus-statsd.conf": -|
+{{ .Files.Get "config/prometheus-statsd.conf" }}
+{{- end -}}
diff --git a/_scaffold/templates/deployment.yaml 
b/_scaffold/templates/deployment.yaml
new file mode 100644
index 000..c33a969
--- /dev/null
+++ b/_scaffold/templates/deployment.yaml
@@ -0,0 +1,59 @@
+apiVersion: apps/v1beta1
+kind: Deployment
+metadata:
+  name: {{ template "wmf.releasename" . }}
+  labels:
+app: {{ template "wmf.chartname" . }}
+chart: {{ .Chart.Name }}-{{ .Chart.Version }}
+release: {{ .Release.Name }}
+heritage: {{ .Release.Service }}
+spec:
+  selector:
+matchLabels:
+  release: {{ .Release.Name }}
+  app: {{ template "wmf.chartname" . }}
+  # TODO: add the ability to do canary deployments here maybe?
+  replicas: {{ .Values.resources.replicas 

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Updating stats and translations

[jenkins-bot (Code Review)]

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

Change subject: Updating stats and translations
..


Updating stats and translations

Also fixes the blue link color around the globe and places the link to
Davvisámegiella wiki in the correct alphabetical order

Bug: T178981, T128546
Change-Id: I114737c4f80744ff1d178fac15033ecee24d821b
---
M data/site-stats.json
M dev/wikipedia.org/assets/css/style.css
M dev/wikipedia.org/assets/img/sprite-6e35f464.png
M prod/wikipedia.org/assets/img/sprite-6e35f464.png
A prod/wikipedia.org/assets/l10n/ab-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ab-d3866765.json
A prod/wikipedia.org/assets/l10n/ace-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ace-d3866765.json
A prod/wikipedia.org/assets/l10n/af-03ecca8f.json
D prod/wikipedia.org/assets/l10n/af-d3866765.json
A prod/wikipedia.org/assets/l10n/ak-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ak-d3866765.json
A prod/wikipedia.org/assets/l10n/als-03ecca8f.json
D prod/wikipedia.org/assets/l10n/als-d3866765.json
A prod/wikipedia.org/assets/l10n/am-03ecca8f.json
D prod/wikipedia.org/assets/l10n/am-d3866765.json
A prod/wikipedia.org/assets/l10n/an-03ecca8f.json
D prod/wikipedia.org/assets/l10n/an-d3866765.json
A prod/wikipedia.org/assets/l10n/ang-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ang-d3866765.json
A prod/wikipedia.org/assets/l10n/ar-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ar-d3866765.json
A prod/wikipedia.org/assets/l10n/arc-03ecca8f.json
D prod/wikipedia.org/assets/l10n/arc-d3866765.json
A prod/wikipedia.org/assets/l10n/arz-03ecca8f.json
D prod/wikipedia.org/assets/l10n/arz-d3866765.json
A prod/wikipedia.org/assets/l10n/as-03ecca8f.json
D prod/wikipedia.org/assets/l10n/as-d3866765.json
A prod/wikipedia.org/assets/l10n/ast-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ast-d3866765.json
A prod/wikipedia.org/assets/l10n/av-03ecca8f.json
D prod/wikipedia.org/assets/l10n/av-d3866765.json
A prod/wikipedia.org/assets/l10n/ay-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ay-d3866765.json
A prod/wikipedia.org/assets/l10n/az-03ecca8f.json
D prod/wikipedia.org/assets/l10n/az-d3866765.json
A prod/wikipedia.org/assets/l10n/azb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/azb-d3866765.json
A prod/wikipedia.org/assets/l10n/ba-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ba-d3866765.json
A prod/wikipedia.org/assets/l10n/bar-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bar-d3866765.json
A prod/wikipedia.org/assets/l10n/bat-smg-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bat-smg-d3866765.json
A prod/wikipedia.org/assets/l10n/bcl-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bcl-d3866765.json
A prod/wikipedia.org/assets/l10n/be-03ecca8f.json
D prod/wikipedia.org/assets/l10n/be-d3866765.json
A prod/wikipedia.org/assets/l10n/bg-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bg-d3866765.json
A prod/wikipedia.org/assets/l10n/bh-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bh-d3866765.json
A prod/wikipedia.org/assets/l10n/bi-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bi-d3866765.json
A prod/wikipedia.org/assets/l10n/bjn-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bjn-d3866765.json
A prod/wikipedia.org/assets/l10n/bm-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bm-d3866765.json
A prod/wikipedia.org/assets/l10n/bn-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bn-d3866765.json
A prod/wikipedia.org/assets/l10n/bo-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bo-d3866765.json
A prod/wikipedia.org/assets/l10n/bpy-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bpy-d3866765.json
A prod/wikipedia.org/assets/l10n/br-03ecca8f.json
D prod/wikipedia.org/assets/l10n/br-d3866765.json
A prod/wikipedia.org/assets/l10n/bs-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bs-d3866765.json
A prod/wikipedia.org/assets/l10n/bug-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bug-d3866765.json
A prod/wikipedia.org/assets/l10n/bxr-03ecca8f.json
D prod/wikipedia.org/assets/l10n/bxr-d3866765.json
A prod/wikipedia.org/assets/l10n/ca-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ca-d3866765.json
A prod/wikipedia.org/assets/l10n/cbk-zam-03ecca8f.json
D prod/wikipedia.org/assets/l10n/cbk-zam-d3866765.json
A prod/wikipedia.org/assets/l10n/cdo-03ecca8f.json
D prod/wikipedia.org/assets/l10n/cdo-d3866765.json
A prod/wikipedia.org/assets/l10n/ce-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ce-d3866765.json
A prod/wikipedia.org/assets/l10n/ceb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ceb-d3866765.json
A prod/wikipedia.org/assets/l10n/ch-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ch-d3866765.json
A prod/wikipedia.org/assets/l10n/chr-03ecca8f.json
D prod/wikipedia.org/assets/l10n/chr-d3866765.json
A prod/wikipedia.org/assets/l10n/chy-03ecca8f.json
D prod/wikipedia.org/assets/l10n/chy-d3866765.json
A prod/wikipedia.org/assets/l10n/ckb-03ecca8f.json
D prod/wikipedia.org/assets/l10n/ckb-d3866765.json
A 

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: return false in onSpecialSearchProfiles hook

[Addshore (Code Review)]

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

Change subject: return false in onSpecialSearchProfiles hook
..

return false in onSpecialSearchProfiles hook

It looks like this hook is meant to set $profiles
to be an empty array, and no other extensions or
hook runs should modify that.

Currently any other onSpecialSearchProfiles hooks
will continue to run and could modify / add things
to this array.

This patch returns false from the hook meaning:
"the hook handler has done all the work necessary,
or replaced normal handling. This will prevent
further handlers from being run, and in some
cases tells the calling function to skip normal
processing."

This should have review from the main authors of
the extension

Change-Id: Id5624ba4ff5caac484377f29e4dc339597148537
---
M AdvancedSearch.hooks.php
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/12/392612/1

diff --git a/AdvancedSearch.hooks.php b/AdvancedSearch.hooks.php
index fe7b202..33dc447 100644
--- a/AdvancedSearch.hooks.php
+++ b/AdvancedSearch.hooks.php
@@ -61,6 +61,7 @@
 */
public static function onSpecialSearchProfiles( array &$profiles ) {
$profiles = [];
+   return false;
}
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5624ba4ff5caac484377f29e4dc339597148537
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki...AdvancedSearch[master]: Remove unused onSpecialSearchPowerBox hook

[Addshore (Code Review)]

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

Change subject: Remove unused onSpecialSearchPowerBox hook
..

Remove unused onSpecialSearchPowerBox hook

Change-Id: I3226c5fead1629726123377a6e3ec66fb4c45fd4
---
M AdvancedSearch.hooks.php
M extension.json
2 files changed, 0 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AdvancedSearch 
refs/changes/13/392613/1

diff --git a/AdvancedSearch.hooks.php b/AdvancedSearch.hooks.php
index fe7b202..406503c 100644
--- a/AdvancedSearch.hooks.php
+++ b/AdvancedSearch.hooks.php
@@ -44,17 +44,6 @@
}
 
/**
-* @see 
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialSearchPowerBox
-*
-* @param string[] &$showSections
-* @param string $term
-* @param string[] $opts
-*/
-   public static function onSpecialSearchPowerBox( &$showSections, $term, 
$opts ) {
-   // $showSections = [];
-   }
-
-   /**
 * @see 
https://www.mediawiki.org/wiki/Manual:Hooks/SpecialSearchProfiles
 *
 * @param array[] &$profiles
diff --git a/extension.json b/extension.json
index 9385257..49b9c97 100644
--- a/extension.json
+++ b/extension.json
@@ -24,9 +24,6 @@
"SpecialPageBeforeExecute": [
"AdvancedSearch\\Hooks::onSpecialPageBeforeExecute"
],
-   "SpecialSearchPowerBox": [
-   "AdvancedSearch\\Hooks::onSpecialSearchPowerBox"
-   ],
"SpecialSearchProfiles": [
"AdvancedSearch\\Hooks::onSpecialSearchProfiles"
]

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3226c5fead1629726123377a6e3ec66fb4c45fd4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/AdvancedSearch
Gerrit-Branch: master
Gerrit-Owner: Addshore 

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

[MediaWiki-commits] [Gerrit] mediawiki...cxserver[master]: Build the lineardoc in Pageloader and pass to segmenter

[Santhosh (Code Review)]

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

Change subject: Build the lineardoc in Pageloader and pass to segmenter
..

Build the lineardoc in Pageloader and pass to segmenter

This will allow us to segmentation, section wrapping, category
adaptation etc in pageloader without requiring to build the doc
more than once.

Change-Id: I49204f07a11e149e2867b35d250d46023eecbcc5
Ref: I94d5250847a6287becf411eacfc1bdd64bfe7ad3
---
M lib/mw/MWPageLoader.js
M lib/segmentation/CXSegmenter.js
M test/segmentation/CXSegmenter.test.js
3 files changed, 30 insertions(+), 35 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/cxserver 
refs/changes/14/392614/1

diff --git a/lib/mw/MWPageLoader.js b/lib/mw/MWPageLoader.js
index 57147fd..e9c5941 100644
--- a/lib/mw/MWPageLoader.js
+++ b/lib/mw/MWPageLoader.js
@@ -1,18 +1,27 @@
 'use strict';
 
 const ApiRequest = require( '../mw/ApiRequest' ),
+   LinearDoc = require( '../lineardoc' ),
CXSegmenter = require( '../segmentation/CXSegmenter' );
 
 class MWPageLoader extends ApiRequest {
getPage( page, revision ) {
return this.fetch( page, revision ).then( ( response ) => {
-   let segmentedDoc = this.segment( response.body );
+   const parsedDoc = this.getParsedDoc( response.body );
+   const segmentedDoc = new CXSegmenter().segment( 
parsedDoc, this.sourceLanguage );
// TODO: segmentedDoc.wrapSections();
return {
content: segmentedDoc.getHtml(),
revision: response.revision
};
} );
+   }
+
+   getParsedDoc( content ) {
+   const parser = new LinearDoc.Parser( new 
LinearDoc.MwContextualizer() );
+   parser.init();
+   parser.write( content );
+   return parser.builder.doc;
}
 
/**
@@ -46,13 +55,6 @@
};
} );
}
-
-   segment( pageContent ) {
-   const segmenter = new CXSegmenter( pageContent, 
this.sourceLanguage );
-   segmenter.segment();
-   return segmenter.getSegmentedDoc();
-   }
-
 }
 
 module.exports = MWPageLoader;
diff --git a/lib/segmentation/CXSegmenter.js b/lib/segmentation/CXSegmenter.js
index a1f793c..0df6630 100644
--- a/lib/segmentation/CXSegmenter.js
+++ b/lib/segmentation/CXSegmenter.js
@@ -1,22 +1,17 @@
 'use strict';
 
-var LinearDoc = require( '../lineardoc' ),
-   segmenters = require( __dirname + '/languages' ).Segmenters;
+var segmenters = require( __dirname + '/languages' ).Segmenters;
 
 class CXSegmenter {
-   constructor( content, language ) {
-   this.parser = new LinearDoc.Parser( new 
LinearDoc.MwContextualizer() );
-   this.parser.init();
-   this.getBoundaries = this.getSegmenter( language );
-   this.content = content;
-   this.originalDoc = null;
-   this.segmentedDoc = null;
-   }
 
-   segment() {
-   this.parser.write( this.content );
-   this.originalDoc = this.parser.builder.doc;
-   this.segmentedDoc = this.originalDoc.segment( 
this.getBoundaries );
+   /**
+* Segment the given parsed linear document object
+* @param {Object} parsedDoc
+* @param {string} language
+* @return {Object}
+*/
+   segment( parsedDoc, language ) {
+   return parsedDoc.segment( this.getSegmenter( language ) );
}
 
/**
@@ -36,15 +31,6 @@
 
return segmenter.getBoundaries;
}
-
-   getSegmentedContent() {
-   return this.segmentedDoc.getHtml();
-   }
-
-   getSegmentedDoc() {
-   return this.segmentedDoc;
-   }
-
 }
 
 module.exports = CXSegmenter;
diff --git a/test/segmentation/CXSegmenter.test.js 
b/test/segmentation/CXSegmenter.test.js
index 8cc612c..3c1dce2 100644
--- a/test/segmentation/CXSegmenter.test.js
+++ b/test/segmentation/CXSegmenter.test.js
@@ -13,12 +13,19 @@
return normalizer.getHtml();
 }
 
+function getParsedDoc( content ) {
+   const parser = new LinearDoc.Parser( new LinearDoc.MwContextualizer() );
+   parser.init();
+   parser.write( content );
+   return parser.builder.doc;
+}
+
 function runTest( test, lang ) {
let testData = fs.readFileSync( __dirname + '/data/' + test.source, 
'utf8' );
-
-   let segmenter = new Segmenter( testData, lang );
-   segmenter.segment();
-   let result = normalize( segmenter.getSegmentedContent() );
+   let parsedDoc = getParsedDoc( testData );
+   let segmenter = new Segmenter();
+   let segmentedLinearDoc = segmenter.segment( parsedDoc, lang );
+   let 

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: [Config] Temporary set consumer_batch_size to 10

[Ppchelko (Code Review)]

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

Change subject: [Config] Temporary set consumer_batch_size to 10
..


[Config] Temporary set consumer_batch_size to 10

Change-Id: I1169174689d2ec15ec351f6f4e8f535bfbfb854d
---
M scap/templates/config.yaml.j2
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/scap/templates/config.yaml.j2 b/scap/templates/config.yaml.j2
index 3dacc09..d13e71d 100644
--- a/scap/templates/config.yaml.j2
+++ b/scap/templates/config.yaml.j2
@@ -36,7 +36,7 @@
   job:
 <%- if env == 'production' %>
 topic: 
'/(?:^mediawiki\.job\.RecordLintJob$)|(?:^mediawiki\.job\.deleteLinks$)|(?:^mediawiki\.job\.MessageIndexRebuildJob$)|(?:^mediawiki\.job\.flaggedrevs_CacheUpdate$)|(?:^mediawiki\.job\.updateBetaFeaturesUserCounts$)/'
-consumer_batch_size: 50 # Temporary for testing
+consumer_batch_size: 10 # Temporary for testing
 <%- else %>
 topic: '/^mediawiki\.job\..*/'
 <%- endif %>

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1169174689d2ec15ec351f6f4e8f535bfbfb854d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/change-propagation/jobqueue-deploy
Gerrit-Branch: master
Gerrit-Owner: Ppchelko 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Ppchelko 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Make context also return the language

[jenkins-bot (Code Review)]

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

Change subject: Make context also return the language
..


Make context also return the language

For motivation, see I2417fe9d2 and conversation in I9316cc0ab.

Change-Id: Iff4b96a9d9f7b1d4cfb202d329dcff8d2241cbaa
---
M repo/tests/phpunit/includes/Actions/HistoryEntityActionTest.php
1 file changed, 3 insertions(+), 3 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/tests/phpunit/includes/Actions/HistoryEntityActionTest.php 
b/repo/tests/phpunit/includes/Actions/HistoryEntityActionTest.php
index 7d946bf..c1d4c3f 100644
--- a/repo/tests/phpunit/includes/Actions/HistoryEntityActionTest.php
+++ b/repo/tests/phpunit/includes/Actions/HistoryEntityActionTest.php
@@ -62,9 +62,6 @@
->disableOriginalConstructor()
->getMock();
 
-   $output->method( 'getLanguage' )
-   ->willReturn( Language::factory( self::DUMMY_LANGUAGE ) 
);
-
return $output;
}
 
@@ -94,6 +91,9 @@
$context->method( 'getOutput' )
->willReturn( $output );
 
+   $context->method( 'getLanguage' )
+   ->willReturn( Language::factory( self::DUMMY_LANGUAGE ) 
);
+
$output->expects( $this->once() )
->method( 'getContext' )
->willReturn( $context );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iff4b96a9d9f7b1d4cfb202d329dcff8d2241cbaa
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek 
Gerrit-Reviewer: Matěj Suchánek 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
Gerrit-Reviewer: WMDE-Fisch 
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]: install_server: Assign VMs the correct tty

[Alexandros Kosiaris (Code Review)]

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

Change subject: install_server: Assign VMs the correct tty
..

install_server: Assign VMs the correct tty

Ganeti VMs do not have 2 serial ports as our hardware fleet does, but
rather just one. Move all VMs from ttyS1-115200 to ttyS0-115200

Bug: T179036
Change-Id: I8480443c7c5c56c636bf489410e976f3338be2d3
---
M modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
M modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
2 files changed, 48 insertions(+), 47 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/17/392617/1

diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
index db0a29e..20dd1e6 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS0-115200
@@ -156,6 +156,24 @@
 fixed-address hassium.eqiad.wmnet;
 }
 
+host install1002 {
+hardware ethernet aa:00:00:3c:d7:80;
+fixed-address install1002.wikimedia.org;
+
+next-server 208.80.153.53; # install2002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "lpxelinux.0";
+}
+
+host install2002 {
+hardware ethernet aa:00:00:6b:d7:3f;
+fixed-address install2002.wikimedia.org;
+
+next-server 208.80.154.22; # install1002 (tftp server)
+option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
+filename "lpxelinux.0";
+}
+
 host kraz {
 hardware ethernet aa:00:00:e9:b4:28;
 fixed-address kraz.wikimedia.org;
@@ -267,9 +285,19 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
+host netmon1003 {
+hardware ethernet aa:00:00:79:17:b5;
+fixed-address netmon1003.wikimedia.org;
+}
+
 host nitrogen {
  hardware ethernet aa:00:00:e8:68:1f;
  fixed-address nitrogen.eqiad.wmnet;
+}
+
+host oresrdb2001 {
+hardware ethernet aa:00:00:3b:a3:0e;
+fixed-address oresrdb2001.codfw.wmnet;
 }
 
 host planet1001 {
@@ -393,3 +421,23 @@
 fixed-address tureis.codfw.wmnet;
 }
 
+host ununpentium {
+hardware ethernet aa:00:00:66:fb:d9;
+fixed-address ununpentium.wikimedia.org;
+}
+
+host webperf1001 {
+hardware ethernet aa:00:00:5e:f4:43;
+fixed-address webperf1001.eqiad.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+host webperf2001 {
+hardware ethernet aa:00:00:02:8b:11;
+fixed-address webperf2001.codfw.wmnet;
+option pxelinux.pathprefix "stretch-installer/";
+filename "stretch-installer/debian-installer/amd64/pxelinux.0";
+}
+
+
diff --git a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200 
b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
index 76f6a5e..f336af5 100644
--- a/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install_server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2503,24 +2503,6 @@
 fixed-address hydrogen.wikimedia.org;
 }
 
-host install1002 {
-hardware ethernet aa:00:00:3c:d7:80;
-fixed-address install1002.wikimedia.org;
-
-next-server 208.80.153.53; # install2002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
-host install2002 {
-hardware ethernet aa:00:00:6b:d7:3f;
-fixed-address install2002.wikimedia.org;
-
-next-server 208.80.154.22; # install1002 (tftp server)
-option pxelinux.pathprefix 
"http://apt.wikimedia.org/tftpboot/jessie-installer/;;
-filename "lpxelinux.0";
-}
-
 host iridium {
 hardware ethernet f0:1f:af:e8:c5:27;
 fixed-address iridium.eqiad.wmnet;
@@ -5766,11 +5748,6 @@
 filename "stretch-installer/debian-installer/amd64/pxelinux.0";
 }
 
-host netmon1003 {
-hardware ethernet aa:00:00:79:17:b5;
-fixed-address netmon1003.wikimedia.org;
-}
-
 host netmon2001 {
 hardware ethernet 30:e1:71:70:2b:94;
 fixed-address netmon2001.wikimedia.org;
@@ -5907,11 +5884,6 @@
 host oresrdb1002{
 hardware ethernet C8:1F:66:BF:81:12;
 fixed-address oresrdb1002.eqiad.wmnet;
-}
-
-host oresrdb2001 {
-hardware ethernet aa:00:00:3b:a3:0e;
-fixed-address oresrdb2001.codfw.wmnet;
 }
 
 host oresrdb2002 {
@@ -6398,11 +6370,6 @@
 fixed-address tungsten.eqiad.wmnet;
 }
 
-host ununpentium {
-hardware ethernet aa:00:00:66:fb:d9;
-fixed-address ununpentium.wikimedia.org;
-}
-
 host uranium {
 hardware ethernet 84:2b:2b:fb:a6:67;
 fixed-address uranium.wikimedia.org;
@@ -6413,20 +6380,6 @@
 host wasat {
 hardware ethernet 14:02:ec:3f:47:8c;
 fixed-address wasat.codfw.wmnet;
-}
-
-host 

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Minor formatting fixes

[Lucas Werkmeister (WMDE) (Code Review)]

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

Change subject: Minor formatting fixes
..

Minor formatting fixes

Extracted from change I2628eb46de, patch set 3.

Change-Id: Id6944d94dc9e9426765934a5ed3c7d108fb31020
---
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
2 files changed, 3 insertions(+), 6 deletions(-)


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

diff --git a/tests/phpunit/DelegatingConstraintCheckerTest.php 
b/tests/phpunit/DelegatingConstraintCheckerTest.php
index 21e86a4..6c48748 100644
--- a/tests/phpunit/DelegatingConstraintCheckerTest.php
+++ b/tests/phpunit/DelegatingConstraintCheckerTest.php
@@ -102,7 +102,7 @@
$this->constraintChecker = $factory->getConstraintChecker();
 
// specify database tables used by this test
-   $this->tablesUsed[ ] = 'wbqc_constraints';
+   $this->tablesUsed[] = 'wbqc_constraints';
}
 
/**
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php 
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index 90f1aae..52930fb 100644
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -68,7 +68,7 @@
 
protected function setUp() {
parent::setUp();
-   $this->tablesUsed[ ] = 'wbqc_constraints';
+   $this->tablesUsed[] = 'wbqc_constraints';
}
 
protected function newSpecialPage() {
@@ -143,10 +143,7 @@
}
 
// Truncate table
-   $this->db->delete(
-   'wbqc_constraints',
-   '*'
-   );
+   $this->db->delete( 'wbqc_constraints', '*' );
 
$this->db->insert(
'wbqc_constraints',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6944d94dc9e9426765934a5ed3c7d108fb31020
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...deploy[master]: Update cxserver to 4301987

[jenkins-bot (Code Review)]

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

Change subject: Update cxserver to 4301987
..


Update cxserver to 4301987

List of changes:
3ec17e2 Adaptation tests: Consistently assert href and title for all links
f9d18b7 cxserver v2 apis
4301987 Sync with service-template-node v0.5.3
xxx Update node module dependencies

Change-Id: I3eaecacdbe0941b5b2aacfdc6720304692587576
---
M node_modules/bluebird/package.json
M node_modules/body-parser/package.json
M node_modules/bunyan/package.json
M node_modules/cassandra-uuid/package.json
M node_modules/compression/package.json
M node_modules/core-js/package.json
M node_modules/domino/package.json
M node_modules/express/package.json
M node_modules/html-entities/lib/html4-entities.js
M node_modules/html-entities/lib/html5-entities.js
M node_modules/html-entities/lib/xml-entities.js
M node_modules/html-entities/package.json
A node_modules/http-shutdown/.npmignore
A node_modules/http-shutdown/.travis.yml
A node_modules/http-shutdown/LICENSE
A node_modules/http-shutdown/index.js
A node_modules/http-shutdown/package.json
A node_modules/http-shutdown/test.js
M node_modules/js-yaml/package.json
M node_modules/kad/package.json
M node_modules/language-data/package.json
M node_modules/mediawiki-title/.jscs.json
M node_modules/mediawiki-title/.jshintignore
D node_modules/mediawiki-title/.npmignore
M node_modules/mediawiki-title/.travis.yml
M node_modules/mediawiki-title/lib/index.js
A node_modules/mediawiki-title/lib/mediawiki.Title.phpCharToUpper.js
M node_modules/mediawiki-title/package.json
M node_modules/mediawiki-title/test/index.js
M node_modules/moment/min/moment-with-locales.js
M node_modules/moment/min/moment-with-locales.min.js
M node_modules/moment/min/moment.min.js
M node_modules/moment/moment.js
M node_modules/moment/package.json
M node_modules/moment/src/lib/locale/locales.js
M node_modules/moment/src/lib/moment/get-set.js
M node_modules/moment/src/moment.js
M node_modules/nan/nan.h
M node_modules/nan/nan_json.h
M node_modules/nan/nan_maybe_43_inl.h
M node_modules/nan/nan_maybe_pre_43_inl.h
M node_modules/nan/package.json
M node_modules/preq/.travis.yml
M node_modules/preq/index.js
M node_modules/preq/package.json
M node_modules/service-runner/lib/heapwatch.js
M node_modules/service-runner/lib/logger.js
M node_modules/service-runner/lib/statsd.js
M node_modules/service-runner/lib/worker.js
M node_modules/service-runner/package.json
M node_modules/service-runner/service-runner.js
A node_modules/swagger-router/.eslintrc.yml
M node_modules/swagger-router/.jshintrc
M node_modules/swagger-router/.travis.yml
M node_modules/swagger-router/lib/node.js
M node_modules/swagger-router/lib/reqTemplate.js
M node_modules/swagger-router/lib/router.js
M node_modules/swagger-router/lib/uri.js
M node_modules/swagger-router/lib/utils.js
M node_modules/swagger-router/package.json
A node_modules/swagger-router/test/features/node.js
M node_modules/swagger-router/test/features/reqTemplate.js
M node_modules/swagger-router/test/features/router.js
M node_modules/swagger-router/test/index.js
M node_modules/swagger-ui/package.json
M node_modules/template-expression-compiler/index.js
M node_modules/template-expression-compiler/package.json
M node_modules/template-expression-compiler/test/index.js
M src
69 files changed, 1,895 insertions(+), 1,036 deletions(-)

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




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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3eaecacdbe0941b5b2aacfdc6720304692587576
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/services/cxserver/deploy
Gerrit-Branch: master
Gerrit-Owner: KartikMistry 
Gerrit-Reviewer: KartikMistry 
Gerrit-Reviewer: Santhosh 
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]: DifferenceEngine: Improve cache invalidation

[jenkins-bot (Code Review)]

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

Change subject: DifferenceEngine: Improve cache invalidation
..


DifferenceEngine: Improve cache invalidation

Invalidate the diff cache if the engine producing the diff changes, or
if a configuration setting that controls the diff output changes. This
is probably what most users expect, that changing the configuration will
result in a change for diffs that may have already been viewed.

For wikidiff2 specifically, a change in version or
$wgWikiDiff2MovedParagraphDetectionCutoff will invalidate the cache.

Refactor engine detection and sanity-checking into a private getEngine()
function.

As part of this getDiffBodyCacheKey() was deprecated, and subclasses
should implement getDiffBodyCacheKeyParams() instead. Drop the
deprecated and unused MW_DIFF_VERSION constant while we're at it, and
bump DIFF_VERSION since we're already changing the cache key format.

Bug: T180043
Change-Id: I4e386ca05bd2a2fb54208d760c131eb42e3a72ab
---
M RELEASE-NOTES-1.31
M includes/diff/DifferenceEngine.php
2 files changed, 82 insertions(+), 22 deletions(-)

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



diff --git a/RELEASE-NOTES-1.31 b/RELEASE-NOTES-1.31
index 8caab05..f1fd9d3 100644
--- a/RELEASE-NOTES-1.31
+++ b/RELEASE-NOTES-1.31
@@ -98,6 +98,10 @@
 * Revision::setUserIdAndName() was deprecated.
 * Access to TitleValue class properties was deprecated, the relevant getters
   should be used instead.
+* DifferenceEngine::getDiffBodyCacheKey() is deprecated. Subclasses should
+  override DifferenceEngine::getDiffBodyCacheKeyParams() instead.
+* The deprecated MW_DIFF_VERSION constant was removed.
+  DifferenceEngine::MW_DIFF_VERSION should be used instead.
 
 == Compatibility ==
 MediaWiki 1.31 requires PHP 5.5.9 or later. There is experimental support for
diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index 813ee08..fb12c1e 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -23,9 +23,6 @@
 use MediaWiki\MediaWikiServices;
 use MediaWiki\Shell\Shell;
 
-/** @deprecated use class constant instead */
-define( 'MW_DIFF_VERSION', '1.11a' );
-
 /**
  * @todo document
  * @ingroup DifferenceEngine
@@ -37,7 +34,7 @@
 * fixes important bugs or such to force cached diff views to
 * clear.
 */
-   const DIFF_VERSION = MW_DIFF_VERSION;
+   const DIFF_VERSION = '1.12';
 
/** @var int */
public $mOldid;
@@ -753,7 +750,15 @@
$key = false;
$cache = ObjectCache::getMainWANInstance();
if ( $this->mOldid && $this->mNewid ) {
+   // Check if subclass is still using the old way
+   // for backwards-compatibility
$key = $this->getDiffBodyCacheKey();
+   if ( $key === null ) {
+   $key = call_user_func_array(
+   [ $cache, 'makeKey' ],
+   $this->getDiffBodyCacheKeyParams()
+   );
+   }
 
// Try cache
if ( !$this->mRefreshCache ) {
@@ -799,18 +804,49 @@
/**
 * Returns the cache key for diff body text or content.
 *
+* @deprecated since 1.31, use getDiffBodyCacheKeyParams() instead
 * @since 1.23
 *
 * @throws MWException
-* @return string
+* @return string|null
 */
protected function getDiffBodyCacheKey() {
+   return null;
+   }
+
+   /**
+* Get the cache key parameters
+*
+* Subclasses can replace the first element in the array to something
+* more specific to the type of diff (e.g. "inline-diff"), or append
+* if the cache should vary on more things. Overriding entirely should
+* be avoided.
+*
+* @since 1.31
+*
+* @return array
+* @throws MWException
+*/
+   protected function getDiffBodyCacheKeyParams() {
if ( !$this->mOldid || !$this->mNewid ) {
throw new MWException( 'mOldid and mNewid must be set 
to get diff cache key.' );
}
 
-   return wfMemcKey( 'diff', 'version', self::DIFF_VERSION,
-   'oldid', $this->mOldid, 'newid', $this->mNewid );
+   $engine = $this->getEngine();
+   $params = [
+   'diff',
+   $engine,
+   self::DIFF_VERSION,
+   "old-{$this->mOldid}",
+   "rev-{$this->mNewid}"
+   ];
+
+   if ( $engine === 'wikidiff2' ) {
+   

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Add localised tooltips for moved paragraph indicators

[jenkins-bot (Code Review)]

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

Change subject: Add localised tooltips for moved paragraph indicators
..


Add localised tooltips for moved paragraph indicators

Bug: T166882
Change-Id: I71600acc19319f7b5781b42dc88cd5e8c65c29a0
---
M includes/diff/DifferenceEngine.php
M languages/i18n/en.json
M languages/i18n/qqq.json
3 files changed, 48 insertions(+), 3 deletions(-)

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



diff --git a/includes/diff/DifferenceEngine.php 
b/includes/diff/DifferenceEngine.php
index fb12c1e..03f7212 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -765,7 +765,7 @@
$difftext = $cache->get( $key );
if ( $difftext ) {
wfIncrStats( 'diff_cache.hit' );
-   $difftext = $this->localiseLineNumbers( 
$difftext );
+   $difftext = $this->localiseDiff( 
$difftext );
$difftext .= "\n\n";
 
return $difftext;
@@ -793,9 +793,9 @@
} else {
wfIncrStats( 'diff_cache.uncacheable' );
}
-   // Replace line numbers with the text in the user's language
+   // localise line numbers and title attribute text
if ( $difftext !== false ) {
-   $difftext = $this->localiseLineNumbers( $difftext );
+   $difftext = $this->localiseDiff( $difftext );
}
 
return $difftext;
@@ -1081,6 +1081,22 @@
}
 
/**
+* Localise diff output
+*
+* @param string $text
+* @return string
+*/
+   private function localiseDiff( $text ) {
+   $text = $this->localiseLineNumbers( $text );
+   if ( $this->getEngine() === 'wikidiff2' &&
+   version_compare( phpversion( 'wikidiff2' ), '1.5.1', 
'>=' )
+   ) {
+   $text = $this->addLocalisedTitleTooltips( $text );
+   }
+   return $text;
+   }
+
+   /**
 * Replace line numbers with the text in the user's language
 *
 * @param string $text
@@ -1104,6 +1120,31 @@
}
 
/**
+* Add title attributes for tooltips on moved paragraph indicators
+*
+* @param string $text
+* @return string
+*/
+   private function addLocalisedTitleTooltips( $text ) {
+   return preg_replace_callback(
+   '/class="mw-diff-movedpara-(left|old)"/',
+   [ $this, 'addLocalisedTitleTooltipsCb' ],
+   $text
+   );
+   }
+
+   /**
+* @param array $matches
+* @return string
+*/
+   private function addLocalisedTitleTooltipsCb( array $matches ) {
+   $key = $matches[1] === 'right' ?
+   'diff-paragraph-moved-toold' :
+   'diff-paragraph-moved-tonew';
+   return $matches[0] . ' title="' . $this->msg( $key )->escaped() 
. '"';
+   }
+
+   /**
 * If there are revisions between the ones being compared, return a 
note saying so.
 *
 * @return string
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 021a115..52ac447 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -943,6 +943,8 @@
"diff-multi-sameuser": "({{PLURAL:$1|One intermediate revision|$1 
intermediate revisions}} by the same user not shown)",
"diff-multi-otherusers": "({{PLURAL:$1|One intermediate revision|$1 
intermediate revisions}} by {{PLURAL:$2|one other user|$2 users}} not shown)",
"diff-multi-manyusers": "({{PLURAL:$1|One intermediate revision|$1 
intermediate revisions}} by more than $2 {{PLURAL:$2|user|users}} not shown)",
+   "diff-paragraph-moved-tonew": "Paragraph was moved. Click to jump to 
new location.",
+   "diff-paragraph-moved-toold": "Paragraph was moved. Click to jump to 
old location.",
"difference-missing-revision": "{{PLURAL:$2|One revision|$2 revisions}} 
of this difference ($1) {{PLURAL:$2|was|were}} not found.\n\nThis is usually 
caused by following an outdated diff link to a page that has been 
deleted.\nDetails can be found in the 
[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE deletion log].",
"search-summary": "",
"searchresults": "Search results",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index a1e65c0..e5d4984 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1137,6 +1137,8 @@
"diff-multi-sameuser": "This message 

[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Implement DifferenceEngine::getDiffBodyCacheKeyParams()

[jenkins-bot (Code Review)]

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

Change subject: Implement DifferenceEngine::getDiffBodyCacheKeyParams()
..


Implement DifferenceEngine::getDiffBodyCacheKeyParams()

This will allow for better cache invalidation when the underlying
implementation changes.

Depends-On: I4e386ca05bd2a2fb54208d760c131eb42e3a72ab
Change-Id: I68fbc31e56a2d1e77e9a377f295eb2135360d3ba
---
M extension.json
M includes/diff/InlineDifferenceEngine.php
2 files changed, 6 insertions(+), 21 deletions(-)

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



diff --git a/extension.json b/extension.json
index 819ebd1..ec31a96 100644
--- a/extension.json
+++ b/extension.json
@@ -18,7 +18,7 @@
"license-name": "GPL-2.0+",
"type": "other",
"requires": {
-   "MediaWiki": ">= 1.29.0"
+   "MediaWiki": ">= 1.31.0"
},
"callback": "MobileFrontendHooks::onRegistration",
"ConfigRegistry": {
diff --git a/includes/diff/InlineDifferenceEngine.php 
b/includes/diff/InlineDifferenceEngine.php
index 76e9ff4..43ab04f 100644
--- a/includes/diff/InlineDifferenceEngine.php
+++ b/includes/diff/InlineDifferenceEngine.php
@@ -178,28 +178,13 @@
}
 
/**
-* Reimplements getDiffBodyCacheKey from DifferenceEngine
-* Returns the cache key for diff body text or content.
-*
-* @throws Exception when no mOldid and mNewid is set
-* @see DifferenceEngine::getDiffBodyCacheKey
-* @return string
+* @inheritDoc
 */
-   protected function getDiffBodyCacheKey() {
-   global $wgMemc;
-   if ( !$this->mOldid || !$this->mNewid ) {
-   throw new Exception( 'mOldid and mNewid must be set to 
get diff cache key.' );
-   }
+   protected function getDiffBodyCacheKeyParams() {
+   $params = parent::getDiffBodyCacheKeyParams();
+   $params[0] = 'inline-diff';
 
-   return $wgMemc->makeKey(
-   'diff',
-   'inline',
-   self::DIFF_VERSION,
-   'oldid',
-   $this->mOldid,
-   'newid',
-   $this->mNewid
-   );
+   return $params;
}
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68fbc31e56a2d1e77e9a377f295eb2135360d3ba
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Pmiazga 
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]: Fix flash of unstyled content (FOUC) on sitelinkgroupview

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392628 )

Change subject: Fix flash of unstyled content (FOUC) on sitelinkgroupview
..

Fix flash of unstyled content (FOUC) on sitelinkgroupview

To see this issue, go to an item with multiple sitelinks (e.g.
https://www.wikidata.org/wiki/Q9410185 ), and watch the page loading.
You will see the word "[Collapse]" appear for a second before it is
replaced with an arrow.

This is because the .css file that replaces the word with the arrow
is loaded to late, via JS instead of in the head.

This patch moves the relevant CSS to a .css file that is loaded in
the head. I argue this is a good place for this CSS because the
relevant "mw-collapsible" is set on this specific
"sitelinkgroupview" template.

Bug: T158059
Change-Id: I7ab015ae1e2bc6a7401c37620c7eebea23b055a3
---
M 
view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
M 
view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
2 files changed, 32 insertions(+), 32 deletions(-)


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

diff --git 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
index a73cb9d..b7484ae 100644
--- 
a/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
+++ 
b/view/resources/jquery/wikibase/themes/default/jquery.wikibase.sitelinkgroupview.css
@@ -47,3 +47,35 @@
position: static;
width: auto;
 }
+
+.wikibase-toolbar-item .mw-collapsible-toggle {
+   background-position: right;
+   background-repeat: no-repeat;
+   height: 24px;
+   overflow: hidden;
+   text-indent: 24px;
+   width: 24px;
+}
+
+.wikibase-toolbar-item .mw-collapsible-toggle,
+.wikibase-toolbar-item .mw-collapsible-toggle-expanded {
+   /* SVG support using a transparent gradient to guarantee cross-browser
+* compatibility (browsers able to understand gradient syntax support 
also SVG).
+* 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
+   background-image: url( 
../toolbar/themes/default/images/icons/oojs-ui/collapse.png );
+   /* @embed */
+   background-image: -webkit-linear-gradient( transparent, transparent ), 
url( ../toolbar/themes/default/images/icons/oojs-ui/collapse.svg );
+   /* @embed */
+   background-image: linear-gradient( transparent, transparent ), url( 
../toolbar/themes/default/images/icons/oojs-ui/collapse.svg );
+}
+
+.wikibase-toolbar-item .mw-collapsible-toggle-collapsed {
+   /* SVG support using a transparent gradient to guarantee cross-browser
+* compatibility (browsers able to understand gradient syntax support 
also SVG).
+* 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
+   background-image: url( 
../toolbar/themes/default/images/icons/oojs-ui/expand.png );
+   /* @embed */
+   background-image: -webkit-linear-gradient( transparent, transparent ), 
url( ../toolbar/themes/default/images/icons/oojs-ui/expand.svg );
+   /* @embed */
+   background-image: linear-gradient( transparent, transparent ), url( 
../toolbar/themes/default/images/icons/oojs-ui/expand.svg );
+}
diff --git 
a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
 
b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
index b5df796..82ae747 100644
--- 
a/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
+++ 
b/view/resources/jquery/wikibase/toolbar/themes/default/jquery.wikibase.toolbaritem.css
@@ -6,35 +6,3 @@
 .wikibase-toolbarlabel.ui-state-disabled {
color: #72777d;
 }
-
-.wikibase-toolbar-item .mw-collapsible-toggle {
-   background-position: right;
-   background-repeat: no-repeat;
-   height: 24px;
-   overflow: hidden;
-   text-indent: 24px;
-   width: 24px;
-}
-
-.wikibase-toolbar-item .mw-collapsible-toggle,
-.wikibase-toolbar-item .mw-collapsible-toggle-expanded {
-   /* SVG support using a transparent gradient to guarantee cross-browser
-* compatibility (browsers able to understand gradient syntax support 
also SVG).
-* 
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-   background-image: url( images/icons/oojs-ui/collapse.png );
-   /* @embed */
-   background-image: -webkit-linear-gradient( transparent, transparent ), 
url( images/icons/oojs-ui/collapse.svg );
-   /* @embed */
-   background-image: linear-gradient( transparent, transparent ), url( 
images/icons/oojs-ui/collapse.svg );
-}
-
-.wikibase-toolbar-item .mw-collapsible-toggle-collapsed {
-   /* SVG 

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Implement DifferenceEngine::getDiffBodyCacheKeyParams()

[jenkins-bot (Code Review)]

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

Change subject: Implement DifferenceEngine::getDiffBodyCacheKeyParams()
..


Implement DifferenceEngine::getDiffBodyCacheKeyParams()

This will allow for better cache invalidation when the underlying
implementation changes.

Depends-On: I4e386ca05bd2a2fb54208d760c131eb42e3a72ab
Change-Id: I7edad761c780a408f50413a11ff0d10b5a5cbe84
---
M repo/includes/Diff/EntityContentDiffView.php
1 file changed, 7 insertions(+), 11 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/repo/includes/Diff/EntityContentDiffView.php 
b/repo/includes/Diff/EntityContentDiffView.php
index a8bd1ba..2e5a774 100644
--- a/repo/includes/Diff/EntityContentDiffView.php
+++ b/repo/includes/Diff/EntityContentDiffView.php
@@ -158,18 +158,14 @@
}
 
/**
-* Returns the cache key for diff body text or content.
-*
-* @return string
+* @inheritDoc
 */
-   protected function getDiffBodyCacheKey() {
-   return wfMemcKey(
-   'diff',
-   'version', self::DIFF_VERSION,
-   'oldid', $this->getOldid(),
-   'newid', $this->getNewid(),
-   'lang', $this->getLanguage()->getCode()
-   );
+   protected function getDiffBodyCacheKeyParams() {
+   $parent = parent::getDiffBodyCacheKeyParams();
+   $code = $this->getLanguage()->getCode();
+   $parent[] = "lang-{$code}";
+
+   return $parent;
}
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7edad761c780a408f50413a11ff0d10b5a5cbe84
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Legoktm 
Gerrit-Reviewer: Legoktm 
Gerrit-Reviewer: Thiemo Mättig (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] mediawiki...WikibaseQualityConstraints[master]: Minor formatting fixes

[jenkins-bot (Code Review)]

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

Change subject: Minor formatting fixes
..


Minor formatting fixes

Extracted from change I2628eb46de, patch set 3.

Change-Id: Id6944d94dc9e9426765934a5ed3c7d108fb31020
---
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
2 files changed, 3 insertions(+), 6 deletions(-)

Approvals:
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, approved



diff --git a/tests/phpunit/DelegatingConstraintCheckerTest.php 
b/tests/phpunit/DelegatingConstraintCheckerTest.php
index 21e86a4..6c48748 100644
--- a/tests/phpunit/DelegatingConstraintCheckerTest.php
+++ b/tests/phpunit/DelegatingConstraintCheckerTest.php
@@ -102,7 +102,7 @@
$this->constraintChecker = $factory->getConstraintChecker();
 
// specify database tables used by this test
-   $this->tablesUsed[ ] = 'wbqc_constraints';
+   $this->tablesUsed[] = 'wbqc_constraints';
}
 
/**
diff --git a/tests/phpunit/Specials/SpecialConstraintReportTest.php 
b/tests/phpunit/Specials/SpecialConstraintReportTest.php
index 90f1aae..52930fb 100644
--- a/tests/phpunit/Specials/SpecialConstraintReportTest.php
+++ b/tests/phpunit/Specials/SpecialConstraintReportTest.php
@@ -68,7 +68,7 @@
 
protected function setUp() {
parent::setUp();
-   $this->tablesUsed[ ] = 'wbqc_constraints';
+   $this->tablesUsed[] = 'wbqc_constraints';
}
 
protected function newSpecialPage() {
@@ -143,10 +143,7 @@
}
 
// Truncate table
-   $this->db->delete(
-   'wbqc_constraints',
-   '*'
-   );
+   $this->db->delete( 'wbqc_constraints', '*' );
 
$this->db->insert(
'wbqc_constraints',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id6944d94dc9e9426765934a5ed3c7d108fb31020
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 
Gerrit-Reviewer: Thiemo Mättig (WMDE) 
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]: Metric alarms: fix dashboard link validation

[Volans (Code Review)]

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

Change subject: Metric alarms: fix dashboard link validation
..


Metric alarms: fix dashboard link validation

* For multiple links the string starts with a single quote. Loosen the
  validation for now, this will be come an array in a later patch.

Bug: T170353
Change-Id: I100eb8637ca51ef32f2fccb2f7a833a514c77b83
---
M modules/monitoring/manifests/check_prometheus.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
3 files changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/modules/monitoring/manifests/check_prometheus.pp 
b/modules/monitoring/manifests/check_prometheus.pp
index 9625e40..8307f99 100644
--- a/modules/monitoring/manifests/check_prometheus.pp
+++ b/modules/monitoring/manifests/check_prometheus.pp
@@ -90,7 +90,7 @@
 {
 validate_re($method, '^(gt|ge|lt|le|eq|ne)$')
 validate_bool($nan_ok)
-validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org')
+validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org')
 
 $command = $nan_ok ? {
 true=> 'check_prometheus_nan_ok',
diff --git a/modules/monitoring/manifests/graphite_anomaly.pp 
b/modules/monitoring/manifests/graphite_anomaly.pp
index 1d785c2..ef25521 100644
--- a/modules/monitoring/manifests/graphite_anomaly.pp
+++ b/modules/monitoring/manifests/graphite_anomaly.pp
@@ -68,7 +68,7 @@
 $contact_group   = 'admins',
 )
 {
-validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org')
+validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org')
 
 if $over == true {
 $modifier = '--over'
diff --git a/modules/monitoring/manifests/graphite_threshold.pp 
b/modules/monitoring/manifests/graphite_threshold.pp
index b9839c9..4a51e30 100644
--- a/modules/monitoring/manifests/graphite_threshold.pp
+++ b/modules/monitoring/manifests/graphite_threshold.pp
@@ -75,7 +75,7 @@
 $contact_group   = 'admins',
 )
 {
-validate_re($dashboard_link, '^https:\/\/grafana\.wikimedia\.org')
+validate_re($dashboard_link, 'https:\/\/grafana\.wikimedia\.org')
 
 # checkcommands.cfg's check_graphite_threshold command has
 # many positional arguments that

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I100eb8637ca51ef32f2fccb2f7a833a514c77b83
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Filippo Giunchedi 
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] integration/config[master]: Pass env to docker run [2]

[Hashar (Code Review)]

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

Change subject: Pass env to docker run [2]
..

Pass env to docker run [2]

It is tedious and error prone to have maintain a whitelist of
environment variables. Instead just pass the whole environment to docker
using bash process substitution <(/usr/bin/env) which creates a file.

Remove the macro docker-zuul-env entirely.

Previously applied and reverted since Zuul injected variables later
caused bash to error out with unbound variables.

Update:
apps-android-wikipedia-tox-docker
composer-package-php70-docker
composer-php70-docker
cumin-tox-docker
fundraising-tools-tox-docker
integration-config-tox-docker
labs-tox-docker
lintr-docker
lintr-docker-non-voting
mediawiki-core-php70-phan-docker
mediawiki-core-phpcs-docker
mwext-php70-phan-docker
mwgate-npm-node-6-docker
mwgate-tox-docker
npm-node-6-docker
operations-puppet-tests-docker
operations-puppet-wmf-style-guide
pywikibot-core-tox-doc-docker
pywikibot-core-tox-nose34-docker
pywikibot-core-tox-nose-docker
search-mjolnir-tox-docker
tox-docker

Bug: T177684
Depends-On: If9b743fb187cb29e16939a861a8c323a84efed71
Change-Id: Ic596ea957df2a6a8af01b1cbe2b6b27a3551fef2
---
M jjb/castor.yaml
M jjb/job-templates.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki-extensions.yaml
M jjb/mediawiki.yaml
M jjb/operations-puppet.yaml
M jjb/php.yaml
M jjb/python-jobs.yaml
M jjb/r-jobs.yaml
9 files changed, 7 insertions(+), 53 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/33/392633/1

diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index 541cc47..b6a6c27 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
  - shell: |
  echo "Clearing $WORKSPACE/cache"
  exec docker run --rm \
- --env-file .env \
+ --env-file <(/usr/bin/env) \
  --volume "$(pwd)"/cache:/cache \
   'wmfreleng/castor:v2017.10.30.21.03' clear || :
  # nothing else can be executed due to exec
@@ -89,9 +89,8 @@
 builders:
 - docker-cache-dir
 - shell: |
-/usr/bin/env > .env
 exec docker run --rm \
---env-file .env \
+--env-file <(/usr/bin/env) \
 --volume "${WORKSPACE}/cache":/cache \
 wmfreleng/castor:v2017.10.30.21.03 \
 load
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index d4f7c5b..a9c885c 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -170,7 +170,6 @@
 triggers:
  - zuul
 builders:
- - docker-zuul-env
  - docker-src-dir
  - docker-log-dir
  - docker-cache-dir
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 876dac4..01b5387 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -1,38 +1,3 @@
-# Build a .env file with ZUUL environment
-# variables for use with docker
-- builder:
-name: docker-zuul-env
-builders:
- - shell: |
-#!/bin/bash -e
-
-set -x
-
-rm -rf .env
-
-cat < .env
-ZUUL_URL=$ZUUL_URL
-ZUUL_PROJECT=$ZUUL_PROJECT
-ZUUL_COMMIT=$ZUUL_COMMIT
-ZUUL_REF=$ZUUL_REF
-ZUUL_BRANCH=$ZUUL_BRANCH
-ZUUL_CHANGES=$ZUUL_CHANGES
-ZUUL_CHANGE_IDS=$ZUUL_CHANGE_IDS
-ZUUL_CHANGE=$ZUUL_CHANGE
-ZUUL_PATCHSET=$ZUUL_PATCHSET
-ZUUL_VOTING=$ZUUL_VOTING
-ZUUL_PIPELINE=$ZUUL_PIPELINE
-ZUUL_UUID=$ZUUL_UUID
-EXT_NAME=$EXT_NAME
-SKIN_NAME=$SKIN_NAME
-EXT_DEPENDENCIES=$EXT_DEPENDENCIES
-SKIN_DEPENDENCIES=$SKIN_DEPENDENCIES
-JENKINS_URL=$JENKINS_URL
-ZUUL
-
-# Finally, output for debugging help
-cat .env
-
 # Create a log directory that will be
 # mounted into a container with --volume
 - builder:
@@ -68,7 +33,7 @@
 set -x
 exec docker run \
 --rm \
---env-file .env \
+--env-file <(/usr/bin/env) \
 --volume "$(pwd)"/log:{logdir} \
 {image}
 # nothing else can be executed due to exec
@@ -88,7 +53,7 @@
 set -x
 exec docker run \
 --rm \
---env-file .env \
+--env-file <(/usr/bin/env) \
 --volume "$(pwd)"/log:{logdir} \
 --volume "$(pwd)"/cache:/cache \
 {image}{obj:run_args|}
@@ -119,7 +84,7 @@
 set -x
 exec docker run \
 --rm \
---env-file .env \
+--env-file <(/usr/bin/env) \
 --volume "$(pwd)"/src:/src \
 --volume "$(pwd)"/cache:/cache \
 --volume /srv/git:/srv/git \
@@ -137,7 +102,7 @@
 set -x
 exec docker run 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: lvs400[567]: turn on BGP (still MED 100, all secondary)

[BBlack (Code Review)]

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

Change subject: lvs400[567]: turn on BGP (still MED 100, all secondary)
..

lvs400[567]: turn on BGP (still MED 100, all secondary)

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/41/392641/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index 3cfecb8..a774263 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -192,10 +192,6 @@
   __regex: !ruby/regexp /^lvs10(0[7-9]|1[0-2])\.eqiad\.wmnet$/
   profile::pybal::bgp: no
 
-lvs_temp_bgp_disable_lvs4:
-  __regex: !ruby/regexp /^lvs400[567]\.eqiad\.wmnet$/
-  profile::pybal::bgp: no
-
 maps_test:
   __regex: !ruby/regexp /^maps-test200[1-4]\.codfw\.wmnet$/
   cassandra::target_version: '2.2'

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...jobqueue-deploy[master]: Update change-propagation to 1a8de23

[Ppchelko (Code Review)]

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

Change subject: Update change-propagation to 1a8de23
..

Update change-propagation to 1a8de23

List of changes:
xxx Update node module dependencies

Change-Id: Iebe390c445a4079af70d08ce53ea5b5c12dcc286
---
A node_modules/.bin/node-pre-gyp
A node_modules/.bin/nopt
A node_modules/.bin/rc
A node_modules/abbrev/LICENSE
A node_modules/abbrev/abbrev.js
A node_modules/abbrev/package.json
A node_modules/aproba/LICENSE
A node_modules/aproba/index.js
A node_modules/aproba/package.json
A node_modules/are-we-there-yet/CHANGES.md~
A node_modules/are-we-there-yet/LICENSE
A node_modules/are-we-there-yet/index.js
A node_modules/are-we-there-yet/package.json
A node_modules/are-we-there-yet/tracker-base.js
A node_modules/are-we-there-yet/tracker-group.js
A node_modules/are-we-there-yet/tracker-stream.js
A node_modules/are-we-there-yet/tracker.js
M node_modules/assert-plus/assert.js
M node_modules/assert-plus/package.json
M node_modules/aws-sign2/index.js
M node_modules/aws-sign2/package.json
M node_modules/aws4/package.json
A node_modules/block-stream/LICENSE
A node_modules/block-stream/block-stream.js
A node_modules/block-stream/package.json
M node_modules/bluebird/js/browser/bluebird.core.js
M node_modules/bluebird/js/browser/bluebird.core.min.js
M node_modules/bluebird/js/browser/bluebird.js
M node_modules/bluebird/js/browser/bluebird.min.js
M node_modules/bluebird/js/release/debuggability.js
M node_modules/bluebird/js/release/promise.js
M node_modules/bluebird/js/release/util.js
M node_modules/bluebird/package.json
M node_modules/boom/LICENSE
M node_modules/boom/lib/index.js
M node_modules/boom/package.json
A node_modules/console-control-strings/LICENSE
A node_modules/console-control-strings/README.md~
A node_modules/console-control-strings/index.js
A node_modules/console-control-strings/package.json
M node_modules/cryptiles/.npmignore
M node_modules/cryptiles/LICENSE
M node_modules/cryptiles/lib/index.js
A node_modules/cryptiles/node_modules/boom/LICENSE
A node_modules/cryptiles/node_modules/boom/lib/index.js
A node_modules/cryptiles/node_modules/boom/package.json
M node_modules/cryptiles/package.json
D node_modules/dashdash/node_modules/assert-plus/AUTHORS
D node_modules/dashdash/node_modules/assert-plus/assert.js
D node_modules/dashdash/node_modules/assert-plus/package.json
A node_modules/debug/.coveralls.yml
A node_modules/debug/.eslintrc
A node_modules/debug/.npmignore
A node_modules/debug/.travis.yml
A node_modules/debug/LICENSE
A node_modules/debug/Makefile
A node_modules/debug/component.json
A node_modules/debug/karma.conf.js
A node_modules/debug/node.js
A node_modules/debug/package.json
A node_modules/debug/src/browser.js
A node_modules/debug/src/debug.js
A node_modules/debug/src/index.js
A node_modules/debug/src/node.js
A node_modules/deep-extend/LICENSE
A node_modules/deep-extend/index.js
A node_modules/deep-extend/lib/deep-extend.js
A node_modules/deep-extend/package.json
A node_modules/delegates/.npmignore
A node_modules/delegates/License
A node_modules/delegates/Makefile
A node_modules/delegates/index.js
A node_modules/delegates/package.json
A node_modules/delegates/test/index.js
A node_modules/fast-deep-equal/.eslintrc.yml
A node_modules/fast-deep-equal/.npmignore
A node_modules/fast-deep-equal/.travis.yml
A node_modules/fast-deep-equal/LICENSE
A node_modules/fast-deep-equal/benchmark/.eslintrc.yml
A node_modules/fast-deep-equal/benchmark/index.js
A node_modules/fast-deep-equal/index.js
A node_modules/fast-deep-equal/package.json
A node_modules/fast-deep-equal/spec/.eslintrc.yml
A node_modules/fast-deep-equal/spec/index.spec.js
A node_modules/fast-deep-equal/spec/tests.js
A node_modules/fast-json-stable-stringify/.eslintrc.yml
A node_modules/fast-json-stable-stringify/.npmignore
A node_modules/fast-json-stable-stringify/.travis.yml
A node_modules/fast-json-stable-stringify/LICENSE
A node_modules/fast-json-stable-stringify/benchmark/index.js
A node_modules/fast-json-stable-stringify/benchmark/test.json
A node_modules/fast-json-stable-stringify/example/key_cmp.js
A node_modules/fast-json-stable-stringify/example/nested.js
A node_modules/fast-json-stable-stringify/example/str.js
A node_modules/fast-json-stable-stringify/example/value_cmp.js
A node_modules/fast-json-stable-stringify/index.js
A node_modules/fast-json-stable-stringify/package.json
A node_modules/fast-json-stable-stringify/test/cmp.js
A node_modules/fast-json-stable-stringify/test/nested.js
A node_modules/fast-json-stable-stringify/test/str.js
A node_modules/fast-json-stable-stringify/test/to-json.js
A node_modules/form-data/README.md.bak
M node_modules/form-data/lib/form_data.js
M node_modules/form-data/package.json
A node_modules/fs.realpath/LICENSE
A node_modules/fs.realpath/index.js
A node_modules/fs.realpath/old.js
A node_modules/fs.realpath/package.json
A 

[MediaWiki-commits] [Gerrit] operations/puppet[production]: proxysql: Make proxy configuration non-readable for all users

[Jcrespo (Code Review)]

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

Change subject: proxysql: Make proxy configuration non-readable for all users
..


proxysql: Make proxy configuration non-readable for all users

There should be no state configuration on the configuration, so
no need to make it public.

Configuration would be done by the SQL interface.

Bug: T175672
Change-Id: I25c311b723b093c03e0e52b623ddad132c384cd7
---
M modules/proxysql/manifests/init.pp
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/proxysql/manifests/init.pp 
b/modules/proxysql/manifests/init.pp
index f3cd70e0..df6391c 100644
--- a/modules/proxysql/manifests/init.pp
+++ b/modules/proxysql/manifests/init.pp
@@ -22,8 +22,8 @@
 file { '/etc/proxysql.cnf':
 ensure  => present,
 owner   => 'root',
-group   => 'root',
-mode=> '0444',
+group   => 'root', # this is wrong, this should be its own group/user
+mode=> '0440',
 content => template('proxysql/proxysql.cnf.erb'),
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I25c311b723b093c03e0e52b623ddad132c384cd7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Jcrespo 
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...VisualEditor[master]: Follow-up I80d82ad87: Only add linebreak to existing documents

[Esanders (Code Review)]

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

Change subject: Follow-up I80d82ad87: Only add linebreak to existing documents
..

Follow-up I80d82ad87: Only add linebreak to existing documents

This is the same behaviour as the old editor, and
unbreaks editors that use placeholders.

Change-Id: I7b5a18f1fb0d41c5dc08d1b893c90db2bf3dbd86
---
M modules/ve-mw/init/ve.init.mw.Target.js
1 file changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/59/392659/1

diff --git a/modules/ve-mw/init/ve.init.mw.Target.js 
b/modules/ve-mw/init/ve.init.mw.Target.js
index 08d17f2..3375f81 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -191,9 +191,11 @@
 ve.init.mw.Target.static.parseDocument = function ( documentString, mode ) {
var doc;
if ( mode === 'source' ) {
-   // Add trailing linebreak to wikitext documents for consistency
+   // Add trailing linebreak to existing wikitext documents for 
consistency
// with old editor and usability. Will be stripped on save. 
T156609
-   documentString += '\n';
+   if ( documentString ) {
+   documentString += '\n';
+   }
// Parent method
doc = ve.init.mw.Target.super.static.parseDocument.call( this, 
documentString, mode );
} else {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b5a18f1fb0d41c5dc08d1b893c90db2bf3dbd86
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders 

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix insufficient type hint in LanguageFallbackLabelDescripti...

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392667 )

Change subject: Fix insufficient type hint in 
LanguageFallbackLabelDescriptionLookupFactory
..

Fix insufficient type hint in LanguageFallbackLabelDescriptionLookupFactory

You can reproduce the issue by starting here:
DataAccessSnakFormatterFactory::newWikitextSnakFormatter constructs a
UsageTrackingLanguageFallbackLabelDescriptionLookup. That requires a
LanguageFallbackLabelDescriptionLookup because it expects the lookup to
return TermFallback's, and not just Term's. But the current type hint only
guarantees a LabelDescriptionLookup, which is not sufficient.

Or the other way around:
* UsageTrackingLanguageFallbackLabelDescriptionLookup requires the used
  LabelDescriptionLookup to return TermFallback's.
* Therefor it requires a LanguageFallbackLabelDescriptionLookup.
* Therefor LanguageFallbackLabelDescriptionLookupFactory should return a
  LanguageFallbackLabelDescriptionLookup.

Change-Id: Ib6bde2cc01df62a50bbe6b80ec02fcf030f4571f
---
M lib/includes/Store/LanguageFallbackLabelDescriptionLookupFactory.php
1 file changed, 1 insertion(+), 2 deletions(-)


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

diff --git 
a/lib/includes/Store/LanguageFallbackLabelDescriptionLookupFactory.php 
b/lib/includes/Store/LanguageFallbackLabelDescriptionLookupFactory.php
index 87c74c0..c6f05c9 100644
--- a/lib/includes/Store/LanguageFallbackLabelDescriptionLookupFactory.php
+++ b/lib/includes/Store/LanguageFallbackLabelDescriptionLookupFactory.php
@@ -5,7 +5,6 @@
 use InvalidArgumentException;
 use Language;
 use Wikibase\DataModel\Entity\EntityId;
-use Wikibase\DataModel\Services\Lookup\LabelDescriptionLookup;
 use Wikibase\DataModel\Services\Lookup\TermLookup;
 use Wikibase\DataModel\Services\Term\TermBuffer;
 use Wikibase\LanguageFallbackChainFactory;
@@ -74,7 +73,7 @@
 * @param string[] $termTypes Array with one or more of the types 
'label', 'alias' and
 *  'description'. Default is only 'label'.
 *
-* @return LabelDescriptionLookup
+* @return LanguageFallbackLabelDescriptionLookup
 */
public function newLabelDescriptionLookup(
Language $language,

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib6bde2cc01df62a50bbe6b80ec02fcf030f4571f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...Flow[master]: Disable 'reply' button until something typed

[jenkins-bot (Code Review)]

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

Change subject: Disable 'reply' button until something typed
..


Disable 'reply' button until something typed

Bug: T181063
Change-Id: I8dc8d3c4f311767a4242615bf8d9593019ed1812
---
M modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
M modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
2 files changed, 16 insertions(+), 4 deletions(-)

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



diff --git a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
index 652e383..ba2f328 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.NewTopicWidget.js
@@ -55,7 +55,7 @@
saveMsgKey: mw.user.isAnon() ? 
'flow-newtopic-save-anonymously' : 'flow-newtopic-save',
autoFocus: false,
classes: [ 'flow-ui-newTopicWidget-editor' ],
-   saveable: mw.config.get( 'wgIsProbablyEditable' ),
+   saveable: this.isProbablyEditable,
leaveCallback: function () {
if ( widget.title.getValue() !== '' ) {
return false;
diff --git a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js 
b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
index 4906480..a91691b 100644
--- a/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
+++ b/modules/flow/ui/widgets/mw.flow.ui.ReplyWidget.js
@@ -23,20 +23,22 @@
this.placeholder = config.placeholder;
this.editorOptions = config.editor;
 
+   this.isProbablyEditable = mw.config.get( 'wgIsProbablyEditable' 
);
+
// Parent constructor
mw.flow.ui.ReplyWidget.parent.call( this, config );
 
this.api = new mw.flow.dm.APIHandler();
 
this.anonWarning = new mw.flow.ui.AnonWarningWidget( {
-   isProbablyEditable: mw.config.get( 
'wgIsProbablyEditable' )
+   isProbablyEditable: this.isProbablyEditable
} );
this.anonWarning.toggle( !this.expandable );
 
this.canNotEdit = new mw.flow.ui.CanNotEditWidget( this.api, {
userGroups: mw.config.get( 'wgUserGroups' ),
restrictionEdit: mw.config.get( 'wgRestrictionEdit' ),
-   isProbablyEditable: mw.config.get( 
'wgIsProbablyEditable' )
+   isProbablyEditable: this.isProbablyEditable
} );
this.canNotEdit.toggle( !this.expandable );
 
@@ -99,6 +101,13 @@
 */
mw.flow.ui.ReplyWidget.prototype.onTriggerFocusIn = function () {
this.activateEditor();
+   };
+
+   /**
+* Repond to editor content change
+*/
+   mw.flow.ui.ReplyWidget.prototype.onEditorChange = function () {
+   this.editor.editorControlsWidget.toggleSaveable( 
!this.editor.isEmpty() );
};
 
/**
@@ -167,13 +176,16 @@
placeholder: this.placeholder,
saveMsgKey: mw.user.isAnon() ? 
'flow-reply-link-anonymously' : 'flow-reply-link',
classes: [ 'flow-ui-replyWidget-editor' ],
-   saveable: mw.config.get( 'wgIsProbablyEditable' 
)
+   saveable: this.isProbablyEditable
}, this.editorOptions ) );
+
+   this.onEditorChange();
 
this.$editorContainer.append( this.editor.$element );
 
// Events
this.editor.connect( this, {
+   change: 'onEditorChange',
saveContent: 'onEditorSaveContent',
cancel: 'onEditorCancel'
} );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc8d3c4f311767a4242615bf8d9593019ed1812
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Esanders 
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] mediawiki...WikibaseLexeme[master]: Allow FormId to be prefixed, as required via EntityId

[WMDE]

Thiemo Mättig (WMDE) has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392675 )

Change subject: Allow FormId to be prefixed, as required via EntityId
..

Allow FormId to be prefixed, as required via EntityId

Bug: T180469
Change-Id: Ieee80058fb1b2de7a4a13c6ab108ce2db6ffa7c4
---
M src/DataModel/FormId.php
M tests/phpunit/composer/DataModel/FormIdTest.php
2 files changed, 20 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikibaseLexeme 
refs/changes/75/392675/1

diff --git a/src/DataModel/FormId.php b/src/DataModel/FormId.php
index f5008eb..af6fe77 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -17,16 +17,14 @@
 * @param string $serialization
 */
public function __construct( $serialization ) {
-   Assert::parameterType( 'string', $serialization, 
'$serialization' );
-   Assert::parameter(
-   preg_match( self::PATTERN, $serialization ),
-   '$serialization',
-   'Form ID must match "' . self::PATTERN . '", given: ' . 
$serialization
-   );
+   parent::__construct( $serialization );
 
-   $this->serialization = $serialization;
-   $this->repositoryName = '';
-   $this->localPart = $serialization;
+   list( , , $id ) = self::splitSerialization( $this->localPart );
+   Assert::parameter(
+   preg_match( self::PATTERN, $id ),
+   '$serialization',
+   'Form ID must match "' . self::PATTERN . '", given: ' . 
$id
+   );
}
 
/**
@@ -55,8 +53,9 @@
 */
public function unserialize( $serialized ) {
$this->serialization = $serialized;
-   $this->repositoryName = '';
-   $this->localPart = $serialized;
+   list( $this->repositoryName, $this->localPart ) = 
$this->extractRepositoryNameAndLocalPart(
+   $serialized
+   );
}
 
 }
diff --git a/tests/phpunit/composer/DataModel/FormIdTest.php 
b/tests/phpunit/composer/DataModel/FormIdTest.php
index 9b3df39..57ae229 100644
--- a/tests/phpunit/composer/DataModel/FormIdTest.php
+++ b/tests/phpunit/composer/DataModel/FormIdTest.php
@@ -16,11 +16,19 @@
 class FormIdTest extends PHPUnit_Framework_TestCase {
 
public function 
testGivenValidSerialization_allGettersBehaveConsistent() {
-   $id = new FormId( 'L1-F1' );
+   $id = new FormId( ':L1-F1' );
$this->assertSame( 'L1-F1', $id->getSerialization() );
$this->assertSame( '', $id->getRepositoryName(), 
'getRepositoryName' );
$this->assertSame( 'L1-F1', $id->getLocalPart(), 'getLocalPart' 
);
$this->assertFalse( $id->isForeign(), 'isForeign' );
+   }
+
+   public function testGivenNonEmptyPrefix_allGettersBehaveConsistent() {
+   $id = new FormId( 'repo:L1-F1' );
+   $this->assertSame( 'repo:L1-F1', $id->getSerialization() );
+   $this->assertSame( 'repo', $id->getRepositoryName(), 
'getRepositoryName' );
+   $this->assertSame( 'L1-F1', $id->getLocalPart(), 'getLocalPart' 
);
+   $this->assertTrue( $id->isForeign(), 'isForeign' );
}
 
public function provideInvalidSerializations() {
@@ -35,8 +43,6 @@
[ '  L1-F1  ' ],
[ "L1-F1\n" ],
[ 'P1' ],
-   [ ':L1-F1' ],
-   [ 'repo:L1-F1' ],
];
}
 
@@ -49,7 +55,7 @@
}
 
public function testPhpSerializationRoundtrip() {
-   $id = new FormId( 'L1-F1' );
+   $id = new FormId( 'repo:L1-F1' );
$this->assertEquals( $id, unserialize( serialize( $id ) ) );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieee80058fb1b2de7a4a13c6ab108ce2db6ffa7c4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseLexeme
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: point codfw cp servers at codfw puppet 4 masters

[Herron (Code Review)]

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

Change subject: puppet: point codfw cp servers at codfw puppet 4 masters
..

puppet: point codfw cp servers at codfw puppet 4 masters

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


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/76/392676/1

diff --git a/hieradata/regex.yaml b/hieradata/regex.yaml
index a774263..b6f1482 100644
--- a/hieradata/regex.yaml
+++ b/hieradata/regex.yaml
@@ -272,3 +272,7 @@
 puppet4_mw_codfw:
   __regex: !ruby/regexp /^mw2.*\.codfw\.wmnet$/
   puppetmaster: "puppetmaster2001.codfw.wmnet"
+
+puppet4_cp_codfw:
+  __regex: !ruby/regexp /^cp2.*\.codfw\.wmnet$/
+  puppetmaster: "puppetmaster2001.codfw.wmnet"

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate cergen tox job to docker

[Hashar (Code Review)]

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

Change subject: Migrate cergen tox job to docker
..

Migrate cergen tox job to docker

Albeit written in python, the utility depends on Java JDK 8+.

Craft a new Docker image wmfreleng/tox-cergen
Create a more specific job cergen-tox-docker

Change-Id: I25e4261f18207c48c97ba3115b7b380ca6786c81
---
A dockerfiles/tox-cergen/Dockerfile
A dockerfiles/tox-cergen/example-run.sh
M jjb/operations-misc.yaml
M zuul/layout.yaml
4 files changed, 33 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/78/392678/1

diff --git a/dockerfiles/tox-cergen/Dockerfile 
b/dockerfiles/tox-cergen/Dockerfile
new file mode 100644
index 000..131eb7a
--- /dev/null
+++ b/dockerfiles/tox-cergen/Dockerfile
@@ -0,0 +1,9 @@
+FROM wmfreleng/tox
+
+USER root
+RUN apt-get update && \
+apt-get install --yes \
+openjdk-8-jre-headless && \
+rm -rf /var/lib/apt/lists/*
+
+USER nobody
diff --git a/dockerfiles/tox-cergen/example-run.sh 
b/dockerfiles/tox-cergen/example-run.sh
new file mode 100644
index 000..5a32dc9
--- /dev/null
+++ b/dockerfiles/tox-cergen/example-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+install --mode 777 --directory log cache
+
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=cergen \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+--volume /"$(pwd)"/log://log \
+--volume /"$(pwd)"/cache://cache \
+ wmfreleng/tox-cergen:latest
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index 8ef8fcb..7a71982 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -1,3 +1,9 @@
+- project:
+name: cergen
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-cergen:v2017.11.21.16.52
+
 - job-template:
 name: 'operations-dns-lint'
 # Depends on production GeoIP T98737
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8106be1..f39b6cd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2177,8 +2177,10 @@
   - name: npm
 
   - name: cergen
-template:
-  - name: tox-jessie  # requires Java JDK 8+ for bin/keytool
+test:
+  - cergen-tox-docker
+gate-and-submit:
+  - cergen-tox-docker
 
   - name: operations/calico-cni
 test:

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I25e4261f18207c48c97ba3115b7b380ca6786c81
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Fix a series of code smell issues as reported by PHPStorm

[jenkins-bot (Code Review)]

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

Change subject: Fix a series of code smell issues as reported by PHPStorm
..


Fix a series of code smell issues as reported by PHPStorm

I realize this patch probably does to many things at the same time. I
wanted to submit it as a remark. Feel free to pick it up, split smaller
issues up into separate patches, or merge it as it is.

Change-Id: Iac8c2d6a3fdada4c717087c266c2e51085ba934d
---
M WikibaseQualityConstraintsHooks.php
M api/CheckConstraints.php
M includes/ConstraintCheck/Cache/CachedEntityIds.php
M includes/ConstraintCheck/Checker/CommonsLinkChecker.php
M includes/ConstraintCheck/Checker/DiffWithinRangeChecker.php
M includes/ConstraintCheck/Checker/FormatChecker.php
M includes/ConstraintCheck/DelegatingConstraintChecker.php
M includes/ConstraintCheck/Helper/ConnectionCheckerHelper.php
M includes/ConstraintCheck/Helper/ConstraintParameterParser.php
M includes/ConstraintCheck/Helper/SparqlHelper.php
M includes/ConstraintCheck/Helper/TypeCheckerHelper.php
M includes/ConstraintCheck/ItemIdSnakValue.php
M includes/ConstraintRepository.php
M tests/phpunit/Api/CheckConstraintsTest.php
M tests/phpunit/Checker/TypeChecker/TypeCheckerHelperTest.php
M tests/phpunit/SparqlHelperMock.php
16 files changed, 61 insertions(+), 26 deletions(-)

Approvals:
  Lucas Werkmeister (WMDE): Looks good to me, approved
  jenkins-bot: Verified
  Thiemo Mättig (WMDE): Looks good to me, but someone else must approve



diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 948e281..7be5106 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -43,6 +43,7 @@
if ( MediaWikiServices::getInstance()->getMainConfig()->get( 
'WBQualityConstraintsEnableConstraintsImportFromStatements' ) &&
self::isPropertyStatementsChange( $change )
) {
+   /** @var EntityChange $change */
$title = Title::newMainPage();
$params = [ 'propertyId' => 
$change->getEntityId()->getSerialization() ];
JobQueueGroup::singleton()->push(
diff --git a/api/CheckConstraints.php b/api/CheckConstraints.php
index 798bb17..5f3f1cc 100644
--- a/api/CheckConstraints.php
+++ b/api/CheckConstraints.php
@@ -14,7 +14,6 @@
 use Wikibase\DataModel\Entity\EntityIdParsingException;
 use Wikibase\DataModel\Entity\ItemId;
 use Wikibase\DataModel\Services\EntityId\EntityIdFormatter;
-use Wikibase\DataModel\Services\Statement\StatementGuidParser;
 use Wikibase\DataModel\Services\Statement\StatementGuidValidator;
 use Wikibase\Lib\SnakFormatter;
 use Wikibase\Lib\Store\EntityTitleLookup;
@@ -52,11 +51,6 @@
 * @var StatementGuidValidator
 */
private $statementGuidValidator;
-
-   /**
-* @var StatementGuidParser
-*/
-   private $statementGuidParser;
 
/**
 * @var DelegatingConstraintChecker
@@ -122,7 +116,6 @@
$entityIdHtmlLinkFormatter = 
$entityIdHtmlLinkFormatterFactory->getEntityIdFormatter( 
$labelDescriptionLookup );
$entityIdLabelFormatterFactory = new 
EntityIdLabelFormatterFactory();
$entityIdLabelFormatter = 
$entityIdLabelFormatterFactory->getEntityIdFormatter( $labelDescriptionLookup );
-   $statementGuidParser = $repo->getStatementGuidParser();
$constraintParameterRenderer = new ConstraintParameterRenderer( 
$entityIdHtmlLinkFormatter, $valueFormatter );
$config = MediaWikiServices::getInstance()->getMainConfig();
$titleParser = 
MediaWikiServices::getInstance()->getTitleParser();
@@ -130,7 +123,7 @@
$constraintReportFactory = new ConstraintReportFactory(
$repo->getEntityLookup(),
$repo->getPropertyDataTypeLookup(),
-   $statementGuidParser,
+   $repo->getStatementGuidParser(),
$config,
$constraintParameterRenderer,
new ConstraintParameterParser(
@@ -144,13 +137,19 @@
$unitConverter
);
 
-   return new CheckConstraints( $main, $name, $prefix, 
$repo->getEntityIdParser(),
-   $repo->getStatementGuidValidator(), 
$statementGuidParser, $constraintReportFactory->getConstraintChecker(),
+   return new CheckConstraints(
+   $main,
+   $name,
+   $prefix,
+   $repo->getEntityIdParser(),
+   $repo->getStatementGuidValidator(),
+   $constraintReportFactory->getConstraintChecker(),
$constraintParameterRenderer,
   

[MediaWiki-commits] [Gerrit] integration/config[master]: Migrate cergen tox job to docker

[jenkins-bot (Code Review)]

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

Change subject: Migrate cergen tox job to docker
..


Migrate cergen tox job to docker

Albeit written in python, the utility depends on Java JDK 8+.

Craft a new Docker image wmfreleng/tox-cergen
Create a more specific job cergen-tox-docker

Change-Id: I25e4261f18207c48c97ba3115b7b380ca6786c81
---
A dockerfiles/tox-cergen/Dockerfile
A dockerfiles/tox-cergen/example-run.sh
M jjb/operations-misc.yaml
M zuul/layout.yaml
4 files changed, 33 insertions(+), 2 deletions(-)

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



diff --git a/dockerfiles/tox-cergen/Dockerfile 
b/dockerfiles/tox-cergen/Dockerfile
new file mode 100644
index 000..131eb7a
--- /dev/null
+++ b/dockerfiles/tox-cergen/Dockerfile
@@ -0,0 +1,9 @@
+FROM wmfreleng/tox
+
+USER root
+RUN apt-get update && \
+apt-get install --yes \
+openjdk-8-jre-headless && \
+rm -rf /var/lib/apt/lists/*
+
+USER nobody
diff --git a/dockerfiles/tox-cergen/example-run.sh 
b/dockerfiles/tox-cergen/example-run.sh
new file mode 100644
index 000..5a32dc9
--- /dev/null
+++ b/dockerfiles/tox-cergen/example-run.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+install --mode 777 --directory log cache
+
+docker run \
+--rm --tty \
+--env JENKINS_URL=1 \
+--env ZUUL_URL=https://gerrit.wikimedia.org/r \
+--env ZUUL_PROJECT=cergen \
+--env ZUUL_COMMIT=master \
+--env ZUUL_REF=master \
+--volume /"$(pwd)"/log://log \
+--volume /"$(pwd)"/cache://cache \
+ wmfreleng/tox-cergen:latest
diff --git a/jjb/operations-misc.yaml b/jjb/operations-misc.yaml
index 8ef8fcb..7a71982 100644
--- a/jjb/operations-misc.yaml
+++ b/jjb/operations-misc.yaml
@@ -1,3 +1,9 @@
+- project:
+name: cergen
+jobs:
+- '{name}-tox-docker':
+docker_image_var: wmfreleng/tox-cergen:v2017.11.21.16.52
+
 - job-template:
 name: 'operations-dns-lint'
 # Depends on production GeoIP T98737
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 8106be1..f39b6cd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2177,8 +2177,10 @@
   - name: npm
 
   - name: cergen
-template:
-  - name: tox-jessie  # requires Java JDK 8+ for bin/keytool
+test:
+  - cergen-tox-docker
+gate-and-submit:
+  - cergen-tox-docker
 
   - name: operations/calico-cni
 test:

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

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

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