date:20171120

[MediaWiki-commits] [Gerrit] mediawiki...Wikidata[master]: New Wikidata Build - 2017-11-20T10:00:01+0000

2017-11-20 Thread WikidataBuilder (Code Review)

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

Change subject: New Wikidata Build - 2017-11-20T10:00:01+
..

New Wikidata Build - 2017-11-20T10:00:01+

Change-Id: Ic2b7d637dade64be4a423d8c74d7f0dbc4fe5bc9
---
M composer.lock
M extensions/Constraints/i18n/es.json
M extensions/Constraints/i18n/pt.json
M extensions/Wikibase/client/i18n/ais.json
M extensions/Wikibase/lib/i18n/ca.json
M extensions/Wikibase/lib/i18n/el.json
M extensions/Wikibase/repo/i18n/be-tarask.json
M vendor/composer/installed.json
8 files changed, 26 insertions(+), 11 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata 
refs/changes/97/392397/1

diff --git a/composer.lock b/composer.lock
index dc4b699..3da61ef 100644
--- a/composer.lock
+++ b/composer.lock
@@ -855,7 +855,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/WikibaseQualityConstraints;,
-"reference": "164ad69ca0328eea7bf2444b75465b5d6af61276"
+"reference": "3c6806091c384f099bcd95f63fa90f5ecb78e758"
 },
 "require": {
 "php": ">=5.5.9",
@@ -906,7 +906,7 @@
 "support": {
 "issues": 
"https://phabricator.wikimedia.org/project/profile/1202/;
 },
-"time": "2017-11-18 22:05:03"
+"time": "2017-11-19 21:42:39"
 },
 {
 "name": "wikibase/data-model",
@@ -1228,7 +1228,7 @@
 "source": {
 "type": "git",
 "url": 
"https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase;,
-"reference": "2bfdde926bd25f64db4fe23313f37973e56304e8"
+"reference": "cb7c32e3ff75d2f654ccd639bf51da2319bdbe28"
 },
 "require": {
 "composer/installers": ">=1.0.1",
@@ -1289,7 +1289,7 @@
 "issues": "https://phabricator.wikimedia.org/;,
 "irc": "irc://irc.freenode.net/wikidata"
 },
-"time": "2017-11-18 22:04:37"
+"time": "2017-11-19 21:42:13"
 },
 {
 "name": "wikibase/wikimedia-badges",
diff --git a/extensions/Constraints/i18n/es.json 
b/extensions/Constraints/i18n/es.json
index 3c64f7c..d31db0f 100644
--- a/extensions/Constraints/i18n/es.json
+++ b/extensions/Constraints/i18n/es.json
@@ -3,7 +3,8 @@
"authors": [
"Fitoschido",
"Macofe",
-   "Csbotero"
+   "Csbotero",
+   "KATRINE1992"
]
},
"wbqc-constraintreport": "Informe de restricción",
@@ -28,6 +29,8 @@
"wbqc-badparameters-short": "Parámetros incorrectos",
"wbqc-parameterissues-short": "Incidencias avanzadas",
"wbqc-constrainttypehelp-short": "Ayuda",
+   "wbqc-cached-generic": "Este resultado ha sido cachado y puede ser 
post-datado",
+   "wbqc-cached-minutes": "Este resultado esta bloqueado y puede ser 
post-datado hasta {{PLURAL:$1|1=one minute|$1minutes}}.",
"wbqc-violation-header-parameters": "Parámetros:",
"wbqc-violations-group": "Restricciones",
"wbqc-violation-message": "La verificación de restricciones ha señalado 
una violación. Pulsa el icono para obtener más información.",
diff --git a/extensions/Constraints/i18n/pt.json 
b/extensions/Constraints/i18n/pt.json
index f7313c0..223b36c 100644
--- a/extensions/Constraints/i18n/pt.json
+++ b/extensions/Constraints/i18n/pt.json
@@ -41,6 +41,8 @@
"wbqc-parameterissues-long": "Estes problemas estão relacionados com a 
definição da restrição sobre a propriedade, não com esta declaração.",
"wbqc-constrainttypehelp-short": "Ajuda",
"wbqc-constrainttypehelp-long": "Página de ajuda para este tipo de 
restrição",
+   "wbqc-cached-generic": "Este resultado vem da cache e pode estar 
desatualizado.",
+   "wbqc-cached-minutes": "Este resultado vem da cache e pode estar 
desatualizado em até {{PLURAL:$1|1=um minuto|$1minutos}}.",
"apihelp-wbcheckconstraints-description": "Realiza a verificação das 
restrições de qualquer entidade que queira e devolve o resultado.",
"apihelp-wbcheckconstraints-summary": "Realiza a verificação das 
restrições de qualquer entidade que queira e devolve o resultado.",
"apihelp-wbcheckconstraints-param-id": "Lista de identificadores das 
entidades de que serão obtidos os dados. Separar os valores com '|' ou 
alternativa.",
diff --git a/extensions/Wikibase/client/i18n/ais.json 
b/extensions/Wikibase/client/i18n/ais.json
index e9a34be..ef1707c 100644
--- a/extensions/Wikibase/client/i18n/ais.json
+++ b/extensions/Wikibase/client/i18n/ais.json
@@ -68,6 +68,7 @@
"wikibase-property-render-error": "paazih susin

[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: reprovision restbase2004 with cassandra 3

2017-11-20 Thread Filippo Giunchedi (Code Review)

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

Change subject: cassandra: reprovision restbase2004 with cassandra 3
..

cassandra: reprovision restbase2004 with cassandra 3

Bug: T179422
Change-Id: If2cd6110906bb2a4be96efa7ebaa7a638a2a8095
---
M hieradata/hosts/restbase2004.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
M modules/install_server/files/autoinstall/netboot.cfg
5 files changed, 51 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/96/392396/1

diff --git a/hieradata/hosts/restbase2004.yaml 
b/hieradata/hosts/restbase2004.yaml
index 3b092c6..3532992 100644
--- a/hieradata/hosts/restbase2004.yaml
+++ b/hieradata/hosts/restbase2004.yaml
@@ -1 +1,2 @@
 profile::cassandra::rack: 'c'
+cassandra::jbod_devices: ['sda4', 'sdb4', 'sdc4', 'sdd4', 'sde4']
diff --git a/hieradata/role/common/restbase/production.yaml 
b/hieradata/role/common/restbase/production.yaml
index 60ea1bc..6622dff 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -170,13 +170,13 @@
   #listen_address: 10.192.32.135
   #  c:
   #listen_address: 10.192.32.136
-  "restbase2004.codfw.wmnet":
-a:
-  listen_address: 10.192.32.137
-b:
-  listen_address: 10.192.32.138
-c:
-  listen_address: 10.192.32.139
+  #"restbase2004.codfw.wmnet":
+  #  a:
+  #listen_address: 10.192.32.137
+  #  b:
+  #listen_address: 10.192.32.138
+  #  c:
+  #listen_address: 10.192.32.139
   #"restbase2005.codfw.wmnet":
   #  a:
   #listen_address: 10.192.48.46
diff --git a/hieradata/role/common/restbase/production_ng.yaml 
b/hieradata/role/common/restbase/production_ng.yaml
index 4d9ecce..31e9967 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -15,7 +15,6 @@
   - restbase1016.eqiad.wmnet
   - restbase1017.eqiad.wmnet
   - restbase1018.eqiad.wmnet
-  - restbase2004.codfw.wmnet
   - restbase2007.codfw.wmnet
   - restbase2008.codfw.wmnet
   - restbase2009.codfw.wmnet
@@ -298,6 +297,46 @@
   hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
   saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
   jmx_exporter_enabled: true
+  "restbase2004.codfw.wmnet":
+a:
+  listen_address: 10.192.32.137
+  data_file_directories:
+- /srv/sda4/cassandra-a/data
+- /srv/sdb4/cassandra-a/data
+- /srv/sdc4/cassandra-a/data
+- /srv/sdd4/cassandra-a/data
+- /srv/sde4/cassandra-a/data
+  heapdump_directory: /srv/sda4/cassandra-a
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-a/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-a/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-a/saved_caches
+  jmx_exporter_enabled: true
+b:
+  listen_address: 10.192.32.138
+  data_file_directories:
+- /srv/sda4/cassandra-b/data
+- /srv/sdb4/cassandra-b/data
+- /srv/sdc4/cassandra-b/data
+- /srv/sdd4/cassandra-b/data
+- /srv/sde4/cassandra-b/data
+  heapdump_directory: /srv/sdb4/cassandra-b
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-b/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-b/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-b/saved_caches
+  jmx_exporter_enabled: true
+c:
+  listen_address: 10.192.32.139
+  data_file_directories:
+- /srv/sda4/cassandra-c/data
+- /srv/sdb4/cassandra-c/data
+- /srv/sdc4/cassandra-c/data
+- /srv/sdd4/cassandra-c/data
+- /srv/sde4/cassandra-c/data
+  heapdump_directory: /srv/sdc4/cassandra-c
+  commitlog_directory: /srv/cassandra/instance-data/cassandra-c/commitlog
+  hints_directory: /srv/cassandra/instance-data/cassandra-c/hints
+  saved_caches_directory: 
/srv/cassandra/instance-data/cassandra-c/saved_caches
+  jmx_exporter_enabled: true
   "restbase2005.codfw.wmnet":
 a:
   listen_address: 10.192.48.46
diff --git a/manifests/site.pp b/manifests/site.pp
index c73ca89..8636191 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2129,11 +2129,11 @@
 }
 
 # restbase codfw cluster
-node /^restbase20(0[4789]|1[012])\.codfw\.wmnet$/ {
+node /^restbase20(0[789]|1[012])\.codfw\.wmnet$/ {
 role(restbase::production)
 }
 
-node /^restbase200[12356]\.codfw\.wmnet$/ {
+node /^restbase200[123456]\.codfw\.wmnet$/ {
 role(restbase::production_ng)
 }
 
diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 1448b58..902d0b1 100755
---

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fix missing redirect for wikidata json dumps

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: fix missing redirect for wikidata json dumps
..

fix missing redirect for wikidata json dumps

Fixes bug introduced by 2edcf554ee8221958f9c2253df63564f4dfa47c3

Bug: T180934
Change-Id: I859028695b66467156a9106a7f43a6de37617543
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh 
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index 49136ab..9bf36ea 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -31,7 +31,7 @@

errorLog=/var/log/wikidatadump/dumpwikidatajson-$filename-$i.log
# NOTE: We temporary set the shard size differently for 
each shard. T177486#3674942.
# Remove --no-cache once this runs on hhvm (or 
everything is back on Zend), see T180048.
-   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --batch-size `expr $(expr $i 
+ 1) \* 500` --snippet 2 --no-cache >> $errorLog | gzip -9 > 
$tempDir/wikidataJson.$i.gz
+   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --batch-size `expr $(expr $i 
+ 1) \* 500` --snippet 2 --no-cache 2>> $errorLog | gzip -9 > 
$tempDir/wikidataJson.$i.gz
exitCode=$?
if [ $exitCode -gt 0 ]; then
echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: fix missing redirect for wikidata json dumps

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: fix missing redirect for wikidata json dumps
..


fix missing redirect for wikidata json dumps

Fixes bug introduced by 2edcf554ee8221958f9c2253df63564f4dfa47c3

Bug: T180934
Change-Id: I859028695b66467156a9106a7f43a6de37617543
---
M modules/snapshot/files/cron/dumpwikidatajson.sh
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/snapshot/files/cron/dumpwikidatajson.sh 
b/modules/snapshot/files/cron/dumpwikidatajson.sh
index 49136ab..9bf36ea 100644
--- a/modules/snapshot/files/cron/dumpwikidatajson.sh
+++ b/modules/snapshot/files/cron/dumpwikidatajson.sh
@@ -31,7 +31,7 @@

errorLog=/var/log/wikidatadump/dumpwikidatajson-$filename-$i.log
# NOTE: We temporary set the shard size differently for 
each shard. T177486#3674942.
# Remove --no-cache once this runs on hhvm (or 
everything is back on Zend), see T180048.
-   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --batch-size `expr $(expr $i 
+ 1) \* 500` --snippet 2 --no-cache >> $errorLog | gzip -9 > 
$tempDir/wikidataJson.$i.gz
+   php5 $multiversionscript 
extensions/Wikidata/extensions/Wikibase/repo/maintenance/dumpJson.php --wiki 
wikidatawiki --shard $i --sharding-factor $shards --batch-size `expr $(expr $i 
+ 1) \* 500` --snippet 2 --no-cache 2>> $errorLog | gzip -9 > 
$tempDir/wikidataJson.$i.gz
exitCode=$?
if [ $exitCode -gt 0 ]; then
echo -e "\n\n(`date --iso-8601=minutes`) 
Process for shard $i failed with exit code $exitCode" >> $errorLog

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I859028695b66467156a9106a7f43a6de37617543
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Leave reimaginable only the db latest servers

2017-11-20 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Leave reimaginable only the db latest servers
..

mariadb: Leave reimaginable only the db latest servers

Remove from the list of servers reimaginable with /srv loss the
all but:
* servers >= db1109
* servers >= db2071

db1059 was already reimagined at T175679.

Bug: T170662
Change-Id: I58566e209fbc7a0fc76719639ed8a7985fde97f4
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index a0dfc3f..8b80225 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,9 +64,9 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db1059|db109[6-9]|db110[0-9]|db111[0-2]) echo partman/db.cfg ;; \
+db1109|db111[0-9]) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
-
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db110[78]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
+db[12][01][0-9][0-9]|dbstore[12]00[1-9]|es[12]01[1-9]) echo 
partman/db-no-srv-format.cfg ;; \
 deploy[12]001|flerovium|furud) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \
 d-i-test) echo partman/flat.cfg virtual.cfg ;; \
 druid100[1-6]) echo partman/druid-4ssd-raid10.cfg ;; \

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Enable jenkins on contint1001 reboot

2017-11-20 Thread Hashar (Code Review)

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

Change subject: Enable jenkins on contint1001 reboot
..

Enable jenkins on contint1001 reboot

Whenever we reboot contint1001, we have to manually start jenkins. We
want the service to be manually unmanaged though to prevent puppet to
magically restart it, but on reboot it is fine to bring it up.

Change-Id: I17048b5fbcb3dedf81ab8e053e0593f4e291319f
---
M hieradata/hosts/contint1001.yaml
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/99/392399/1

diff --git a/hieradata/hosts/contint1001.yaml b/hieradata/hosts/contint1001.yaml
index c13357d..a2b4209 100644
--- a/hieradata/hosts/contint1001.yaml
+++ b/hieradata/hosts/contint1001.yaml
@@ -1,6 +1,6 @@
 # hotspare is contint2001
 profile::ci::jenkins::service_ensure: unmanaged
-profile::ci::jenkins::service_enable: false
+profile::ci::jenkins::service_enable: true
 profile::ci::jenkins::service_monitor: true
 profile::zuul::server::service_ensure: running
 profile::zuul::server::service_enable: true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I17048b5fbcb3dedf81ab8e053e0593f4e291319f
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] mediawiki/core[master]: Special:UserRights: Prevent FOUC by hiding in PHP instead of...

2017-11-20 Thread Fomafix (Code Review)

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

Change subject: Special:UserRights: Prevent FOUC by hiding in PHP instead of 
JavaScript
..

Special:UserRights: Prevent FOUC by hiding in PHP instead of JavaScript

Change-Id: Ibfbbb00efbe660e4e7b7ba26b4faf6f5b7ed2a2f
---
M includes/specials/SpecialUserrights.php
M resources/src/mediawiki.special/mediawiki.special.userrights.js
2 files changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/01/392401/1

diff --git a/includes/specials/SpecialUserrights.php 
b/includes/specials/SpecialUserrights.php
index 5c779f0..14324e2 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -916,7 +916,12 @@
$expiryHtml .= 
$expiryFormOptions->getHTML() . '';
 
// Add custom expiry field
-   $attribs = [ 'id' => 
"mw-input-wpExpiry-$group-other" ];
+   $attribs = [
+   'id' => 
"mw-input-wpExpiry-$group-other",
+   // Initial hide the 
input field to prevent a FOUC on loading
+   // JavaScript will 
unhide the input field when in use
+   'style' => 'display: 
none',
+   ];
if ( 
$checkbox['disabled-expiry'] ) {
$attribs['disabled'] = 
'disabled';
}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.js 
b/resources/src/mediawiki.special/mediawiki.special.userrights.js
index 702f4c4..d3494f7 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.js
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.js
@@ -9,5 +9,5 @@
// Dynamically show/hide the "other time" input under each dropdown
$( '.mw-userrights-nested select' ).on( 'change', function ( e ) {
$( e.target.parentNode ).find( 'input' ).toggle( $( e.target 
).val() === 'other' );
-   } ).trigger( 'change' );
+   } );
 }( jQuery ) );

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfbbb00efbe660e4e7b7ba26b4faf6f5b7ed2a2f
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] pywikibot/core[master]: api.py: Allow `:` in the hostname of lagpattern

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: api.py: Allow `:` in the hostname of lagpattern
..


api.py: Allow `:` in the hostname of lagpattern

The hostname of lagpattern can be in `:` format.

Bug: T180313
Change-Id: I7b3d82379c8aa082e16e35cd9eaeff6cc4c41fbb
---
M pywikibot/data/api.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 540648d..b0f3865 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -93,7 +93,7 @@
 _logger = "data.api"
 
 lagpattern = re.compile(
-r'Waiting for [\w. ]+: (?P\d+)(?:\.\d+)? seconds? lagged')
+r'Waiting for [\w.: ]+: (?P\d+)(?:\.\d+)? seconds? lagged')
 
 
 class APIError(Error):

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7b3d82379c8aa082e16e35cd9eaeff6cc4c41fbb
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Xqt 
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]: Revert "install_server: Reimage db1063"

2017-11-20 Thread Marostegui (Code Review)

Hello jenkins-bot, Jcrespo,

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

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

to review the following change.


Change subject: Revert "install_server: Reimage db1063"
..

Revert "install_server: Reimage db1063"

This reverts commit 84344af48fb445c3754e60c1d2352158a0bf6d6d.

Change-Id: Idc2dc1b72829c47c701b0b7b1f91846910e06adc
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/78/392378/1

diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 979be93..a0dfc3f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,7 +64,7 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db1059|db109[6-9]|db110[0-9]|db111[0-2]|db1063) echo partman/db.cfg ;; 
\
+db1059|db109[6-9]|db110[0-9]|db111[0-2]) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db110[78]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
 deploy[12]001|flerovium|furud) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc2dc1b72829c47c701b0b7b1f91846910e06adc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui 
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...NavigationTiming[master]: Collect RUMSpeedIndex with NavigationTiming

2017-11-20 Thread Gilles (Code Review)

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

Change subject: Collect RUMSpeedIndex with NavigationTiming
..

Collect RUMSpeedIndex with NavigationTiming

Bug: T180667
Change-Id: I32234807e29686d29013a9eb9ef3f6ab20278970
---
M extension.json
A modules/RUM-SpeedIndex/LICENSE
A modules/RUM-SpeedIndex/rum-speedindex.js
M modules/ext.navigationTiming.js
4 files changed, 325 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/NavigationTiming 
refs/changes/81/392381/1

diff --git a/extension.json b/extension.json
index 787ca0a..ce6a716 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,15 @@
"desktop",
"mobile"
]
+   },
+   "ext.navigationTiming.rumSpeedIndex": {
+   "scripts": [
+   "RUM-SpeedIndex/rum-speedindex.js"
+   ],
+   "targets": [
+   "desktop",
+   "mobile"
+   ]
}
},
"ResourceFileModulePaths": {
@@ -49,7 +58,7 @@
]
},
"EventLoggingSchemas": {
-   "NavigationTiming": 17216284,
+   "NavigationTiming": 17446117,
"SaveTiming": 15396492
},
"config": {
diff --git a/modules/RUM-SpeedIndex/LICENSE b/modules/RUM-SpeedIndex/LICENSE
new file mode 100644
index 000..f451eb6
--- /dev/null
+++ b/modules/RUM-SpeedIndex/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 WPO Foundation
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/modules/RUM-SpeedIndex/rum-speedindex.js 
b/modules/RUM-SpeedIndex/rum-speedindex.js
new file mode 100644
index 000..e1f380b
--- /dev/null
+++ b/modules/RUM-SpeedIndex/rum-speedindex.js
@@ -0,0 +1,291 @@
+/**
+Copyright (c) 2014, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+* Neither the name of the  nor the names of its contributors
+may be used to endorse or promote products derived from this software
+without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+**/
+
+/**
+***
+  Calculates the Speed Index for a page by:
+  - Collecting a list of visible rectangles for elements

[MediaWiki-commits] [Gerrit] operations...druid_exporter[master]: Fix import of local libraries for python3

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Fix import of local libraries for python3
..

Fix import of local libraries for python3

Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
---
M druid_exporter/exporter.py
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/druid_exporter/exporter.py b/druid_exporter/exporter.py
index 2736310..6f957be 100644
--- a/druid_exporter/exporter.py
+++ b/druid_exporter/exporter.py
@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import
 import argparse
 import json
 import logging
 import sys
 
-import collector
 from prometheus_client import generate_latest, make_wsgi_app, REGISTRY
 from wsgiref.simple_server import make_server
-
+from . import collector
 
 log = logging.getLogger(__name__)
 SUPPORTED_DAEMONS = ('broker', 'historical', 'coordinator')

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: base: purge apt sources on deployment-prep

2017-11-20 Thread Muehlenhoff (Code Review)

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

Change subject: base: purge apt sources on deployment-prep
..


base: purge apt sources on deployment-prep

Change-Id: Ib58f2fba2e1dae2864457776e5048e08529d7b4e
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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

Objections:
  Gehel: There's a problem with this change, please improve



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index a345ca2..9930669 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -1,6 +1,7 @@
 ---
 profile::base::remote_syslog:
   - "deployment-logstash2.deployment-prep.eqiad.wmflabs:10514"
+profile::base::purge_apt_sources: true
 has_lvs: false
 "puppetmaster::scripts::keep_reports_minutes": 360
 puppetmaster::autosigner: true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib58f2fba2e1dae2864457776e5048e08529d7b4e
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Gehel 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Hashar 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations...druid_exporter[master]: Fix import of local libraries for python3

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Fix import of local libraries for python3
..


Fix import of local libraries for python3

Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
---
M druid_exporter/exporter.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/druid_exporter/exporter.py b/druid_exporter/exporter.py
index 2736310..6f957be 100644
--- a/druid_exporter/exporter.py
+++ b/druid_exporter/exporter.py
@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import
 import argparse
 import json
 import logging
 import sys
 
-import collector
 from prometheus_client import generate_latest, make_wsgi_app, REGISTRY
 from wsgiref.simple_server import make_server
-
+from . import collector
 
 log = logging.getLogger(__name__)
 SUPPORTED_DAEMONS = ('broker', 'historical', 'coordinator')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/druid_exporter
Gerrit-Branch: master
Gerrit-Owner: Elukey 
Gerrit-Reviewer: Elukey 
Gerrit-Reviewer: Filippo Giunchedi 

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

[MediaWiki-commits] [Gerrit] operations...druid_exporter[debian]: Fix import of local libraries for python3

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Fix import of local libraries for python3
..

Fix import of local libraries for python3

Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
---
M druid_exporter/exporter.py
1 file changed, 2 insertions(+), 2 deletions(-)


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

diff --git a/druid_exporter/exporter.py b/druid_exporter/exporter.py
index 2736310..6f957be 100644
--- a/druid_exporter/exporter.py
+++ b/druid_exporter/exporter.py
@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import
 import argparse
 import json
 import logging
 import sys
 
-import collector
 from prometheus_client import generate_latest, make_wsgi_app, REGISTRY
 from wsgiref.simple_server import make_server
-
+from . import collector
 
 log = logging.getLogger(__name__)
 SUPPORTED_DAEMONS = ('broker', 'historical', 'coordinator')

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
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.2

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Release version 0.2
..

Release version 0.2

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


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

diff --git a/debian/changelog b/debian/changelog
index b59ce6f..c88e96f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-druid-exporter (0.2-1) unstable; urgency=low
+
+  * Fix import of local libraries for python3
+
+ -- Luca Toscano   Fri, 20 Nov 2017 10:53:36 +
+
 prometheus-druid-exporter (0.1-1) unstable; urgency=low
 
   * Initial packaging

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04d9f7806dec64544e3781edfe9f5aa55518d0c1
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/puppet[production]: don't produce flow history dump during partial dump runs

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: don't produce flow history dump during partial dump runs
..

don't produce flow history dump during partial dump runs

These partial runs are supposed to be relatively fast, without
full history revisions of anything.  We'll still dump flow history
during the full run at the beginning of the month.

Change-Id: I42dd49fc0aaebfd2ada8a10dae8f5039dc6bc3ef
---
M modules/snapshot/manifests/dumps/stagesconfig.pp
1 file changed, 2 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/93/392393/1

diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp 
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index 51f0967..6a033be 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -13,7 +13,8 @@
 $jobs_to_skip = join(['metahistorybz2dump',
   'metahistorybz2dumprecombine',
   'metahistory7zdump',
-  'metahistory7zdumprecombine'], ',')
+  'metahistory7zdumprecombine',
+  'xmlflowhistorydump'], ',')
 
 $stages = {
 smallwikis   => {

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

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

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

[MediaWiki-commits] [Gerrit] operations...druid_exporter[debian]: Fix import of local libraries for python3

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Fix import of local libraries for python3
..


Fix import of local libraries for python3

Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
---
M druid_exporter/exporter.py
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/druid_exporter/exporter.py b/druid_exporter/exporter.py
index 2736310..6f957be 100644
--- a/druid_exporter/exporter.py
+++ b/druid_exporter/exporter.py
@@ -14,15 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import absolute_import
 import argparse
 import json
 import logging
 import sys
 
-import collector
 from prometheus_client import generate_latest, make_wsgi_app, REGISTRY
 from wsgiref.simple_server import make_server
-
+from . import collector
 
 log = logging.getLogger(__name__)
 SUPPORTED_DAEMONS = ('broker', 'historical', 'coordinator')

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib8f21c7fd9311f30b5c2d7128485fefeddfa6ec6
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/dumps[master]: remove check for config file existence in cli utils

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: remove check for config file existence in cli utils
..


remove check for config file existence in cli utils

The underlying scripts will catch it, and with the new override
syntax the check no longer works.

Change-Id: Iaad9f0051c5ca4733ed61d974d17bb5dc493d596
---
M xmldumps-backup/do_7z_jobs.sh
M xmldumps-backup/do_pagerange_content_jobs.sh
2 files changed, 0 insertions(+), 8 deletions(-)

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



diff --git a/xmldumps-backup/do_7z_jobs.sh b/xmldumps-backup/do_7z_jobs.sh
index 57043bd..eac6b92 100755
--- a/xmldumps-backup/do_7z_jobs.sh
+++ b/xmldumps-backup/do_7z_jobs.sh
@@ -69,10 +69,6 @@
 if [ -z "$WIKI" -o -z "$JOBINFO" -o -z "$DATE" -o -z "$CONFIGFILE" -o -z 
"$NUMJOBS" ]; then
 echo "$0: Mandatory options 'wiki', 'jobinfo', 'date', 'numjobs' and 
'config' must be specified"
 usage && exit 1
-elif [ ! -f "$CONFIGFILE" ]; then
-echo "Could not find config file: $CONFIGFILE"
-echo "Exiting..."
-exit 1
 fi
 # sanity check of date
 result=`date -d "$DATE"`
diff --git a/xmldumps-backup/do_pagerange_content_jobs.sh 
b/xmldumps-backup/do_pagerange_content_jobs.sh
index 6335dbc..8de912b 100644
--- a/xmldumps-backup/do_pagerange_content_jobs.sh
+++ b/xmldumps-backup/do_pagerange_content_jobs.sh
@@ -72,10 +72,6 @@
 if [ -z "$WIKI" -o -z "$JOBINFO" -o -z "$DATE" -o -z "$CONFIGFILE" -o -z 
"$NUMJOBS" ]; then
 echo "$0: Mandatory options 'wiki', 'jobinfo', 'date', 'numjobs' and 
'config' must be specified"
 usage
-elif [ ! -f "$CONFIGFILE" ]; then
-echo "Could not find config file: $CONFIGFILE"
-echo "Exiting..."
-exit 1
 fi
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaad9f0051c5ca4733ed61d974d17bb5dc493d596
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
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...druid_exporter[debian]: Release version 0.2

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Release version 0.2
..


Release version 0.2

Change-Id: I04d9f7806dec64544e3781edfe9f5aa55518d0c1
---
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 b59ce6f..8348ef1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+prometheus-druid-exporter (0.2-1) unstable; urgency=low
+
+  * Fix import of local libraries for python3
+
+ -- Luca Toscano   Mon, 20 Nov 2017 10:53:36 +
+
 prometheus-druid-exporter (0.1-1) unstable; urgency=low
 
   * Initial packaging

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04d9f7806dec64544e3781edfe9f5aa55518d0c1
Gerrit-PatchSet: 2
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/puppet[production]: Revert "install_server: Reimage db1063"

2017-11-20 Thread Marostegui (Code Review)

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

Change subject: Revert "install_server: Reimage db1063"
..


Revert "install_server: Reimage db1063"

This reverts commit 84344af48fb445c3754e60c1d2352158a0bf6d6d.

Change-Id: Idc2dc1b72829c47c701b0b7b1f91846910e06adc
---
M modules/install_server/files/autoinstall/netboot.cfg
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/install_server/files/autoinstall/netboot.cfg 
b/modules/install_server/files/autoinstall/netboot.cfg
index 979be93..a0dfc3f 100755
--- a/modules/install_server/files/autoinstall/netboot.cfg
+++ b/modules/install_server/files/autoinstall/netboot.cfg
@@ -64,7 +64,7 @@
 conf200[123]) echo partman/raid1-lvm-ext4-srv.cfg ;; \
 cp1008|cp300[3-9]|cp3010) echo partman/varnish-oldssd.cfg ;; \
 cp[12345][0-9][0-9][0-9]) echo partman/varnish.cfg ;; \
-db1059|db109[6-9]|db110[0-9]|db111[0-2]|db1063) echo partman/db.cfg ;; 
\
+db1059|db109[6-9]|db110[0-9]|db111[0-2]) echo partman/db.cfg ;; \
 db207[1-9]|db208[0-9]|db209[0-2]) echo partman/db.cfg ;; \
 
db[0-8][0-9]|db10[0-8][0-9]|db109[0-5]|db110[78]|db20[0-2][0-9]|db2030|db203[3-9]|db20[4-7][0-9]|dbstore[1-2]00[1-9]|es[1-2]01[1-9])
 echo partman/db-no-srv-format.cfg ;; \
 deploy[12]001|flerovium|furud) echo 
partman/raid1-lvm-ext4-srv-noswap.cfg;; \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idc2dc1b72829c47c701b0b7b1f91846910e06adc
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/dumps[master]: remove check for config file existence in cli utils

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: remove check for config file existence in cli utils
..

remove check for config file existence in cli utils

The underlying scripts will catch it, and with the new override
syntax the check no longer works.

Change-Id: Iaad9f0051c5ca4733ed61d974d17bb5dc493d596
---
M xmldumps-backup/do_7z_jobs.sh
M xmldumps-backup/do_pagerange_content_jobs.sh
2 files changed, 0 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps 
refs/changes/87/392387/1

diff --git a/xmldumps-backup/do_7z_jobs.sh b/xmldumps-backup/do_7z_jobs.sh
index 57043bd..eac6b92 100755
--- a/xmldumps-backup/do_7z_jobs.sh
+++ b/xmldumps-backup/do_7z_jobs.sh
@@ -69,10 +69,6 @@
 if [ -z "$WIKI" -o -z "$JOBINFO" -o -z "$DATE" -o -z "$CONFIGFILE" -o -z 
"$NUMJOBS" ]; then
 echo "$0: Mandatory options 'wiki', 'jobinfo', 'date', 'numjobs' and 
'config' must be specified"
 usage && exit 1
-elif [ ! -f "$CONFIGFILE" ]; then
-echo "Could not find config file: $CONFIGFILE"
-echo "Exiting..."
-exit 1
 fi
 # sanity check of date
 result=`date -d "$DATE"`
diff --git a/xmldumps-backup/do_pagerange_content_jobs.sh 
b/xmldumps-backup/do_pagerange_content_jobs.sh
index 6335dbc..8de912b 100644
--- a/xmldumps-backup/do_pagerange_content_jobs.sh
+++ b/xmldumps-backup/do_pagerange_content_jobs.sh
@@ -72,10 +72,6 @@
 if [ -z "$WIKI" -o -z "$JOBINFO" -o -z "$DATE" -o -z "$CONFIGFILE" -o -z 
"$NUMJOBS" ]; then
 echo "$0: Mandatory options 'wiki', 'jobinfo', 'date', 'numjobs' and 
'config' must be specified"
 usage
-elif [ ! -f "$CONFIGFILE" ]; then
-echo "Could not find config file: $CONFIGFILE"
-echo "Exiting..."
-exit 1
 fi
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaad9f0051c5ca4733ed61d974d17bb5dc493d596
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] wikimedia/portals[master]: Assets build - 2017-11-20 09:24:05+00:00

2017-11-20 Thread PortalsBuilder (Code Review)

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

Change subject: Assets build - 2017-11-20 09:24:05+00:00
..

Assets build - 2017-11-20 09:24:05+00:00

Change-Id: I00d0af4af6e4ff9057d30176151a945759667888
---
M data/site-stats.json
M dev/wikipedia.org/assets/css/sprite.css
M dev/wikipedia.org/assets/css/style.css
D dev/wikipedia.org/assets/img/sprite-2b30cd2d.png
D dev/wikipedia.org/assets/img/sprite-2b30cd2d.svg
A dev/wikipedia.org/assets/img/sprite-6e35f464.png
A dev/wikipedia.org/assets/img/sprite-6e35f464.svg
A prod/wikipedia.org/assets/img/Wikinews-logo_sister.png
A prod/wikipedia.org/assets/img/wikinews-logo_sis...@2x.png
M prod/wikipedia.org/assets/img/Wikipedia-logo-v2.png
M prod/wikipedia.org/assets/img/wikipedia-logo...@1.5x.png
M prod/wikipedia.org/assets/img/wikipedia-logo...@2x.png
A prod/wikipedia.org/assets/img/sprite-6e35f464.png
A prod/wikipedia.org/assets/img/sprite-6e35f464.svg
D prod/wikipedia.org/assets/l10n/ab-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ab-d3866765.json
D prod/wikipedia.org/assets/l10n/ace-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ace-d3866765.json
D prod/wikipedia.org/assets/l10n/af-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/af-d3866765.json
D prod/wikipedia.org/assets/l10n/ak-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ak-d3866765.json
D prod/wikipedia.org/assets/l10n/als-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/als-d3866765.json
D prod/wikipedia.org/assets/l10n/am-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/am-d3866765.json
D prod/wikipedia.org/assets/l10n/an-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/an-d3866765.json
D prod/wikipedia.org/assets/l10n/ang-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ang-d3866765.json
D prod/wikipedia.org/assets/l10n/ar-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ar-d3866765.json
D prod/wikipedia.org/assets/l10n/arc-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/arc-d3866765.json
D prod/wikipedia.org/assets/l10n/arz-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/arz-d3866765.json
D prod/wikipedia.org/assets/l10n/as-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/as-d3866765.json
D prod/wikipedia.org/assets/l10n/ast-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ast-d3866765.json
D prod/wikipedia.org/assets/l10n/av-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/av-d3866765.json
D prod/wikipedia.org/assets/l10n/ay-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ay-d3866765.json
D prod/wikipedia.org/assets/l10n/az-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/az-d3866765.json
D prod/wikipedia.org/assets/l10n/azb-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/azb-d3866765.json
D prod/wikipedia.org/assets/l10n/ba-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ba-d3866765.json
D prod/wikipedia.org/assets/l10n/bar-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bar-d3866765.json
D prod/wikipedia.org/assets/l10n/bat-smg-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bat-smg-d3866765.json
D prod/wikipedia.org/assets/l10n/bcl-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bcl-d3866765.json
D prod/wikipedia.org/assets/l10n/be-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/be-d3866765.json
D prod/wikipedia.org/assets/l10n/bg-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bg-d3866765.json
D prod/wikipedia.org/assets/l10n/bh-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bh-d3866765.json
D prod/wikipedia.org/assets/l10n/bi-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bi-d3866765.json
D prod/wikipedia.org/assets/l10n/bjn-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bjn-d3866765.json
D prod/wikipedia.org/assets/l10n/bm-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bm-d3866765.json
D prod/wikipedia.org/assets/l10n/bn-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bn-d3866765.json
D prod/wikipedia.org/assets/l10n/bo-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bo-d3866765.json
D prod/wikipedia.org/assets/l10n/bpy-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bpy-d3866765.json
D prod/wikipedia.org/assets/l10n/br-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/br-d3866765.json
D prod/wikipedia.org/assets/l10n/bs-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bs-d3866765.json
D prod/wikipedia.org/assets/l10n/bug-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bug-d3866765.json
D prod/wikipedia.org/assets/l10n/bxr-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/bxr-d3866765.json
D prod/wikipedia.org/assets/l10n/ca-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ca-d3866765.json
D prod/wikipedia.org/assets/l10n/cbk-zam-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/cbk-zam-d3866765.json
D prod/wikipedia.org/assets/l10n/cdo-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/cdo-d3866765.json
D prod/wikipedia.org/assets/l10n/ce-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ce-d3866765.json
D prod/wikipedia.org/assets/l10n/ceb-99bbc3a1.json
A prod/wikipedia.org/assets/l10n/ceb-d3866765.json
D

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Set wgCommentTableSchemaMigrationStage for some RevisionTests

2017-11-20 Thread Addshore (Code Review)

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

Change subject: Set wgCommentTableSchemaMigrationStage for some RevisionTests
..

Set wgCommentTableSchemaMigrationStage for some RevisionTests

Bug: T180922
Change-Id: Ib88b53e36a66042b3c177cae0663040b4fb14a4c
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/90/392390/1

diff --git a/tests/phpunit/includes/RevisionTest.php 
b/tests/phpunit/includes/RevisionTest.php
index 6965f09..d933d93 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -372,6 +372,7 @@
 * @covers Revision::fetchFromConds
 */
public function testFetchFromConds( $flags, array $options ) {
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$conditions = [ 'conditionsArray' ];
 
$db = $this->getMock( IDatabase::class );
@@ -650,6 +651,7 @@
public function testSelectFields( $contentHandlerUseDB, $expected ) {
$this->hideDeprecated( 'Revision::selectFields' );
$this->setMwGlobals( 'wgContentHandlerUseDB', 
$contentHandlerUseDB );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals( $expected, Revision::selectFields() );
}
 
@@ -708,6 +710,7 @@
public function testSelectArchiveFields( $contentHandlerUseDB, 
$expected ) {
$this->hideDeprecated( 'Revision::selectArchiveFields' );
$this->setMwGlobals( 'wgContentHandlerUseDB', 
$contentHandlerUseDB );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals( $expected, Revision::selectArchiveFields() 
);
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib88b53e36a66042b3c177cae0663040b4fb14a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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]: Revert "[cirrus] disable token count router"

2017-11-20 Thread DCausse (Code Review)

Hello Urbanecm, Hashar, jenkins-bot, Zoranzoki21,

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

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

to review the following change.


Change subject: Revert "[cirrus] disable token count router"
..

Revert "[cirrus] disable token count router"

This reverts commit fc9dd903a51828e820ef66470c1231daac7a0b75.

Bug: T180805
Change-Id: I79dee8a00f5232f4b63e43a737461662e4a8e5cb
---
M wmf-config/CirrusSearch-common.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/CirrusSearch-common.php 
b/wmf-config/CirrusSearch-common.php
index ac6183f..e441816 100644
--- a/wmf-config/CirrusSearch-common.php
+++ b/wmf-config/CirrusSearch-common.php
@@ -85,7 +85,7 @@
'super_detect_noop_enable_native' => true,
'id_hash_mod_filter' => true,
'documentVersion' => true,
-   'token_count_router' => false,
+   'token_count_router' => true,
 ];
 
 # Enable the "experimental" highlighter on all wikis

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Tests for TitleValue::__toString

2017-11-20 Thread Addshore (Code Review)

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

Change subject: Tests for TitleValue::__toString
..

Tests for TitleValue::__toString

Change-Id: Ibb157b8e6e4fdc75bdb27ecaa4a552304465c4b2
---
M tests/phpunit/includes/title/TitleValueTest.php
1 file changed, 29 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/91/392391/1

diff --git a/tests/phpunit/includes/title/TitleValueTest.php 
b/tests/phpunit/includes/title/TitleValueTest.php
index 4dbda74..f833554 100644
--- a/tests/phpunit/includes/title/TitleValueTest.php
+++ b/tests/phpunit/includes/title/TitleValueTest.php
@@ -116,4 +116,33 @@
 
$this->assertEquals( $text, $title->getText() );
}
+
+   public function provideTestToString() {
+   yield [
+   new TitleValue( 0, 'Foo' ),
+   '0:Foo'
+   ];
+   yield [
+   new TitleValue( 1, 'Bar_Baz' ),
+   '1:Bar_Baz'
+   ];
+   yield [
+   new TitleValue( 9, 'JoJo', 'Frag' ),
+   '9:JoJo#Frag'
+   ];
+   yield [
+   new TitleValue( 200, 'tea', 'Fragment', 'wikicode' ),
+   'wikicode:200:tea#Fragment'
+   ];
+   }
+
+   /**
+* @dataProvider provideTestToString
+*/
+   public function testToString( TitleValue $value, $expected ) {
+   $this->assertSame(
+   $expected,
+   $value->__toString()
+   );
+   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb157b8e6e4fdc75bdb27ecaa4a552304465c4b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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/puppet[production]: don't produce flow history dump during partial dump runs

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: don't produce flow history dump during partial dump runs
..


don't produce flow history dump during partial dump runs

These partial runs are supposed to be relatively fast, without
full history revisions of anything.  We'll still dump flow history
during the full run at the beginning of the month.

Change-Id: I42dd49fc0aaebfd2ada8a10dae8f5039dc6bc3ef
---
M modules/snapshot/manifests/dumps/stagesconfig.pp
1 file changed, 2 insertions(+), 1 deletion(-)

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



diff --git a/modules/snapshot/manifests/dumps/stagesconfig.pp 
b/modules/snapshot/manifests/dumps/stagesconfig.pp
index 51f0967..6a033be 100644
--- a/modules/snapshot/manifests/dumps/stagesconfig.pp
+++ b/modules/snapshot/manifests/dumps/stagesconfig.pp
@@ -13,7 +13,8 @@
 $jobs_to_skip = join(['metahistorybz2dump',
   'metahistorybz2dumprecombine',
   'metahistory7zdump',
-  'metahistory7zdumprecombine'], ',')
+  'metahistory7zdumprecombine',
+  'xmlflowhistorydump'], ',')
 
 $stages = {
 smallwikis   => {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I42dd49fc0aaebfd2ada8a10dae8f5039dc6bc3ef
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: ArielGlenn 
Gerrit-Reviewer: ArielGlenn 
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]: prometheus: add mtail/exim jobs

2017-11-20 Thread Filippo Giunchedi (Code Review)

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

Change subject: prometheus: add mtail/exim jobs
..


prometheus: add mtail/exim jobs

Bug: T179565
Change-Id: Icb84db51dea05a98cb4770068466db2d819a5cce
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 18 insertions(+), 1 deletion(-)

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



diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index f2c9ed5..a887dce 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -549,6 +549,23 @@
 site   => $::site,
 }
 
+$mtail_jobs = [
+  {
+'job_name'=> 'mtail',
+'scheme'  => 'http',
+'file_sd_configs' => [
+  { 'files' => [ "${targets_path}/mtail_*.yaml" ]}
+],
+  },
+]
+
+prometheus::class_config{ "mtail_mx_${::site}":
+dest   => "${targets_path}/mtail_mx_${::site}.yaml",
+site   => $::site,
+class_name => 'role::mail::mx',
+port   => '3903',
+}
+
 prometheus::server { 'ops':
 storage_encoding  => '2',
 listen_address=> '127.0.0.1:9900',
@@ -559,7 +576,7 @@
 $mysql_jobs, $varnish_jobs, $memcached_jobs, $hhvm_jobs,
 $apache_jobs, $etcd_jobs, $etcdmirror_jobs, $pdu_jobs,
 $nginx_jobs, $pybal_jobs, $blackbox_jobs, $jmx_exporter_jobs,
-$redis_jobs,
+$redis_jobs, $mtail_jobs,
 ),
 global_config_extra   => $config_extra,
 }

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: prometheus: fix relabeling for redis jobs

2017-11-20 Thread Filippo Giunchedi (Code Review)

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

Change subject: prometheus: fix relabeling for redis jobs
..

prometheus: fix relabeling for redis jobs

Bug: T148637
Change-Id: If1b2ca9c8fc61e4ae9a8fb3f504778c1347e623e
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 2 insertions(+), 5 deletions(-)


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

diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index f2c9ed5..f73a933 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -527,11 +527,8 @@
 # redis_exporter runs alongside each redis instance, thus drop the 
(uninteresting in this
 # case) 'addr' and 'alias' labels
 'metric_relabel_configs' => [
-  { 'source_labels' => ['addr'],
-'action'=> 'labeldrop',
-  },
-  { 'source_labels' => ['alias'],
-'action'=> 'labeldrop',
+  { 'regex'  => '(addr|alias)',
+'action' => 'labeldrop',
   },
 ],
   },

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: servermon.rb: Parse puppet.conf

2017-11-20 Thread Alexandros Kosiaris (Code Review)

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

Change subject: servermon.rb: Parse puppet.conf
..

servermon.rb: Parse puppet.conf

Starting with puppet 4, active record support is fully removed from
the puppet codebase. That means that querying the puppet object for
database server configuration no longer works. Instead, parse on our own
the puppet.conf configuration file. This is not very performant, despite
the file slurping implementation, especially as far as open/close file
operations go. That being said, the number of actual config file
parsings in our environment is going in the order of low tens per minute,
which is deemed low enough to not cause issues.

Bug: T177254
Change-Id: I571f071bdc1df1fee9eaa71d358fba2b76ea6fad
---
M modules/puppetmaster/lib/puppet/reports/servermon.rb
1 file changed, 18 insertions(+), 5 deletions(-)


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

diff --git a/modules/puppetmaster/lib/puppet/reports/servermon.rb 
b/modules/puppetmaster/lib/puppet/reports/servermon.rb
index 03f7772..2612763 100644
--- a/modules/puppetmaster/lib/puppet/reports/servermon.rb
+++ b/modules/puppetmaster/lib/puppet/reports/servermon.rb
@@ -28,11 +28,24 @@
 desc 'Update facts of a servermon database'
 
 def process
-# Get our users from the configuration
-dbserver = Puppet[:dbserver]
-dbuser = Puppet[:dbuser]
-dbpassword = Puppet[:dbpassword]
-log_level = Puppet[:log_level]
+# Starting with puppet 4 active record settings no longer exist. So, 
parse
+# them from the configuration file. Previously we could just query the
+# Puppet object
+config = File.open('/etc/puppet/puppet.conf')
+lines = config.readlines()
+config.close()
+lines.each do |line|
+  case
+  when line =~ /^dbserver=(.*)$/
+dbserver = $~[1]
+  when line =~ /^dbuser=(.*)$/
+dbuser = $~[1]
+  when line =~ /^dbpassword=(.*)$/
+dbpassword = $~[1]
+  when line =~ /^log_level=(.*)$/
+log_level = $~[1]
+  end
+end
 begin
 con = Mysql.new dbserver, dbuser, dbpassword, 'puppet'
 # First we try to update the host, if it fails, insert it

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikisource[master]: Use json extension for .stylelintrc

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Use json extension for .stylelintrc
..


Use json extension for .stylelintrc

Bug: T173516
Change-Id: Id8b577c878231947ca061aebd4fdd03cbad735da
---
R .stylelintrc.json
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  WMDE-Fisch: Looks good to me, but someone else must approve
  jenkins-bot: Verified



diff --git a/.stylelintrc b/.stylelintrc.json
similarity index 100%
rename from .stylelintrc
rename to .stylelintrc.json

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8b577c878231947ca061aebd4fdd03cbad735da
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikisource
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
Gerrit-Reviewer: Hashar 
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]: prometheus: fix relabeling for redis jobs

2017-11-20 Thread Filippo Giunchedi (Code Review)

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

Change subject: prometheus: fix relabeling for redis jobs
..


prometheus: fix relabeling for redis jobs

Bug: T148637
Change-Id: If1b2ca9c8fc61e4ae9a8fb3f504778c1347e623e
---
M modules/role/manifests/prometheus/ops.pp
1 file changed, 2 insertions(+), 5 deletions(-)

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



diff --git a/modules/role/manifests/prometheus/ops.pp 
b/modules/role/manifests/prometheus/ops.pp
index a887dce..451961e 100644
--- a/modules/role/manifests/prometheus/ops.pp
+++ b/modules/role/manifests/prometheus/ops.pp
@@ -527,11 +527,8 @@
 # redis_exporter runs alongside each redis instance, thus drop the 
(uninteresting in this
 # case) 'addr' and 'alias' labels
 'metric_relabel_configs' => [
-  { 'source_labels' => ['addr'],
-'action'=> 'labeldrop',
-  },
-  { 'source_labels' => ['alias'],
-'action'=> 'labeldrop',
+  { 'regex'  => '(addr|alias)',
+'action' => 'labeldrop',
   },
 ],
   },

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If1b2ca9c8fc61e4ae9a8fb3f504778c1347e623e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi 
Gerrit-Reviewer: Filippo Giunchedi 
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...Vector[master]: Restore indicator for menuForceShow of tab menus

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Restore indicator for menuForceShow of tab menus
..


Restore indicator for menuForceShow of tab menus

The previous indicator was removed in 7a42af066b because of a position
transition. The new indicator has no animation.

An indicator is useful to distinguish between the hover and the click
actions.

Change-Id: Icf765d4985aea36e4f4f6653e769aafaf3c30d07
---
M components/tabs.less
1 file changed, 6 insertions(+), 2 deletions(-)

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



diff --git a/components/tabs.less b/components/tabs.less
index 5e162dd..006bcbb 100644
--- a/components/tabs.less
+++ b/components/tabs.less
@@ -145,12 +145,12 @@
&:after {
content: '';
position: absolute;
-   top: 0;
+   top: 1.25em;
right: 0;
bottom: 0;
left: 0;
.background-image-svg('images/arrow-down.svg', 
'images/arrow-down.png');
-   background-position: 100% 87%;
+   background-position: 100% 50%;
background-repeat: no-repeat;
// Modify the color of the image from the default #222 
to approx. #444 to match the text.
opacity: 0.85;
@@ -167,6 +167,10 @@
}
 }
 
+div.vectorMenu.menuForceShow h3 span:after {
+   transform: scaleY( -1 );
+}
+
 div.vectorMenu div.menu {
// Match the width of the dropdown "heading" (the tab)
min-width: 100%;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Icf765d4985aea36e4f4f6653e769aafaf3c30d07
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/skins/Vector
Gerrit-Branch: master
Gerrit-Owner: Fomafix 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: VolkerE 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...PronunciationRecording[master]: Use tabs in json

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Use tabs in json
..


Use tabs in json

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

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



diff --git a/.stylelintrc.json b/.stylelintrc.json
index 0fc57dc..2c90730 100644
--- a/.stylelintrc.json
+++ b/.stylelintrc.json
@@ -1,3 +1,3 @@
 {
-"extends": "stylelint-config-wikimedia"
+   "extends": "stylelint-config-wikimedia"
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic3b8f2ba738ae6447facfb87946a81a7878506b0
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PronunciationRecording
Gerrit-Branch: master
Gerrit-Owner: Umherirrender 
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] operations/puppet[production]: icinga: remove display_name

2017-11-20 Thread Volans (Code Review)

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

Change subject: icinga: remove display_name
..

icinga: remove display_name

* Remove unused display_name parameter.

Bug: T170353
Change-Id: Iab0fa78741c451370cdfe9c8b6bd4bb13ebe9f34
---
M modules/monitoring/manifests/service.pp
1 file changed, 0 insertions(+), 2 deletions(-)


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

diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index f6b4c77..4d7faa5 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -14,7 +14,6 @@
 $config_dir= '/etc/nagios',
 $event_handler = undef,
 $notifications_enabled = $::profile::base::notifications_enabled,
-$display_name  = undef,
 $notes_url = undef,
 )
 {
@@ -105,7 +104,6 @@
 check_freshness=> $check_fresh,
 freshness_threshold=> $is_fresh,
 event_handler  => $event_handler,
-display_name   => $display_name,
 notes_url  => $notes_url,
 },
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iab0fa78741c451370cdfe9c8b6bd4bb13ebe9f34
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]: icinga: convert display_name in notes_url

2017-11-20 Thread Volans (Code Review)

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

Change subject: icinga: convert display_name in notes_url
..

icinga: convert display_name in notes_url

* Use the more suitable notes_url for storing the links to Grafana
  dashboards.
* Temporarily leaving the display_name to avoid puppet failures, will
  be removed in a subsequent commit.

Bug: T170353
Change-Id: Ic883d68421476296a310e5e07ed3d2a5a670c6c6
---
M modules/monitoring/manifests/check_prometheus.pp
M modules/monitoring/manifests/graphite_anomaly.pp
M modules/monitoring/manifests/graphite_threshold.pp
M modules/monitoring/manifests/service.pp
4 files changed, 5 insertions(+), 21 deletions(-)


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

diff --git a/modules/monitoring/manifests/check_prometheus.pp 
b/modules/monitoring/manifests/check_prometheus.pp
index 70ca4e6..8039de2 100644
--- a/modules/monitoring/manifests/check_prometheus.pp
+++ b/modules/monitoring/manifests/check_prometheus.pp
@@ -96,12 +96,6 @@
 default => 'check_prometheus',
 }
 
-if $dashboard_link {
-$display_name = "${description} - ${dashboard_link}"
-} else {
-$display_name = undef
-}
-
 monitoring::service { $title:
 ensure=> $ensure,
 description   => $description,
@@ -110,6 +104,6 @@
 group => $group,
 critical  => $nagios_critical,
 contact_group => $contact_group,
-display_name  => $display_name,
+notes_url => $dashboard_link,
 }
 }
diff --git a/modules/monitoring/manifests/graphite_anomaly.pp 
b/modules/monitoring/manifests/graphite_anomaly.pp
index e5e2f25..02a1213 100644
--- a/modules/monitoring/manifests/graphite_anomaly.pp
+++ b/modules/monitoring/manifests/graphite_anomaly.pp
@@ -83,12 +83,6 @@
 fail("single quotes will be stripped from graphite metric ${metric}, 
consider using double quotes")
 }
 
-if $dashboard_link {
-$display_name = "${description} - ${dashboard_link}"
-} else {
-$display_name = undef
-}
-
 # checkcommands.cfg's check_graphite_anomaly command has
 # many positional arguments that
 # are passed to the check_graphite script:
@@ -111,6 +105,6 @@
 check_interval => $check_interval,
 retry_interval => $retry_interval,
 contact_group  => $contact_group,
-display_name   => $display_name,
+notes_url  => $dashboard_link,
 }
 }
diff --git a/modules/monitoring/manifests/graphite_threshold.pp 
b/modules/monitoring/manifests/graphite_threshold.pp
index 5a0ddb2..aed4ff6 100644
--- a/modules/monitoring/manifests/graphite_threshold.pp
+++ b/modules/monitoring/manifests/graphite_threshold.pp
@@ -103,12 +103,6 @@
 default => 'check_graphite_threshold'
 }
 
-if $dashboard_link {
-$display_name = "${description} - ${dashboard_link}"
-} else {
-$display_name = undef
-}
-
 monitoring::service { $title:
 ensure => $ensure,
 description=> $description,
@@ -121,6 +115,6 @@
 check_interval => $check_interval,
 retry_interval => $retry_interval,
 contact_group  => $contact_group,
-display_name   => $display_name,
+notes_url  => $dashboard_link,
 }
 }
diff --git a/modules/monitoring/manifests/service.pp 
b/modules/monitoring/manifests/service.pp
index 0cba968..f6b4c77 100644
--- a/modules/monitoring/manifests/service.pp
+++ b/modules/monitoring/manifests/service.pp
@@ -15,6 +15,7 @@
 $event_handler = undef,
 $notifications_enabled = $::profile::base::notifications_enabled,
 $display_name  = undef,
+$notes_url = undef,
 )
 {
 # the list of characters is the default for illegal_object_name_chars
@@ -105,6 +106,7 @@
 freshness_threshold=> $is_fresh,
 event_handler  => $event_handler,
 display_name   => $display_name,
+notes_url  => $notes_url,
 },
 }
 # This is a hack. We detect if we are running on the scope of an icinga

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic883d68421476296a310e5e07ed3d2a5a670c6c6
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]: netbox: rename duplicate Icinga check

2017-11-20 Thread Volans (Code Review)

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

Change subject: netbox: rename duplicate Icinga check
..

netbox: rename duplicate Icinga check

Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
---
M modules/profile/manifests/netbox.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/10/392410/1

diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 63be3f7..c62b03a 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -122,7 +122,7 @@
 
   monitoring::service { 'netbox-ssl':
   ensure=> $monitoring_ensure,
-  description   => 'Netbox HTTPS',
+  description   => 'Netbox SSL',
   check_command => 'check_ssl_http_letsencrypt!netbox.wikimedia.org',
   }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
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] mediawiki/core[master]: Move styles for Special:UserRights to separate style module

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Move styles for Special:UserRights to separate style module
..


Move styles for Special:UserRights to separate style module

Bug: T180914
Change-Id: I0e3cf5e3d69f32a30e5fe6dc0d2fd964c4f5720c
---
M includes/specials/SpecialUserrights.php
M resources/Resources.php
M resources/src/mediawiki.special/mediawiki.special.css
M resources/src/mediawiki.special/mediawiki.special.userrights.css
4 files changed, 16 insertions(+), 15 deletions(-)

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



diff --git a/includes/specials/SpecialUserrights.php 
b/includes/specials/SpecialUserrights.php
index 0a712ef..4e4394d 100644
--- a/includes/specials/SpecialUserrights.php
+++ b/includes/specials/SpecialUserrights.php
@@ -140,7 +140,7 @@
$this->setHeaders();
$this->outputHeader();
 
-   $out->addModuleStyles( 'mediawiki.special' );
+   $out->addModuleStyles( 'mediawiki.special.userrights.styles' );
$this->addHelpLink( 'Help:Assigning permissions' );
 
$this->switchForm();
diff --git a/resources/Resources.php b/resources/Resources.php
index 715f339..d9fa8e0 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -2230,12 +2230,14 @@
],
],
'mediawiki.special.userrights' => [
-   'styles' => 
'resources/src/mediawiki.special/mediawiki.special.userrights.css',
'scripts' => 
'resources/src/mediawiki.special/mediawiki.special.userrights.js',
'dependencies' => [
'mediawiki.notification.convertmessagebox',
],
],
+   'mediawiki.special.userrights.styles' => [
+   'styles' => 
'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+   ],
'mediawiki.special.watchlist' => [
'scripts' => 
'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
'messages' => [
diff --git a/resources/src/mediawiki.special/mediawiki.special.css 
b/resources/src/mediawiki.special/mediawiki.special.css
index 7f3b09a..5d0ec49 100644
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ b/resources/src/mediawiki.special/mediawiki.special.css
@@ -122,16 +122,3 @@
color: #72777d;
font-size: 90%;
 }
-
-/* Special:UserRights */
-.mw-userrights-disabled {
-   color: #72777d;
-}
-.mw-userrights-groups * td,
-.mw-userrights-groups * th {
-   padding-right: 1.5em;
-}
-
-.mw-userrights-groups * th {
-   text-align: left;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.css 
b/resources/src/mediawiki.special/mediawiki.special.userrights.css
index a4b4087..acfdb56 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.css
+++ b/resources/src/mediawiki.special/mediawiki.special.userrights.css
@@ -10,3 +10,15 @@
display: inline-block;
vertical-align: middle;
 }
+
+.mw-userrights-disabled {
+   color: #72777d;
+}
+.mw-userrights-groups * td,
+.mw-userrights-groups * th {
+   padding-right: 1.5em;
+}
+
+.mw-userrights-groups * th {
+   text-align: left;
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0e3cf5e3d69f32a30e5fe6dc0d2fd964c4f5720c
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy 
Gerrit-Reviewer: Bartosz Dziewoński 
Gerrit-Reviewer: Florianschmidtwelzow 
Gerrit-Reviewer: Fomafix 
Gerrit-Reviewer: Krinkle 
Gerrit-Reviewer: Reedy 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...FileImporter[master]: More logging

2017-11-20 Thread Addshore (Code Review)

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

Change subject: More logging
..

More logging

This adds lots of logging in various places of various levels
for the FileImporter channel.
It also switched from the optional logger interfaces to requiring
one in the constructor for many services.

Each individual import operation now has logging, although
logging within the import done in the WikiRevision class will
go to a different log channel..

It would be great to be able to inject our own log channel here?
or somehow get the logs out for inclusion in our own log channel.

Bug: T180491
Change-Id: I9c5f6d977c62b17c3ef3d92d0d4580e2c1e9fbb3
---
M src/Data/FileRevision.php
M src/Data/ImportOperations.php
M src/Data/TextRevision.php
M src/Operations/FileRevisionFromRemoteUrl.php
M src/Operations/TextRevisionFromTextRevision.php
M src/Remote/MediaWiki/ApiDetailRetriever.php
M src/Remote/MediaWiki/RemoteApiImportTitleChecker.php
M src/Remote/MediaWiki/SiteTableSourceUrlChecker.php
M src/ServiceWiring.php
M src/Services/Importer.php
M src/SpecialImportFile.php
11 files changed, 158 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FileImporter 
refs/changes/11/392411/1

diff --git a/src/Data/FileRevision.php b/src/Data/FileRevision.php
index 098e02e..a53c83c 100644
--- a/src/Data/FileRevision.php
+++ b/src/Data/FileRevision.php
@@ -59,4 +59,11 @@
return $this->fields[$name];
}
 
+   /**
+* @return array
+*/
+   public function getFields() {
+   return $this->fields;
+   }
+
 }
diff --git a/src/Data/ImportOperations.php b/src/Data/ImportOperations.php
index 0a5e988..cf3029c 100644
--- a/src/Data/ImportOperations.php
+++ b/src/Data/ImportOperations.php
@@ -45,7 +45,6 @@
$this->state = self::PREPARE_RUN;
foreach ( $this->importOperations as $importOperation ) {
if ( !$importOperation->prepare() ) {
-   // TODO log?
return false;
}
}
@@ -61,7 +60,6 @@
$this->state = self::COMMIT_RUN;
foreach ( $this->importOperations as $importOperation ) {
if ( !$importOperation->commit() ) {
-   // TODO log?
return false;
}
}
diff --git a/src/Data/TextRevision.php b/src/Data/TextRevision.php
index 899bab8..ddb5a69 100644
--- a/src/Data/TextRevision.php
+++ b/src/Data/TextRevision.php
@@ -60,4 +60,11 @@
return $this->fields[$name];
}
 
+   /**
+* @return array
+*/
+   public function getFields() {
+   return $this->fields;
+   }
+
 }
diff --git a/src/Operations/FileRevisionFromRemoteUrl.php 
b/src/Operations/FileRevisionFromRemoteUrl.php
index 24ad537..96e5e75 100644
--- a/src/Operations/FileRevisionFromRemoteUrl.php
+++ b/src/Operations/FileRevisionFromRemoteUrl.php
@@ -8,6 +8,7 @@
 use FileImporter\Services\UploadBase\UploadBaseFactory;
 use FileImporter\Services\WikiRevisionFactory;
 use Http;
+use Psr\Log\LoggerInterface;
 use TempFSFile;
 use Title;
 use WikiRevision;
@@ -40,6 +41,11 @@
private $uploadBaseFactory;
 
/**
+* @var LoggerInterface
+*/
+   private $logger;
+
+   /**
 * @var WikiRevision|null
 */
private $wikiRevision;
@@ -49,13 +55,15 @@
FileRevision $fileRevision,
HttpRequestExecutor $httpRequestExecutor,
WikiRevisionFactory $wikiRevisionFactory,
-   UploadBaseFactory $uploadBaseFactory
+   UploadBaseFactory $uploadBaseFactory,
+   LoggerInterface $logger
) {
$this->plannedTitle = $plannedTitle;
$this->fileRevision = $fileRevision;
$this->httpRequestExecutor = $httpRequestExecutor;
$this->wikiRevisionFactory = $wikiRevisionFactory;
$this->uploadBaseFactory = $uploadBaseFactory;
+   $this->logger = $logger;
}
 
/**
@@ -87,7 +95,17 @@
$this->plannedTitle,
$this->wikiRevision->getFileSrc()
);
-   return $base->validateTitle() === true && $base->validateFile() 
=== true;
+
+   $result = $base->validateTitle() === true && 
$base->validateFile() === true;
+
+   if ( !$result ) {
+   $this->logger->error(
+   __METHOD__ . ' failed to prepare.',
+   $this->fileRevision->getFields()
+   );
+   }
+
+   return $result;
}
 
/**
@@ -95,7 +113,16 @@

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: cleanup hiera tree for cloud/labs things

2017-11-20 Thread Rush (Code Review)

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

Change subject: openstack: cleanup hiera tree for cloud/labs things
..


openstack: cleanup hiera tree for cloud/labs things

There are stragglers here we don't want but this is
the point in time purge we can do now.

Bug: T171494
Change-Id: I31fbc99700404efa1700f957a3c07da64a7cb1ff
---
M hieradata/codfw.yaml
M hieradata/common.yaml
M hieradata/common/monitoring.yaml
M hieradata/common/profile/openstack/main.yaml
M hieradata/eqiad.yaml
M hieradata/eqiad/profile/openstack/main/nova/network.yaml
D hieradata/hosts/labtestcontrol2001.yaml
A hieradata/hosts/labtestservices2001.yaml
M hieradata/hosts/labtestweb2001.yaml
M hieradata/labs.yaml
M hieradata/regex.yaml
A hieradata/role/codfw/wmcs/openstack/labtest/control.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/net.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/puppetmaster/frontend.yaml
A hieradata/role/codfw/wmcs/openstack/labtest/services.yaml
A hieradata/role/codfw/wmcs/openstack/labtest/virt.yaml
M hieradata/role/codfw/wmcs/openstack/labtest/web.yaml
M manifests/site.pp
18 files changed, 53 insertions(+), 295 deletions(-)

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



diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 70fa14d..c53589e 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -20,14 +20,10 @@
 
 ganglia_aggregators: install2002.wikimedia.org:10649
 
+# Cloud Services <
 #
-# LABS
-#
-labs_nova_controller: "labcontrol1001.wikimedia.org"
-labs_glance_controller: "labcontrol1001.wikimedia.org"
 labs_puppet_master: "labs-puppetmaster.wikimedia.org"
 labs_keystone_host: "labcontrol1001.wikimedia.org"
-labs_certmanager_hostname: "labservices1001.wikimedia.org"
 
 # These are the up-and-coming, better dns servers:
 labsdnsconfig:
@@ -41,6 +37,9 @@
   hostname: ldap-labs.codfw.wikimedia.org
   secondary_hostname: ldap-labs.eqiad.wikimedia.org
 
+# /> Cloud Services
+#
+
 prometheus_nodes:
   - prometheus2003.codfw.wmnet
   - prometheus2004.codfw.wmnet
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index dc9a88a..cae6896 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -300,7 +300,6 @@
   eqiad: []
 
 puppetmaster: "puppet"
-active_labstore_host: 'labstore1001'
 statistics_servers:
   - stat1004.eqiad.wmnet
   - stat1005.eqiad.wmnet
@@ -364,17 +363,8 @@
 # Used to specify writer handler for eventlogging processor producer.
 eventlogging_kafka_producer_scheme: "kafka-confluent://"
 
-# LABS
-
-labs_tld: "wmflabs"
-labs_private_ips_reverse_dns: "68.10.in-addr.arpa"
-labs_designate_hostname:  "labservices1001.wikimedia.org"
-labs_designate_hostname_secondary: _designate_hostname_secondary 
"labservices1002.wikimedia.org"
-labs_nova_api_host:  "labnet1001.eqiad.wmnet"
-labs_nova_network_host:  "labnet1001"
-labs_nova_network_ip:  "10.64.20.25"
-status_wiki_host_master: 'wikitech.wikimedia.org'
-
+# Cloud Services <
+#
 # Cumin
 profile::openstack::main::cumin::auth_group: cumin_masters
 profile::openstack::main::cumin::project_masters: []
@@ -383,65 +373,12 @@
 profile::openstack::base::keystone::public_port: 5000
 profile::openstack::main::nova::dhcp_domain: 'eqiad.wmflabs'
 
-# By default, don't allow projects to allocate public IPs; this way we can
-# let users have network admin rights, for firewall rules and such, and can
-# give them public ips by increasing their quota
-novaconfig:
-  network_host: *labsnovanetworkip
-  api_host: *labsnovaapihost
-  db_name: 'nova'
-  api_db_name: 'novaapi'
-  db_user: 'nova'
-  ldap_base_dn: 'dc=wikimedia,dc=org'
-  ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
-  ldap_proxyagent: 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
-  puppet_db_name: 'puppet'
-  puppet_db_user: 'puppet'
-  quota_floating_ips: '0'
-  libvirt_type: 'kvm'
-  my_ip: "%{::ipaddress}"
-  network_public_interface: 'eth0'
-  network_flat_interface: 'eth1.1102'
-  network_flat_tagged_base_interface: 'eth1'
-  network_flat_interface_vlan: '1102'
-  flat_network_bridge: 'br1102'
-  fixed_range: '10.68.16.0/21'
-  dhcp_start: '10.68.16.4'
-  network_public_ip: '208.80.155.255'
-  dmz_cidr: '208.80.155.0/22,10.0.0.0/8'
-
-keystoneconfig:
-  db_name: 'keystone'
-  db_user: 'keystone'
-  ldap_base_dn: 'dc=wikimedia,dc=org'
-  ldap_user_dn: 'uid=novaadmin,ou=people,dc=wikimedia,dc=org'
-  ldap_user_id_attribute: 'uid'
-  ldap_tenant_id_attribute: 'cn'
-  ldap_user_name_attribute: 'cn'
-  ldap_tenant_name_attribute: 'cn'
-  ldap_proxyagent : 'cn=proxyagent,ou=profile,dc=wikimedia,dc=org'
-  auth_protocol: 'http'
-  auth_port: '35357'
-  public_port: '5000'
-  db_host: 'm5-master.eqiad.wmnet'
-  ldap_hosts:
-- ldap-labs.eqiad.wikimedia.org
-- ldap-labs.codfw.wikimedia.org
-  token_driver: 'normal'
-
-glanceconfig:
-  db_host: 'm5-master.eqiad.wmnet'
-  bind_ip: "%{::ipaddress}"
-
-#

[MediaWiki-commits] [Gerrit] marvin[master]: Fix: don't reference the manifest in the client

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix: don't reference the manifest in the client
..


Fix: don't reference the manifest in the client

The client cannot access the asset manifest because its generated from
the client itself. Move manifest read logic back to the server but keep
the asset path generation logic in common. This patch fixes a broken
manifest require reference in the client and unintentional modification
of assets#scripts in the server.

Bug: T180893
Change-Id: Iebb827f597575932e87dd1f0e23673a92eae7f7b
---
M src/common/assets/manifest.ts
M src/server/components/html-page.tsx
2 files changed, 36 insertions(+), 48 deletions(-)

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



diff --git a/src/common/assets/manifest.ts b/src/common/assets/manifest.ts
index 7e1cd18..85964b2 100644
--- a/src/common/assets/manifest.ts
+++ b/src/common/assets/manifest.ts
@@ -1,52 +1,23 @@
-import { PRODUCTION, WEBPACK_DEV_SERVER_URL } from "./config";
-declare function __non_webpack_require__(name: string): any; // 
eslint-disable-line camelcase
-
-// The production asset manifest from the public build products or
-// the webpack-dev-server URL (which has no manifest). The former doesn't exist
-// at compilation time, so use a dynamic require to read it from the filesystem
-// at run time in production builds.
-const manifest = PRODUCTION
-  ? __non_webpack_require__("../public/assets-manifest.json")
-  : WEBPACK_DEV_SERVER_URL;
+import { Assets } from "assets-webpack-plugin";
+import { PRODUCTION, WEBPACK_DEV_SERVER_URL } from 
"../../common/assets/config";
 
 /**
  * @return The path to the asset identified by entry and extension (e.g.,
  * index.js); either a URL (development) or a filesystem path
  * (production).
  */
-export function asset(entry: string, extension: string): string {
-  if (typeof manifest === "string")
-// When the manifest is a string, it is the URL of something like
-// webpack-dev-server, so just point to there for the asset
-return `${manifest}/public/${entry}.${extension}`;
-  else if (manifest[entry] && manifest[entry][extension])
-// When it is an object, if the entry exists, just return its path
+export function asset(
+  entry: string,
+  extension: string,
+  manifest?: Assets
+): string {
+  if (manifest && manifest[entry] && manifest[entry][extension])
+// When the manifest is present and the entry exists, just return its path.
 return manifest[entry][extension];
-  else
-// If the entry is not on the asset manifest, then just point to it 
directly
-// to the static assets path (copied there as-is from src/public)
-return `/public/${entry}.${extension}`;
+
+  // When the manifest or entry doesn't exist, use the public path which points
+  // to a static file. For prod, files are copied from src/public. For dev,
+  // all assets are unhashed and served from /public/.
+  const baseURL = PRODUCTION ? "" : WEBPACK_DEV_SERVER_URL;
+  return `${baseURL}/public/${entry}.${extension}`;
 }
-
-// Note: scripts must be included in the correct order: runtime, vendor, index.
-// Example errors:
-// - No runtime:
-//
-//   vendor.js:1 Uncaught ReferenceError: webpackJsonp is not defined
-//   at vendor.js:1
-//
-// - No vendor:
-//
-//   Uncaught TypeError: Cannot read property 'call' of undefined
-//   at __webpack_require__ (runtime.js:55)
-//   at Object.0 (index.js:204)
-//   at __webpack_require__ (runtime.js:55)
-//   at webpackJsonpCallback (runtime.js:26)
-//   at index.js:1
-
-export const runtime: string = asset("runtime", "js");
-export const vendor: string = asset("vendor", "js");
-export const index: string = asset("index", "js");
-export const scripts: string[] = [runtime, vendor, index];
-
-export const style: string = asset("index", "css");
diff --git a/src/server/components/html-page.tsx 
b/src/server/components/html-page.tsx
index 12cd9b4..8ebb50e 100644
--- a/src/server/components/html-page.tsx
+++ b/src/server/components/html-page.tsx
@@ -1,6 +1,8 @@
 import { h } from "preact";
-import { asset, scripts, style } from "../../common/assets/manifest";
+import { PRODUCTION } from "../../common/assets/config";
+import { asset } from "../../common/assets/manifest";
 import { ChildrenProps } from "../../common/components/preact-utils";
+declare function __non_webpack_require__(name: string): any; // 
eslint-disable-line camelcase
 
 export interface Props extends ChildrenProps {
   // Title of the page
@@ -8,13 +10,28 @@
   chunkName: string;
 }
 
+// The production asset manifest from the public build products or
+// the webpack-dev-server URL (which has no manifest). The former doesn't exist
+// at compilation time, so use a dynamic require to read it from the filesystem
+// at run time in production builds.
+const manifest =

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: Move Contributions and ChangesList hook handlers to their de...

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Move Contributions and ChangesList hook handlers to their 
dedicated files
..


Move Contributions and ChangesList hook handlers to their dedicated files

It's just moving the code around and makes the Hook class bearably clean

Change-Id: I35247553444d595330f149c6c5b1f29165ee1e40
---
M extension.json
M includes/Hooks.php
A includes/Hooks/ChangesListHooksHandler.php
A includes/Hooks/ContributionsHooksHandler.php
A tests/phpunit/includes/Hooks/ChangesListHooksHandlerTest.php
A tests/phpunit/includes/Hooks/ContributionsHookHandlerTest.php
M tests/phpunit/includes/HooksTest.php
7 files changed, 1,339 insertions(+), 1,223 deletions(-)

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



diff --git a/extension.json b/extension.json
index c3ce04a..63f226b 100644
--- a/extension.json
+++ b/extension.json
@@ -13,6 +13,8 @@
"ORES\\Cache": "includes/Cache.php",
"ORES\\Hooks": "includes/Hooks.php",
"ORES\\Hooks\\ApiHooksHandler": 
"includes/Hooks/ApiHooksHandler.php",
+   "ORES\\Hooks\\ChangesListHooksHandler": 
"includes/Hooks/ChangesListHooksHandler.php",
+   "ORES\\Hooks\\ContributionsHooksHandler": 
"includes/Hooks/ContributionsHooksHandler.php",
"ORES\\Hooks\\PreferencesHookHandler": 
"includes/Hooks/PreferencesHookHandler.php",
"ORES\\FetchScoreJob": "includes/FetchScoreJob.php",
"ORES\\Range": "includes/Range.php",
@@ -50,19 +52,19 @@
"ORES\\Hooks::onBeforePageDisplay"
],
"ChangesListSpecialPageStructuredFilters": [
-   "ORES\\Hooks::onChangesListSpecialPageStructuredFilters"
+   
"ORES\\Hooks\\ChangesListHooksHandler::onChangesListSpecialPageStructuredFilters"
],
"ChangesListSpecialPageQuery": [
-   "ORES\\Hooks::onChangesListSpecialPageQuery"
+   
"ORES\\Hooks\\ChangesListHooksHandler::onChangesListSpecialPageQuery"
],
"ContribsPager::getQueryInfo": [
-   "ORES\\Hooks::onContribsGetQueryInfo"
+   
"ORES\\Hooks\\ContributionsHooksHandler::onContribsGetQueryInfo"
],
"EnhancedChangesListModifyBlockLineData": [
-   "ORES\\Hooks::onEnhancedChangesListModifyBlockLineData"
+   
"ORES\\Hooks\\ChangesListHooksHandler::onEnhancedChangesListModifyBlockLineData"
],
"EnhancedChangesListModifyLineData": [
-   "ORES\\Hooks::onEnhancedChangesListModifyLineData"
+   
"ORES\\Hooks\\ChangesListHooksHandler::onEnhancedChangesListModifyLineData"
],
"GetBetaFeaturePreferences": [
"ORES\\Hooks::onGetBetaFeaturePreferences"
@@ -74,7 +76,7 @@
"ORES\\Hooks::onLoadExtensionSchemaUpdates"
],
"OldChangesListRecentChangesLine": [
-   "ORES\\Hooks::onOldChangesListRecentChangesLine"
+   
"ORES\\Hooks\\ChangesListHooksHandler::onOldChangesListRecentChangesLine"
],
"RecentChange_save": [
"ORES\\Hooks::onRecentChange_save"
@@ -83,13 +85,13 @@
"ORES\\Hooks::onRecentChangesPurgeRows"
],
"SpecialContributions::formatRow::flags": [
-   "ORES\\Hooks::onSpecialContributionsFormatRowFlags"
+   
"ORES\\Hooks\\ContributionsHooksHandler::onSpecialContributionsFormatRowFlags"
],
"ContributionsLineEnding": [
-   "ORES\\Hooks::onContributionsLineEnding"
+   
"ORES\\Hooks\\ContributionsHooksHandler::onContributionsLineEnding"
],
"SpecialContributions::getForm::filters": [
-   "ORES\\Hooks::onSpecialContributionsGetFormFilters"
+   
"ORES\\Hooks\\ContributionsHooksHandler::onSpecialContributionsGetFormFilters"
]
},
"ResourceFileModulePaths": {
diff --git a/includes/Hooks.php b/includes/Hooks.php
index b0d53aa..78c71c3 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -3,29 +3,18 @@
 namespace ORES;
 
 use BetaFeatures;
-use ChangesList;
-use ChangesListBooleanFilterGroup;
-use ChangesListSpecialPage;
-use ChangesListStringOptionsFilterGroup;
-use ContribsPager;
 use DatabaseUpdater;
-use EnhancedChangesList;
 use Exception;
-use FormOptions;
 use JobQueueGroup;
-use Html;
 use IContextSource;
 use MediaWiki\Logger\LoggerFactory;
 use OutputPage;
-use RCCacheEntry;
 use

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: wikimedia-page-library -> 4.7.4

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: wikimedia-page-library -> 4.7.4
..


wikimedia-page-library -> 4.7.4

Change-Id: I7e438d889dac343042b2ab374ebcdbc05146b336
---
M app/src/main/assets/bundle.js
M app/src/main/assets/preview.js
M app/src/main/assets/wikimedia-page-library.css
M www/package-lock.json
M www/package.json
5 files changed, 22 insertions(+), 16 deletions(-)

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



diff --git a/app/src/main/assets/bundle.js b/app/src/main/assets/bundle.js
index bab059e..108fc69 100644
--- a/app/src/main/assets/bundle.js
+++ b/app/src/main/assets/bundle.js
@@ -1280,8 +1280,11 @@
   /* en > Away colours > 793128975 */
   /* en > Manchester United F.C. > 793244653 */
   /* en > Pantone > 792312384 */
-  Polyfill.querySelectorAll(element, 'div.color_swatch div, 
div[style*="position: absolute"]').forEach(function (div) {
-div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+  /* en > Wikipedia:Graphs_and_charts > 801754530 */
+  /* en > PepsiCo > 807406166 */
+  var selector = ['div.color_swatch div', 'div[style*="position: absolute"]', 
'div.barbox table div[style*="background:"]', 'div.chart 
div[style*="background-color"]', 'div.chart ul li 
span[style*="background-color"]', 'span.legend-color'].join();
+  Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
   });
 };
 
diff --git a/app/src/main/assets/preview.js b/app/src/main/assets/preview.js
index 73a1a24..51da04e 100644
--- a/app/src/main/assets/preview.js
+++ b/app/src/main/assets/preview.js
@@ -432,8 +432,11 @@
   /* en > Away colours > 793128975 */
   /* en > Manchester United F.C. > 793244653 */
   /* en > Pantone > 792312384 */
-  Polyfill.querySelectorAll(element, 'div.color_swatch div, 
div[style*="position: absolute"]').forEach(function (div) {
-div.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
+  /* en > Wikipedia:Graphs_and_charts > 801754530 */
+  /* en > PepsiCo > 807406166 */
+  var selector = ['div.color_swatch div', 'div[style*="position: absolute"]', 
'div.barbox table div[style*="background:"]', 'div.chart 
div[style*="background-color"]', 'div.chart ul li 
span[style*="background-color"]', 'span.legend-color'].join();
+  Polyfill.querySelectorAll(element, selector).forEach(function (element) {
+return element.classList.add(CONSTRAINT.DIV_DO_NOT_APPLY_BASELINE);
   });
 };
 
diff --git a/app/src/main/assets/wikimedia-page-library.css 
b/app/src/main/assets/wikimedia-page-library.css
index 64b2424..e34821f 100644
--- a/app/src/main/assets/wikimedia-page-library.css
+++ b/app/src/main/assets/wikimedia-page-library.css
@@ -3,7 +3,7 @@
 
 /* --- CSS from '/src/transform/ThemeTransform.css' --- */ 
 
- /* 
+ /*
 The styles referred to as 'baseline' in the comments below are critical 
because they ensure
 a theme colors are more universally applied even by elements colored via 
inline styles. These are
 particularly difficult to theme otherwise. We can build on top of, so to 
speak, these baseline
@@ -29,7 +29,7 @@
 }
 
 /* external anchor */
-.pagelib_theme_dark a.external, 
+.pagelib_theme_dark a.external,
 .pagelib_theme_sepia a.external {
   background-image: 
url(data:image/png;base64,iVBORw0KGgoNSUhEUgoKCAYAAACNMs+9AXNSR0IArs4c6QRnQU1BAACxjwv8YQUJcEhZcwAADsMAAA7DAcdvqGQadEVYdFNvZnR3YXJlAFBhaW50Lk5FVCB2My41LjEwMPRyoQAAAGJJREFUKFN1jdENgCAMBYmJn47Bak7DZrhTpc/XIm34OAjXA4qIgHI/dSBbLGTcOKjBryFlinGmjDQGiOF0MQkxI3v5wq6L38qR7SnsAx8ul37igPjAd+o5Oz2MRA+xY4ZSXuaW6wYouOLpAElFTkSuQmCC);
 }
@@ -47,12 +47,12 @@
 .pagelib_theme_sepia .content tr,
 .pagelib_theme_sepia .content th {
   background: #f0e6d6 !important;
-  color: #222 !important; 
+  color: #222 !important;
 }
 
 /* baseline div, span, ul, li */
 .pagelib_theme_dark .content div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_dark .content span,
+.pagelib_theme_dark .content 
span:not(.pagelib_theme_div_do_not_apply_baseline),
 .pagelib_theme_dark .content ul,
 .pagelib_theme_dark .content ol,
 .pagelib_theme_dark .content li {
@@ -60,12 +60,12 @@
   color: #f8f9fa !important;
 }
 .pagelib_theme_sepia .content 
div:not(.pagelib_theme_div_do_not_apply_baseline),
-.pagelib_theme_sepia .content span,
+.pagelib_theme_sepia .content 
span:not(.pagelib_theme_div_do_not_apply_baseline),
 .pagelib_theme_sepia .content ul,
 .pagelib_theme_sepia .content ol,
 .pagelib_theme_sepia .content li {
   background-color: inherit !important;
-  color: #222 !important; 
+  color: #222 !important;
 }
 
 /* baseline border color */
@@ -83,7 +83,7 @@
 .pagelib_theme_dark .content div.quotebox {
   background: #27292d !important;
 }
-.pagelib_theme_sepia .content blockquote, 
+.pagelib_theme_sepia .content blockquote,
 .pagelib_theme_sepia

[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] fix xml decoding

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: [bugfix] fix xml decoding
..


[bugfix] fix xml decoding

- read xml encoding from xml file if no charset is given
- use utf-8 as default
- tests added

Bug: T180915
Change-Id: I4091eb8428b2c0bffbda657ee59583857363e1d5
---
M pywikibot/comms/threadedhttp.py
M tests/http_tests.py
2 files changed, 53 insertions(+), 1 deletion(-)

Approvals:
  Merlijn van Deen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py
index 4e1f9e1..3602ce3 100644
--- a/pywikibot/comms/threadedhttp.py
+++ b/pywikibot/comms/threadedhttp.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 """Http backend layer, formerly providing a httplib2 wrapper."""
 from __future__ import absolute_import, unicode_literals
-# (C) Pywikibot team, 2007-2015
+# (C) Pywikibot team, 2007-2017
 
 __version__ = '$Id$'
 __docformat__ = 'epytext'
 
 # standard python libraries
 import codecs
+import re
 import sys
 
 if sys.version_info[0] > 2:
@@ -127,6 +128,14 @@
 elif 'json' in content_type:
 # application/json | application/sparql-results+json
 self._header_encoding = 'utf-8'
+elif 'xml' in content_type:
+header = self.raw[:100].splitlines()[0]  # bytestr in py3
+m = re.search(br'encoding=("|'
+  br"')(?P.+?)\1", header)
+if m:
+self._header_encoding = m.group('encoding').decode('utf-8')
+else:
+self._header_encoding = 'utf-8'
 else:
 self._header_encoding = None
 return self._header_encoding
diff --git a/tests/http_tests.py b/tests/http_tests.py
index ac784bf..bd296c8 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -483,6 +483,49 @@
 self.assertIsNone(req.charset)
 self.assertEqual('utf-8', req.encoding)
 
+def test_content_type_xml_without_charset(self):
+"""Test decoding without explicit charset but xml content."""
+req = CharsetTestCase._create_request()
+resp = requests.Response()
+req._data = resp
+resp._content = CharsetTestCase.UTF8_BYTES[:]
+resp.headers = {'content-type': 'text/xml'}
+self.assertIsNone(req.charset)
+self.assertEqual('utf-8', req.encoding)
+
+def test_content_type_xml_with_charset(self):
+"""Test xml content with utf-8 encoding given in content."""
+req = CharsetTestCase._create_request()
+resp = requests.Response()
+req._data = resp
+resp._content = ''.encode(
+'utf-8')
+resp.headers = {'content-type': 'text/xml'}
+self.assertIsNone(req.charset)
+self.assertEqual('UTF-8', req.encoding)
+
+def test_content_type_xml_with_charset_and_more_data(self):
+"""Test xml content with utf-8 encoding given in content."""
+req = CharsetTestCase._create_request()
+resp = requests.Response()
+req._data = resp
+resp._content = ''.encode(
+'utf-8')
+resp.headers = {'content-type': 'text/xml'}
+self.assertIsNone(req.charset)
+self.assertEqual('UTF-8', req.encoding)
+
+def test_content_type_xml_with_variant_charset(self):
+"""Test xml content with latin1 encoding given in content."""
+req = CharsetTestCase._create_request()
+resp = requests.Response()
+req._data = resp
+resp._content = "".encode(
+'latin1')
+resp.headers = {'content-type': 'text/xml'}
+self.assertIsNone(req.charset)
+self.assertEqual('latin1', req.encoding)
+
 def test_server_charset(self):
 """Test decoding with server explicit charset."""
 req = CharsetTestCase._create_request()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4091eb8428b2c0bffbda657ee59583857363e1d5
Gerrit-PatchSet: 3
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt 
Gerrit-Reviewer: John Vandenberg 
Gerrit-Reviewer: Magul 
Gerrit-Reviewer: Merlijn van Deen 
Gerrit-Reviewer: Mpaa 
Gerrit-Reviewer: Russell Blau 
Gerrit-Reviewer: Xqt 
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/mediawiki-config[master]: db-eqiad.php: Pool db1082 with low weight

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad.php: Pool db1082 with low weight
..


db-eqiad.php: Pool db1082 with low weight

Repooling db1082 with low weight after using it to clone db1109 and
db1110 and upgrading MariaDB to 10.0.33

Bug: T177208
Change-Id: I1150f9a04acba70fc01fe5509b564ec9f083c246
---
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 21ca4c2..f9e4df1 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -146,7 +146,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
# 'db1063' => 0,   # C5 2.8TB 128GB, master, crashed #T180714
# 'db1071' => 1,   # D1 2.8TB 160GB, future s8 master
-   # 'db1082' => 300, # A2 3.6TB 512GB, api #T177208
+   'db1082' => 100, # A2 3.6TB 512GB, api #T177208
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1150f9a04acba70fc01fe5509b564ec9f083c246
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/mediawiki-config[master]: mariadb: Depool db2068 for maintenance

2017-11-20 Thread Jcrespo (Code Review)

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

Change subject: mariadb: Depool db2068 for maintenance
..

mariadb: Depool db2068 for maintenance

Bug: T180927
Change-Id: Ib0f1088231ee30cb0d72c3efe914d734788b7604
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b2b29b9..24755d6 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -181,7 +181,7 @@
'db2047' => 400, # C6 2.9TB 160GB,
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
-   'db2068' => 300, # D6 3.3TB 160GB
+   # 'db2068' => 300, # D6 3.3TB 160GB, down for maintenance 
T180927
'db2077' => 400, # C1 3.3TB 512GB
'db2086:3317' => 1, # B1 3.3TB 512GB # rc, log: s5 and s7
'db2087:3317' => 1, # C1 3.3TB 512GB # rc, log: s6 and s7

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

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

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

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

2017-11-20 Thread Pmiguelpirzer (Code Review)

Pmiguelpirzer has uploaded a new change for review. ( 
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(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceChecklist 
refs/changes/33/392433/1

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

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: Address incompatbile-pointer-types

2017-11-20 Thread Hashar (Code Review)

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

Change subject: Address incompatbile-pointer-types
..

Address incompatbile-pointer-types

From gcc:

/usr/include/zlib.h:1372:24: note:
expected ‘gzFile {aka struct gzFile_s *}’
but argument is of type ‘struct gzFile_s **’

Change-Id: I6a1618a41ae1a57848a03a559be0c29021838af6
---
M xmldumps-backup/mwbzutils/findpageidinbz2xml.c
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/42/392442/1

diff --git a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c 
b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
index 94ed14d..05d0aa1 100644
--- a/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
+++ b/xmldumps-backup/mwbzutils/findpageidinbz2xml.c
@@ -197,7 +197,7 @@
This can take over two hours to uncompress and scan through looking for
the next page id, so we cheat */
 long int get_page_id_from_rev_id_via_stub(long int rev_id, char *stubfile) {
-  gzFile *gz;
+  gzFile gz;
   int page_id = -1;
   char buf[8192];
   char *bufp;

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a1618a41ae1a57848a03a559be0c29021838af6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
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/mediawiki-config[master]: db-eqiad.php: Pool db1082 with low weight

2017-11-20 Thread Marostegui (Code Review)

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

Change subject: db-eqiad.php: Pool db1082 with low weight
..

db-eqiad.php: Pool db1082 with low weight

Repooling db1082 with low weight after using it to clone db1109 and
db1110 and upgrading MariaDB to 10.0.33

Bug: T177208
Change-Id: I1150f9a04acba70fc01fe5509b564ec9f083c246
---
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/50/392450/1

diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index 21ca4c2..f9e4df1 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -146,7 +146,7 @@
'db1070' => 0,   # D1 2.8TB 160GB, master
# 'db1063' => 0,   # C5 2.8TB 128GB, master, crashed #T180714
# 'db1071' => 1,   # D1 2.8TB 160GB, future s8 master
-   # 'db1082' => 300, # A2 3.6TB 512GB, api #T177208
+   'db1082' => 100, # A2 3.6TB 512GB, api #T177208
'db1087' => 500, # C2 3.6TB 512GB
'db1092' => 500, # D2 3.6TB 512GB
'db1096' => 1,   # A6 3.6TB 512GB, watchlist, recentchanges, 
contributions, logpager #T174569

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1150f9a04acba70fc01fe5509b564ec9f083c246
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]: Add tgr to deploy-service group

2017-11-20 Thread RobH (Code Review)

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

Change subject: Add tgr to deploy-service group
..


Add tgr to deploy-service group

Bug: T180366
Change-Id: I799583a9f4a69c9ea3855f1006300aa945b60b81
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Mobrovac: Looks good to me, but someone else must approve
  BearND: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  RobH: Looks good to me, approved
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index d272410..68ee880 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -418,7 +418,7 @@
 gid: 763
 description: Service deploy users
 members: [bd808, eevans, mobrovac, ppchelko, demon, twentyafterfour, 
thcipriani, dduvall,
-  bsitzmann, mholloway-shell, kartik, halfak, ladsgroup, 
smalyshev, hoo,
+  bsitzmann, mholloway-shell, kartik, halfak, ladsgroup, 
smalyshev, hoo, tgr,
   ssastry, cscott, arlolra, jdlrobson, maxsem, awight]
 privileges: []
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I799583a9f4a69c9ea3855f1006300aa945b60b81
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Mholloway 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: BearND 
Gerrit-Reviewer: Dzahn 
Gerrit-Reviewer: Fjalapeno 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Jdlrobson 
Gerrit-Reviewer: Mobrovac 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: RobH 
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]: RCFilters: Only apply excluded label to namespace items

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: RCFilters: Only apply excluded label to namespace items
..


RCFilters: Only apply excluded label to namespace items

Bug: T180863
Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
1 file changed, 10 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
index db43a53..97000d4 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
@@ -65,7 +65,11 @@
this.excludeLabel = new OO.ui.LabelWidget( {
label: mw.msg( 'rcfilters-filter-excluded' )
} );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
 
layout = new OO.ui.FieldLayout( this.checkboxWidget, {
label: $label,
@@ -133,7 +137,11 @@
this.checkboxWidget.setSelected( this.itemModel.isSelected() );
 
this.highlightButton.toggle( 
this.filtersViewModel.isHighlightEnabled() );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Temporarily disable EventLogging refine jobs

2017-11-20 Thread Ottomata (Code Review)

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

Change subject: Temporarily disable EventLogging refine jobs
..


Temporarily disable EventLogging refine jobs

See: https://phabricator.wikimedia.org/T179625#3755242

Bug: T179625
Change-Id: I44698c1a71d576d2eb9ca5e2f676e9c8596c3a73
---
M 
modules/role/manifests/analytics_cluster/refinery/job/eventlogging_refine_test.pp
M modules/role/manifests/analytics_cluster/refinery/job/json_refine.pp
2 files changed, 4 insertions(+), 0 deletions(-)

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



diff --git 
a/modules/role/manifests/analytics_cluster/refinery/job/eventlogging_refine_test.pp
 
b/modules/role/manifests/analytics_cluster/refinery/job/eventlogging_refine_test.pp
index bd2b1f5..7630850 100644
--- 
a/modules/role/manifests/analytics_cluster/refinery/job/eventlogging_refine_test.pp
+++ 
b/modules/role/manifests/analytics_cluster/refinery/job/eventlogging_refine_test.pp
@@ -26,6 +26,8 @@
 # Starts 168 hours ago (one week), and ends 3 hours ago to avoid refining 
incomplete data.
 # Runs once every hour.
 cron { 'eventlogging-refine-test':
+# Disabled for T179625.  This class will be removed in favor of 
`event.popups` table.
+ensure  => 'absent',
 command => "spark-submit --class 
org.wikimedia.analytics.refinery.job.JsonRefine ${refinery_jar} 
--input-base-path /wmf/data/raw/eventlogging --database ${output_database} 
--output-base-path ${output_base_path} --input-regex 
'eventlogging_(.+)/hourly/(\\d+)/(\\d+)/(\\d+)/(\\d+).*' --input-capture 
'table,year,month,day,hour' --table-whitelist 'Popups' --since 168 --until 3 >> 
${eventlogging_refine_log_file} 2>&1",
 environment => "MAILTO=${mail_to}",
 user=> 'hdfs',
diff --git 
a/modules/role/manifests/analytics_cluster/refinery/job/json_refine.pp 
b/modules/role/manifests/analytics_cluster/refinery/job/json_refine.pp
index d443ef8..d1c7a3f 100644
--- a/modules/role/manifests/analytics_cluster/refinery/job/json_refine.pp
+++ b/modules/role/manifests/analytics_cluster/refinery/job/json_refine.pp
@@ -8,6 +8,8 @@
 
 # Refine EventLogging Analytics (capsule based) data.
 role::analytics_cluster::refinery::job::json_refine_job { 
'eventlogging_analytics':
+# Temporarily disabled for T179625.
+ensure   => 'absent',
 input_base_path  => '/wmf/data/raw/eventlogging',
 input_regex  => 
'eventlogging_(.+)/hourly/(\\d+)/(\\d+)/(\\d+)/(\\d+)',
 input_capture=> 'table,year,month,day,hour',

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: openstack: labs_tld is still used by instances

2017-11-20 Thread Rush (Code Review)

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

Change subject: openstack: labs_tld is still used by instances
..

openstack: labs_tld is still used by instances

Bug: T171494
Change-Id: Ic8711a36a2e8ff16c12b864648af8aef9aef3822
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index 38c08a7..8c2c104 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -366,6 +366,7 @@
 # Cloud Services <
 #
 # Cumin
+labs_tld: "wmflabs"
 profile::openstack::main::cumin::auth_group: cumin_masters
 profile::openstack::main::cumin::project_masters: []
 profile::openstack::main::cumin::project_pub_key: undef

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Tests for TitleValue::__toString

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Tests for TitleValue::__toString
..


Tests for TitleValue::__toString

Change-Id: Ibb157b8e6e4fdc75bdb27ecaa4a552304465c4b2
---
M tests/phpunit/includes/title/TitleValueTest.php
1 file changed, 29 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/title/TitleValueTest.php 
b/tests/phpunit/includes/title/TitleValueTest.php
index 4dbda74..f833554 100644
--- a/tests/phpunit/includes/title/TitleValueTest.php
+++ b/tests/phpunit/includes/title/TitleValueTest.php
@@ -116,4 +116,33 @@
 
$this->assertEquals( $text, $title->getText() );
}
+
+   public function provideTestToString() {
+   yield [
+   new TitleValue( 0, 'Foo' ),
+   '0:Foo'
+   ];
+   yield [
+   new TitleValue( 1, 'Bar_Baz' ),
+   '1:Bar_Baz'
+   ];
+   yield [
+   new TitleValue( 9, 'JoJo', 'Frag' ),
+   '9:JoJo#Frag'
+   ];
+   yield [
+   new TitleValue( 200, 'tea', 'Fragment', 'wikicode' ),
+   'wikicode:200:tea#Fragment'
+   ];
+   }
+
+   /**
+* @dataProvider provideTestToString
+*/
+   public function testToString( TitleValue $value, $expected ) {
+   $this->assertSame(
+   $expected,
+   $value->__toString()
+   );
+   }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibb157b8e6e4fdc75bdb27ecaa4a552304465c4b2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Addshore 
Gerrit-Reviewer: Daniel Kinzler 
Gerrit-Reviewer: Legoktm 
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...druid_exporter[master]: Remove incomplete query/node/* metrics

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Remove incomplete query/node/* metrics
..


Remove incomplete query/node/* metrics

While testing in production the exporter a bug came up,
namely that the query/node/* metrics are missing a label,
the 'server' one. These metrics are broker specific and are
meant to give more information to pin point latencies between
a broker and a historical to fulfill a query. This information
is redundand since the exporter already collects separated
latency/size metrics for broker and historical, and can always
be found in the logs emitted by default if a specific investigation
needs to be done.

Bug: T177459
Change-Id: Ic22cb3bda825c4b6d00a65aafc188d7bf19a2b15
---
M README.md
M druid_exporter/collector.py
M test/test_collector.py
3 files changed, 1 insertion(+), 39 deletions(-)

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



diff --git a/README.md b/README.md
index 9cf3d80..b81150c 100644
--- a/README.md
+++ b/README.md
@@ -36,8 +36,6 @@
 ### Broker, Historical (histograms)
 * `query/time` [datasource]
 * `query/bytes` [datasource]
-* `query/node/time` [datasource, server]
-* `query/node/bytes` [datasource, server]
 * `query/cache/total/numEntries`
 * `query/cache/total/sizeBytes`
 * `query/cache/total/hits`
diff --git a/druid_exporter/collector.py b/druid_exporter/collector.py
index 6b4319f..02e0c4e 100644
--- a/druid_exporter/collector.py
+++ b/druid_exporter/collector.py
@@ -38,8 +38,6 @@
 # Broker, Historical
 'query/time': ['dataSource'],
 'query/bytes': ['dataSource'],
-'query/node/time': ['dataSource', 'server'],
-'query/node/bytes': ['dataSource', 'server'],
 'query/cache/total/numEntries': None,
 'query/cache/total/sizeBytes': None,
 'query/cache/total/hits': None,
@@ -74,8 +72,6 @@
 self.metric_buckets = {
 'query/time': ['10', '100', '500', '1000', '1', 'inf', 'sum'],
 'query/bytes': ['10', '100', '500', '1000', '1', 'inf', 'sum'],
-'query/node/time': ['10', '100', '500', '1000', '1', 'inf', 
'sum'],
-'query/node/bytes': ['10', '100', '500', '1000', '1', 'inf', 
'sum'],
 }
 
 # Data structure holding histogram data
@@ -84,8 +80,6 @@
 self.histograms_metrics = set([
 'query/time',
 'query/bytes',
-'query/node/time',
-'query/node/bytes',
 ])
 
 # Data structure holding counters data
@@ -137,17 +131,7 @@
'druid_' + daemon + '_query_bytes',
'Number of bytes returned in query response.',
labels=['datasource']),
-   'query/node/time': HistogramMetricFamily(
-   'druid_' + daemon + '_query_node_time_ms',
-   'Milliseconds taken to query individual '
-   'historical/realtime nodes.',
-   labels=['datasource', 'server']),
-   'query/node/bytes': HistogramMetricFamily(
-   'druid_' + daemon + '_query_node_bytes',
-   'number of bytes returned from querying individual '
-   'historical/realtime nodes.',
-   labels=['datasource', 'server']),
-}
+}
 
 def _get_cache_counters(self, daemon):
 return {
diff --git a/test/test_collector.py b/test/test_collector.py
index 7e42256..58fa34b 100644
--- a/test/test_collector.py
+++ b/test/test_collector.py
@@ -214,26 +214,6 @@
  "remoteAddress": "10.64.5.101", "type": "segmentMetadata",
  "version": "0.9.2"},
 
-{"feed": "metrics", "timestamp": "2017-11-14T16:25:19.437Z",
- "service": "druid/broker", "host": "druid1001.eqiad.wmnet:8082",
- "metric": "query/node/time", "value": 15,
- "dataSource": "banner_activity_minutely",
- "duration": "PT3600S", "hasFilters": "false",
- "id": "39fbcfd5-d616-4313-9df0-5f2deb46ccb9",
- "interval": ["2017-11-14T16:00:00.000Z/2017-11-14T17:00:00.000Z"],
- "server": "druid1003.eqiad.wmnet:8103", "type": "timeBoundary",
- "version": "0.9.2"},
-
-{"feed": "metrics", "timestamp": "2017-11-14T16:25:19.437Z",
- "service": "druid/historical", "host": 
"druid1001.eqiad.wmnet:8082",
- "metric": "query/node/time", "value": 135,
- "dataSource": "banner_activity_minutely",
- "duration": "PT3600S", "hasFilters": "false",
- "id": "39fbcfd5-d616-4313-9df0-5f2deb46ccb9",
- "interval": ["2017-11-14T16:00:00.000Z/2017-11-14T17:00:00.000Z"],
- "server": "druid1003.eqiad.wmnet:8103", "type": "timeBoundary",
- "version": "0.9.2"},
-

[MediaWiki-commits] [Gerrit] operations...druid_exporter[master]: Bump version to 0.4

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Bump version to 0.4
..


Bump version to 0.4

Change-Id: I542b44930faac89f1dbcd86a035a3db0fa0b000f
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/setup.py b/setup.py
index 38efc51..8037025 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='druid_exporter',
-  version='0.3',
+  version='0.4',
   description='Prometheus exporter for Druid',
   url='https://github.com/wikimedia/operations-software-druid_exporter',
   author='Luca Toscano',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I542b44930faac89f1dbcd86a035a3db0fa0b000f
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/druid_exporter
Gerrit-Branch: master
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...druid_exporter[master]: Bump version to 0.4

2017-11-20 Thread Elukey (Code Review)

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

Change subject: Bump version to 0.4
..

Bump version to 0.4

Change-Id: I542b44930faac89f1dbcd86a035a3db0fa0b000f
---
M setup.py
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/setup.py b/setup.py
index 38efc51..8037025 100644
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 setup(name='druid_exporter',
-  version='0.3',
+  version='0.4',
   description='Prometheus exporter for Druid',
   url='https://github.com/wikimedia/operations-software-druid_exporter',
   author='Luca Toscano',

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Bring SQL file closer to MediaWiki style

2017-11-20 Thread Lucas Werkmeister (WMDE) (Code Review)

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

Change subject: Bring SQL file closer to MediaWiki style
..

Bring SQL file closer to MediaWiki style

Use lowercase for types, write CREATE INDEX statements in one line, and
don’t use vertical alignment.

Change-Id: I20618527155d0a75220a6c859c0640a15dbcb339
---
M sql/create_wbqc_constraints.sql
1 file changed, 5 insertions(+), 6 deletions(-)


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

diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 969cbab..2fea9e0 100644
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,9 +1,8 @@
 CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
-  constraint_guidVARBINARY(63) PRIMARY KEY,
-  pidINT(11)   NOT NULL,
-  constraint_type_qid  VARBINARY(25)   NOT NULL,
-  constraint_parametersTEXT  DEFAULT 
NULL
+  constraint_guid varbinary(63) NOT NULL,
+  pid int(11) NOT NULL,
+  constraint_type_qid varbinary(25) NOT NULL,
+  constraint_parameters text DEFAULT NULL
 ) /*$wgDBTableOptions*/;
 
-CREATE INDEX /*i*/wbqc_constraints_pid_index
-ON /*_*/wbqc_constraints (pid);
+CREATE INDEX /*i*/wbqc_constraints_pid_index ON /*_*/wbqc_constraints (pid);

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Remove CONSTRAINT_TABLE constant

2017-11-20 Thread Lucas Werkmeister (WMDE) (Code Review)

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

Change subject: Remove CONSTRAINT_TABLE constant
..

Remove CONSTRAINT_TABLE constant

There was never any mechanism to vary the value of the constant, and it
makes it harder to find code locations that access the database table
directly, so let’s just inline the value in all those locations and then
get rid of the constant.

(This also makes the generic initialization callback unnecessary, so
that’s removed as well.)

Change-Id: I2628eb46def19800f6f2f8b0931239de7d226566
---
M WikibaseQualityConstraintsHooks.php
M extension.json
M includes/ConstraintRepository.php
M tests/phpunit/ConstraintRepositoryTest.php
M tests/phpunit/ConstraintTest.php
M tests/phpunit/DelegatingConstraintCheckerTest.php
M tests/phpunit/Job/UpdateConstraintsTableJobTest.php
M tests/phpunit/Specials/SpecialConstraintReportTest.php
8 files changed, 28 insertions(+), 34 deletions(-)


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

diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 948e281..8bce16d 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -19,18 +19,13 @@
  */
 final class WikibaseQualityConstraintsHooks {
 
-   public static function onExtensionRegistration() {
-   // Define database table names
-   define( 'CONSTRAINT_TABLE', 'wbqc_constraints' );
-   }
-
/**
 * @param DatabaseUpdater $updater
 *
 * @return bool
 */
public static function onCreateSchema( DatabaseUpdater $updater ) {
-   $updater->addExtensionTable( CONSTRAINT_TABLE, __DIR__ . 
'/sql/create_wbqc_constraints.sql' );
+   $updater->addExtensionTable( 'wbqc_constraints', __DIR__ . 
'/sql/create_wbqc_constraints.sql' );
return true;
}
 
diff --git a/extension.json b/extension.json
index d9ddb69..e4bba12 100644
--- a/extension.json
+++ b/extension.json
@@ -7,7 +7,6 @@
"version": "1.0.0",
"license-name": "GPL-2.0+",
"type": "wikibase",
-   "callback": 
"WikibaseQuality\\ConstraintReport\\WikibaseQualityConstraintsHooks::onExtensionRegistration",
"MessagesDirs": {
"WikibaseQualityConstraints": [
"i18n"
diff --git a/includes/ConstraintRepository.php 
b/includes/ConstraintRepository.php
index f06bcc6..4aac97a 100644
--- a/includes/ConstraintRepository.php
+++ b/includes/ConstraintRepository.php
@@ -24,7 +24,7 @@
$db = wfGetDB( DB_REPLICA );
 
$results = $db->select(
-   CONSTRAINT_TABLE,
+   'wbqc_constraints',
'*',
[ 'pid' => $propertyId->getNumericId() ]
);
@@ -62,7 +62,7 @@
);
 
$db = wfGetDB( DB_MASTER );
-   return $db->insert( CONSTRAINT_TABLE, $accumulator );
+   return $db->insert( 'wbqc_constraints', $accumulator );
}
 
/**
@@ -89,7 +89,7 @@
public function deleteWhereConstraintIdIsUuid() {
$db = wfGetDB( DB_MASTER );
$db->delete(
-   CONSTRAINT_TABLE,
+   'wbqc_constraints',
// WHERE constraint_guid LIKE 
----
'constraint_guid ' . $db->buildLike( 
$this->uuidPattern( $db->anyChar() ) )
);
@@ -104,7 +104,7 @@
public function deleteForPropertyWhereConstraintIdIsStatementId( 
PropertyId $propertyId ) {
$db = wfGetDB( DB_MASTER );
$db->delete(
-   CONSTRAINT_TABLE,
+   'wbqc_constraints',
[
'pid' => $propertyId->getNumericId(),
// AND constraint_guid LIKE 
%$----
@@ -125,12 +125,12 @@
}
$db = wfGetDB( DB_MASTER );
if ( $db->getType() === 'sqlite' ) {
-   $db->delete( CONSTRAINT_TABLE, '*' );
+   $db->delete( 'wbqc_constraints', '*' );
} else {
do {
$db->commit( __METHOD__, 'flush' );
wfGetLBFactory()->waitForReplication();
-   $table = $db->tableName( CONSTRAINT_TABLE );
+   $table = $db->tableName( 'wbqc_constraints' );
$db->query( sprintf( 'DELETE FROM %s LIMIT %d', 
$table, $batchSize ) );
} while ( $db->affectedRows() > 0 );
}
diff --git

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseQualityConstraints[master]: Add constraint_id column to wbqc_constraints table

2017-11-20 Thread Lucas Werkmeister (WMDE) (Code Review)

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

Change subject: Add constraint_id column to wbqc_constraints table
..

Add constraint_id column to wbqc_constraints table

This adds a new, numeric column to be the primary ID of the table
instead of the constraint_guid (which is long enough that we don’t want
to use it in other table that should be joined with wbqc_constraints).

Bug: T180834
Change-Id: I3201fda882243c61eefeb40f77feb2b655e827a1
---
M WikibaseQualityConstraintsHooks.php
M sql/create_wbqc_constraints.sql
A sql/patch-wbqc_constraints-constraint_id.sql
3 files changed, 14 insertions(+), 0 deletions(-)


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

diff --git a/WikibaseQualityConstraintsHooks.php 
b/WikibaseQualityConstraintsHooks.php
index 8bce16d..317996d 100644
--- a/WikibaseQualityConstraintsHooks.php
+++ b/WikibaseQualityConstraintsHooks.php
@@ -26,6 +26,7 @@
 */
public static function onCreateSchema( DatabaseUpdater $updater ) {
$updater->addExtensionTable( 'wbqc_constraints', __DIR__ . 
'/sql/create_wbqc_constraints.sql' );
+   $updater->addExtensionField( 'wbqc_constraints', 
'constraint_id', __DIR__ . '/sql/patch-wbqc_constraints-constraint_id.sql' );
return true;
}
 
diff --git a/sql/create_wbqc_constraints.sql b/sql/create_wbqc_constraints.sql
index 2fea9e0..3fcbd1e 100644
--- a/sql/create_wbqc_constraints.sql
+++ b/sql/create_wbqc_constraints.sql
@@ -1,4 +1,5 @@
 CREATE TABLE IF NOT EXISTS /*_*/wbqc_constraints (
+  constraint_id int unsigned NOT NULL AUTO_INCREMENT PRIMARY KEY,
   constraint_guid varbinary(63) NOT NULL,
   pid int(11) NOT NULL,
   constraint_type_qid varbinary(25) NOT NULL,
@@ -6,3 +7,5 @@
 ) /*$wgDBTableOptions*/;
 
 CREATE INDEX /*i*/wbqc_constraints_pid_index ON /*_*/wbqc_constraints (pid);
+
+CREATE INDEX /*i*/wbqc_constraints_guid_index ON /*_*/wbqc_constraints 
(constraint_guid);
diff --git a/sql/patch-wbqc_constraints-constraint_id.sql 
b/sql/patch-wbqc_constraints-constraint_id.sql
new file mode 100644
index 000..4f701f5
--- /dev/null
+++ b/sql/patch-wbqc_constraints-constraint_id.sql
@@ -0,0 +1,10 @@
+--
+-- T180834: Add numeric primary key to wbqc_constraints
+-- (replacing constraint_guid as primary key)
+
+ALTER TABLE /*_*/wbqc_constraints
+  ADD COLUMN constraint_id int unsigned NOT NULL AUTO_INCREMENT FIRST,
+  DROP PRIMARY KEY,
+  ADD PRIMARY KEY (constraint_id);
+
+CREATE INDEX /*i*/wbqc_constraints_guid_index ON /*_*/wbqc_constraints 
(constraint_guid);

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Archive operations/puppet/mesos

2017-11-20 Thread Hashar (Code Review)

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

Change subject: Archive operations/puppet/mesos
..

Archive operations/puppet/mesos

Unused since May 2015. We went with Kubernetes.

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


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/34/392434/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e88258a..dfac4f3 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2483,6 +2483,10 @@
 template:
   - name: puppet-module
 
+  - name: operations/puppet/mesos
+template:
+  - name: archived
+
   - name: operations/puppet/nginx
 template:
   - name: puppet-module

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I164e86d1e0cef8182e73c8cf2dda5375a2280135
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]: Add postgresql::prometheus class

2017-11-20 Thread Alexandros Kosiaris (Code Review)

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

Change subject: Add postgresql::prometheus class
..

Add postgresql::prometheus class

Add a class to install/configured the prometheus-postgres-exporter

Bug: T177196
Change-Id: I319f1307a47bf21658fd7882d1c637bcb46690a0
---
A modules/postgresql/manifests/prometheus.pp
A modules/postgresql/templates/prometheus-postgres-exporter.default.erb
2 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/38/392438/1

diff --git a/modules/postgresql/manifests/prometheus.pp 
b/modules/postgresql/manifests/prometheus.pp
new file mode 100644
index 000..54dd80c
--- /dev/null
+++ b/modules/postgresql/manifests/prometheus.pp
@@ -0,0 +1,36 @@
+# == Class postgresql::prometheus
+# Install/configure postgresql prometheus exporter
+#
+class postgresql::prometheus(
+$prometheus_user = 'prometheus',
+$prometheus_db = 'postgres',
+$master = true,
+$ensure='present'
+) {
+require ::postgresql::server
+
+package { 'prometheus-postgres-exporter':
+ensure => $ensure,
+}
+
+postgresql::user { 'prometheus@localhost':
+ensure   => $ensure,
+user => $prometheus_user,
+database => $prometheus_db,
+type => 'all',
+method   => 'peer',
+master   => $master,
+}
+
+file { '/etc/default/prometheus-postgres-exporter':
+ensure  => $ensure,
+owner   => 'root',
+group   => 'root',
+mode=> '0444',
+content => 
template('postgres/prometheus-postgres-exporter.default.erb'),
+}
+service { 'prometheus-postgres-exporter':
+ensure => running,
+enable => true,
+}
+}
diff --git 
a/modules/postgresql/templates/prometheus-postgres-exporter.default.erb 
b/modules/postgresql/templates/prometheus-postgres-exporter.default.erb
new file mode 100644
index 000..00d37c8
--- /dev/null
+++ b/modules/postgresql/templates/prometheus-postgres-exporter.default.erb
@@ -0,0 +1,2 @@
+DATA_SOURCE_NAME='user=<%= @prometheus_user %> host=/run/postgresql dbname=<%= 
@prometheus_db %>'
+ARGS=''

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add debian-glue to some Debian packages

2017-11-20 Thread Hashar (Code Review)

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

Change subject: Add debian-glue to some Debian packages
..

Add debian-glue to some Debian packages

Bug: T180330
Change-Id: I2850cc8a4b9241c2148c86ff8e7858ac5a83a191
---
M zuul/layout.yaml
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/39/392439/1

diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2178cbd..e215313 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2176,6 +2176,14 @@
 template:
   - name: tox-jessie  # requires Java JDK 8+ for bin/keytool
 
+  - name: operations/calico-cni
+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
@@ -2251,7 +2259,9 @@
   - { name: operations/debs/pkg-php/php, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-defaults,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-redis,   test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/prometheus,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-apache-exporter,  test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/prometheus-jmx-exporter, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-memcached-exporter,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-redis-exporter,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-snmp-exporter,test: 
['debian-glue-non-voting'] }
@@ -2296,6 +2306,7 @@
   - { name: operations/debs/ruby-parallel,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/salt,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/search-qa,   test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/spark2,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/squid,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/StatsD,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/statsite,test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2850cc8a4b9241c2148c86ff8e7858ac5a83a191
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]: postgresql::user: Allow password to be undefined

2017-11-20 Thread Alexandros Kosiaris (Code Review)

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

Change subject: postgresql::user: Allow password to be undefined
..

postgresql::user: Allow password to be undefined

Allow password to be undefined, meaning we will never set a password for
the user

Change-Id: I90a5e04859ef5c056ae8ca5bfc5a48872bc18825
---
M modules/postgresql/manifests/user.pp
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/37/392437/1

diff --git a/modules/postgresql/manifests/user.pp 
b/modules/postgresql/manifests/user.pp
index 6217a2c..2bdeae9 100644
--- a/modules/postgresql/manifests/user.pp
+++ b/modules/postgresql/manifests/user.pp
@@ -26,7 +26,7 @@
 #
 define postgresql::user(
 $user,
-$password,
+$password = undef,
 $database = 'template1',
 $type = 'host',
 $method = 'md5',
@@ -60,7 +60,7 @@
 }
 
 # This will not be run on a slave as it is read-only
-if $master {
+if $master and $password {
 $password_md5 = md5("${password}${user}")
 
 exec { "pass_set-${name}":

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

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

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

[MediaWiki-commits] [Gerrit] integration/config[master]: Add debian-glue to some Debian packages

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Add debian-glue to some Debian packages
..


Add debian-glue to some Debian packages

Bug: T180330
Change-Id: I2850cc8a4b9241c2148c86ff8e7858ac5a83a191
---
M zuul/layout.yaml
1 file changed, 11 insertions(+), 0 deletions(-)

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 2178cbd..e215313 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2176,6 +2176,14 @@
 template:
   - name: tox-jessie  # requires Java JDK 8+ for bin/keytool
 
+  - name: operations/calico-cni
+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
@@ -2251,7 +2259,9 @@
   - { name: operations/debs/pkg-php/php, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-defaults,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/pkg-php/php-redis,   test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/prometheus,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-apache-exporter,  test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/prometheus-jmx-exporter, test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-memcached-exporter,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-redis-exporter,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/prometheus-snmp-exporter,test: 
['debian-glue-non-voting'] }
@@ -2296,6 +2306,7 @@
   - { name: operations/debs/ruby-parallel,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/salt,test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/search-qa,   test: 
['debian-glue-non-voting'] }
+  - { name: operations/debs/spark2,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/squid,   test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/StatsD,  test: 
['debian-glue-non-voting'] }
   - { name: operations/debs/statsite,test: 
['debian-glue-non-voting'] }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2850cc8a4b9241c2148c86ff8e7858ac5a83a191
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

[MediaWiki-commits] [Gerrit] integration/config[master]: Archive some operations/* repositories

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Archive some operations/* repositories
..


Archive some operations/* repositories

operations/software/brrd
From April 2015. Apparently no more developed/used.

operations/puppet/mesos
Unused since May 2015. We went with Kubernetes.

operations/software/analytics-eventlogging-maintenance
A single abandoned patch https://gerrit.wikimedia.org/r/#/c/355604/

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

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



diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e88258a..2178cbd 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2483,6 +2483,10 @@
 template:
   - name: puppet-module
 
+  - name: operations/puppet/mesos
+template:
+  - name: archived
+
   - name: operations/puppet/nginx
 template:
   - name: puppet-module
@@ -2506,6 +2510,14 @@
 template:
   - name: tox-docker
 
+  - name: operations/software/analytics-eventlogging-maintenance
+template:
+  - name: archived
+
+  - name: operations/software/brrd
+template:
+  - name: archived
+
   - name: operations/software/conftool
 template:
   - name: tox-jessie  # requires etcd to be installed for integration tests

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I164e86d1e0cef8182e73c8cf2dda5375a2280135
Gerrit-PatchSet: 2
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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Make all Form IDs absolute, including the parents Lexeme ID

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Make all Form IDs absolute, including the parents Lexeme ID
..


Make all Form IDs absolute, including the parents Lexeme ID

Note there are FIXMEs in this patch:
* How can FormGenerator generate a FormId if it does not know anything
  about it's parent?
* I had the same issue in Lexeme::addForm, but was able to work around it
  by throwing an exception if the parent Lexeme does not have an ID yet.

Besides, I was a little suprised how easy this change became the moment I
teached the NewForm class to kindly accept partial Form IDs (in the short
form "F1").

I also learned there are a few places in the code that currently violate
the contract of always exposing the full ID (e.g. "L1-F2"), but never the
short form (e.g. only "F1"):
* The FormSerializer currently violates this contract, because all it does
  is outputting what FormId::getSerialization returns.
* Automatic summary lines also violate the contract.

Bug: T180464
Change-Id: I342d62996f3fc539c20a7b998b14c4b7add11791
---
M src/DataModel/FormId.php
M src/DataModel/FormSet.php
M src/DataModel/Lexeme.php
M tests/phpunit/composer/DataModel/FormIdTest.php
M tests/phpunit/composer/DataModel/FormSetTest.php
M tests/phpunit/composer/DataModel/FormTest.php
M tests/phpunit/composer/DataModel/LexemeTest.php
M tests/phpunit/composer/DataModel/NewForm.php
M 
tests/phpunit/composer/DataModel/Serialization/ExternalLexemeSerializerTest.php
M tests/phpunit/composer/DataModel/Serialization/StorageLexemeSerializerTest.php
M tests/phpunit/composer/DataModel/Services/Diff/FormDifferPatcherTest.php
M tests/phpunit/composer/DataModel/Services/Diff/LexemeDifferPatcherTest.php
M tests/phpunit/composer/ErisGenerators/FormGenerator.php
M tests/phpunit/mediawiki/Api/AddFormRequestTest.php
M tests/phpunit/mediawiki/Api/AddFormTest.php
M tests/phpunit/mediawiki/ChangeOp/ChangeOpAddFormTest.php
M tests/phpunit/mediawiki/DataModel/Serialization/LexemeDeserializerTest.php
17 files changed, 84 insertions(+), 45 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 e4089dc..63a1c3f 100644
--- a/src/DataModel/FormId.php
+++ b/src/DataModel/FormId.php
@@ -10,7 +10,7 @@
  */
 class FormId {
 
-   const PATTERN = '/^F[1-9]\d*\z/';
+   const PATTERN = '/^L[1-9]\d*-F[1-9]\d*\z/';
 
/**
 * @var string
diff --git a/src/DataModel/FormSet.php b/src/DataModel/FormSet.php
index 1277e77..7e55dcd 100644
--- a/src/DataModel/FormSet.php
+++ b/src/DataModel/FormSet.php
@@ -54,6 +54,7 @@
}
 
$numbers = array_map( function ( $formId ){
+   list( , $formId ) = explode( '-', $formId );
return (int)substr( $formId, 1 );
}, array_keys( $this->forms ) );
return max( $numbers );
diff --git a/src/DataModel/Lexeme.php b/src/DataModel/Lexeme.php
index f0462ed..2f5dd43 100644
--- a/src/DataModel/Lexeme.php
+++ b/src/DataModel/Lexeme.php
@@ -330,7 +330,11 @@
 * @return Form
 */
public function addForm( TermList $representations, array 
$grammaticalFeatures ) {
-   $formId = new FormId( 'F' . $this->nextFormId++ );
+   if ( !$this->id ) {
+   throw new \LogicException( 'Can not add forms to a 
lexeme with no ID' );
+   }
+
+   $formId = new FormId( $this->id->getSerialization() . '-F' . 
$this->nextFormId++ );
$form = new Form( $formId, $representations, 
$grammaticalFeatures );
$this->forms->add( $form );
 
diff --git a/tests/phpunit/composer/DataModel/FormIdTest.php 
b/tests/phpunit/composer/DataModel/FormIdTest.php
index 84d5087..65052c7 100644
--- a/tests/phpunit/composer/DataModel/FormIdTest.php
+++ b/tests/phpunit/composer/DataModel/FormIdTest.php
@@ -16,8 +16,8 @@
 class FormIdTest extends PHPUnit_Framework_TestCase {
 
public function testGivenValidSerialization_getSerializationReturnsIt() 
{
-   $id = new FormId( 'F1' );
-   $this->assertSame( 'F1', $id->getSerialization() );
+   $id = new FormId( 'L1-F1' );
+   $this->assertSame( 'L1-F1', $id->getSerialization() );
}
 
public function provideInvalidSerializations() {
@@ -26,10 +26,11 @@
[ '' ],
[ 1 ],
[ '1' ],
-   [ 'F' ],
-   [ 'F0' ],
-   [ '  F1  ' ],
-   [ "F1\n" ],
+   [ 'L1-F' ],
+   [ 'L1-F0' ],
+   [ 'L0-F1' ],
+   [ '  L1-F1  ' ],
+   [ "L1-F1\n" ],
[ 'P1' ],

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add component/git for jessie-wikimedia

2017-11-20 Thread Muehlenhoff (Code Review)

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

Change subject: Add component/git for jessie-wikimedia
..


Add component/git for jessie-wikimedia

We're using a git 2.11 backport (from stretch) on deployment servers. This
is currently present in experimental. This isn't ideal though since exp is used
for various other purposes as well. With the new repository layout we're more
flexible, so let's switch this to component/git.

Change-Id: I21c3c339e05f2f58381b87dcd66e877066f4bc99
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index fd63f08..d0b3706 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -20,7 +20,7 @@
 AlsoAcceptFor: jessie jessie-backports
 Version: 8
 Architectures: source amd64 i386
-Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci thirdparty/ci component/elastic55 thirdparty/elastic55 
component/icu57
+Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci thirdparty/ci component/elastic55 thirdparty/elastic55 
component/icu57 component/git
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent 
elastic elasticsearch-curator docker jenkins elastic55
 Description: Wikimedia packages for Debian Jessie

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I21c3c339e05f2f58381b87dcd66e877066f4bc99
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff 
Gerrit-Reviewer: Filippo Giunchedi 
Gerrit-Reviewer: Muehlenhoff 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...SocialProfile[master]: Convert UserBoard to use extension registration

2017-11-20 Thread SamanthaNguyen (Code Review)

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

Change subject: Convert UserBoard to use extension registration
..

Convert UserBoard to use extension registration

Bug: T152865
Change-Id: I8bdd6e5a329cffa78619b10d9a7660f127a595e0
---
M SocialProfile.php
A UserBoard/extension.json
M UserBoard/i18n/en.json
M UserBoard/i18n/qqq.json
4 files changed, 80 insertions(+), 56 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SocialProfile 
refs/changes/53/392453/1

diff --git a/SocialProfile.php b/SocialProfile.php
index 15f5a28..4399893 100644
--- a/SocialProfile.php
+++ b/SocialProfile.php
@@ -27,7 +27,6 @@
 $wgMessagesDirs['SocialProfile'] = __DIR__ . '/i18n';
 $wgExtensionMessagesFiles['SocialProfileAlias'] = __DIR__ . 
'/SocialProfile.alias.php';
 
-$wgMessagesDirs['SocialProfileUserBoard'] = __DIR__ . '/UserBoard/i18n';
 $wgMessagesDirs['SocialProfileUserProfile'] = __DIR__ . '/UserProfile/i18n';
 $wgMessagesDirs['SocialProfileUserRelationship'] = __DIR__ . 
'/UserRelationship/i18n';
 $wgMessagesDirs['SocialProfileUserStats'] = __DIR__ . '/UserStats/i18n';
@@ -37,11 +36,9 @@
 
 // Classes to be autoloaded
 $wgAutoloadClasses['GenerateTopUsersReport'] = __DIR__ . 
'/UserStats/GenerateTopUsersReport.php';
-$wgAutoloadClasses['EchoUserBoardMessagePresentationModel'] = __DIR__ . 
'/UserBoard/EchoUserBoardMessagePresentationModel.php';
 $wgAutoloadClasses['EchoUserRelationshipPresentationModel'] = __DIR__ . 
'/UserRelationship/EchoUserRelationshipPresentationModel.php';
 $wgAutoloadClasses['EchoUserLevelAdvancePresentationModel'] = __DIR__ . 
'/UserStats/EchoUserLevelAdvancePresentationModel.php';
 $wgAutoloadClasses['SpecialAddRelationship'] = __DIR__ . 
'/UserRelationship/SpecialAddRelationship.php';
-$wgAutoloadClasses['SpecialBoardBlast'] = __DIR__ . 
'/UserBoard/SpecialSendBoardBlast.php';
 $wgAutoloadClasses['SpecialEditProfile'] = __DIR__ . 
'/UserProfile/SpecialEditProfile.php';
 $wgAutoloadClasses['SpecialPopulateUserProfiles'] = __DIR__ . 
'/UserProfile/SpecialPopulateExistingUsersProfiles.php';
 $wgAutoloadClasses['SpecialRemoveRelationship'] = __DIR__ . 
'/UserRelationship/SpecialRemoveRelationship.php';
@@ -51,11 +48,8 @@
 $wgAutoloadClasses['UploadAvatar'] = __DIR__ . 
'/UserProfile/SpecialUploadAvatar.php';
 $wgAutoloadClasses['SpecialViewRelationshipRequests'] = __DIR__ . 
'/UserRelationship/SpecialViewRelationshipRequests.php';
 $wgAutoloadClasses['SpecialViewRelationships'] = __DIR__ . 
'/UserRelationship/SpecialViewRelationships.php';
-$wgAutoloadClasses['SpecialViewUserBoard'] = __DIR__ . 
'/UserBoard/SpecialUserBoard.php';
 $wgAutoloadClasses['RemoveAvatar'] = __DIR__ . 
'/UserProfile/SpecialRemoveAvatar.php';
 $wgAutoloadClasses['UpdateEditCounts'] = __DIR__ . 
'/UserStats/SpecialUpdateEditCounts.php';
-$wgAutoloadClasses['UserBoard'] = __DIR__ . '/UserBoard/UserBoardClass.php';
-$wgAutoloadClasses['UserBoardHooks'] = __DIR__ . 
'/UserBoard/UserBoardHooks.php';
 $wgAutoloadClasses['UserProfile'] = __DIR__ . 
'/UserProfile/UserProfileClass.php';
 $wgAutoloadClasses['UserProfileHooks'] = __DIR__ . 
'/UserProfile/UserProfileHooks.php';
 $wgAutoloadClasses['UserProfilePage'] = __DIR__ . 
'/UserProfile/UserProfilePage.php';
@@ -77,24 +71,10 @@
 $wgAutoloadClasses['ApiUserProfilePrivacy'] = __DIR__ . 
'/UserProfile/ApiUserProfilePrivacy.php';
 $wgAPIModules['smpuserprivacy'] = 'ApiUserProfilePrivacy';
 
-$wgAutoloadClasses['ApiDeleteUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiDeleteUserBoardMessage.php';
-$wgAPIModules['socialprofile-delete-message'] = 'ApiDeleteUserBoardMessage';
-
-$wgAutoloadClasses['ApiSendUserBoardMessage'] = __DIR__ . 
'/UserBoard/ApiSendUserBoardMessage.php';
-$wgAPIModules['socialprofile-send-message'] = 'ApiSendUserBoardMessage';
-
 $wgAutoloadClasses['ApiRelationshipResponse'] = __DIR__ . 
'/UserRelationship/ApiRelationshipResponse.php';
 $wgAPIModules['socialprofile-request-response'] = 'ApiRelationshipResponse';
 
 // Echo (Notifications) stuff
-// UserBoard
-$wgHooks['BeforeCreateEchoEvent'][] = 
'UserBoardHooks::onBeforeCreateEchoEvent';
-$wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserBoardHooks::onEchoGetDefaultNotifiedUsers';
-$wgHooks['EchoGetBundleRules'][] = 'UserBoardHooks::onEchoGetBundleRules';
-
-$wgDefaultUserOptions['echo-subscriptions-web-social-msg'] = true;
-$wgDefaultUserOptions['echo-subscriptions-email-social-msg'] = false;
-
 // UserRelationship
 $wgHooks['BeforeCreateEchoEvent'][] = 
'UserRelationshipHooks::onBeforeCreateEchoEvent';
 $wgHooks['EchoGetDefaultNotifiedUsers'][] = 
'UserRelationshipHooks::onEchoGetDefaultNotifiedUsers';
@@ -116,7 +96,6 @@
 $wgSpecialPages['PopulateUserProfiles'] = 'SpecialPopulateUserProfiles';
 $wgSpecialPages['RemoveAvatar'] = 'RemoveAvatar';
 $wgSpecialPages['RemoveRelationship'] = 'SpecialRemoveRelationship';
-$wgSpecialPages['SendBoardBlast'] =

[MediaWiki-commits] [Gerrit] operations/puppet[production]: netbox: rename duplicate Icinga check

2017-11-20 Thread Ayounsi (Code Review)

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

Change subject: netbox: rename duplicate Icinga check
..


netbox: rename duplicate Icinga check

Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
---
M modules/profile/manifests/netbox.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 63be3f7..c62b03a 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -122,7 +122,7 @@
 
   monitoring::service { 'netbox-ssl':
   ensure=> $monitoring_ensure,
-  description   => 'Netbox HTTPS',
+  description   => 'Netbox SSL',
   check_command => 'check_ssl_http_letsencrypt!netbox.wikimedia.org',
   }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5773eceb6fc5b15f47d8f46f6510e3813d3317df
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Volans 
Gerrit-Reviewer: Ayounsi 
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]: openstack: labs_tld is still used by instances

2017-11-20 Thread Rush (Code Review)

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

Change subject: openstack: labs_tld is still used by instances
..


openstack: labs_tld is still used by instances

Bug: T171494
Change-Id: Ic8711a36a2e8ff16c12b864648af8aef9aef3822
---
M hieradata/common.yaml
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index cae6896..e0b0b01 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -366,6 +366,7 @@
 # Cloud Services <
 #
 # Cumin
+labs_tld: "wmflabs"
 profile::openstack::main::cumin::auth_group: cumin_masters
 profile::openstack::main::cumin::project_masters: []
 profile::openstack::main::cumin::project_pub_key: undef

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

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

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: puppet: Move cloud VMs to the puppet 'future' environment

2017-11-20 Thread Andrew Bogott (Code Review)

Andrew Bogott has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392172 )

Change subject: puppet:  Move cloud VMs to the puppet 'future' environment
..


puppet:  Move cloud VMs to the puppet 'future' environment

Bug: T178508
Change-Id: I807fe0297038c978e50dcd80843c3f0d2cc2e507
---
M hieradata/labs.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index 7c05b98..9cbccbf 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -91,7 +91,7 @@
 hosts:
   "%{::fqdn}": 1
 
-profile::base::environment: ''
+profile::base::environment: "future"
 profile::base::nrpe_allowed_hosts: '10.68.16.210'
 profile::base::ssh_server_settings:
   disable_agent_forwarding: false

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I807fe0297038c978e50dcd80843c3f0d2cc2e507
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Andrew Bogott 
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 RdfVocabulary instantiations

2017-11-20 Thread Lucas Werkmeister (WMDE) (Code Review)

Lucas Werkmeister (WMDE) has uploaded a new change for review. ( 
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(-)


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

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

[MediaWiki-commits] [Gerrit] mediawiki...ORES[master]: [WIP] Split WL and RC prefs for ORES

2017-11-20 Thread Petar.petkovic (Code Review)

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

Change subject: [WIP] Split WL and RC prefs for ORES
..

[WIP] Split WL and RC prefs for ORES

- Make ORES preferences separate for Watchlist and RecentChanges,
so both include:
* Prediction Threshold
* "Highlight likely problem edits" control
* "Show only likely problem edits" control
- Provide both sections with separate titles, not mentioning the other one.
- Change instruction text displayed on help icon click.

Bug: T180866
Change-Id: Ifbc5a6b3a5f5e634cc308d769360365f30fceecc
---
M extension.json
M i18n/en.json
M includes/Hooks.php
M includes/Hooks/PreferencesHookHandler.php
4 files changed, 27 insertions(+), 25 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ORES 
refs/changes/52/392452/1

diff --git a/extension.json b/extension.json
index 63f226b..e8c6af3 100644
--- a/extension.json
+++ b/extension.json
@@ -206,6 +206,7 @@
"DefaultUserOptions": {
"ores-damaging-flag-rc": false,
"oresDamagingPref": "soft",
+   "rcOresDamagingPref": "soft",
"oresHighlight": false,
"oresRCHideNonDamaging": false,
"oresWatchlistHideNonDamaging": false
diff --git a/i18n/en.json b/i18n/en.json
index 5cd0889..498b69e 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -11,11 +11,11 @@
"ores-damaging-legend": "This edit may have problems and should be 
reviewed ([[:mw:Special:MyLanguage/ORES review tool|more info]])",
"ores-hide-nondamaging-filter": "Hide probably good edits",
"ores-pref-damaging": "Prediction threshold",
-   "ores-pref-damaging-flag": "Highlight likely problem edits with colors 
and an \"{{int:ores-damaging-letter}}\" for \"needs review\" (to set the level 
at which edits are marked, use the \"{{int:ores-pref-damaging}}\" setting in 
the Watchlist preferences)",
+   "ores-pref-damaging-flag": "Highlight likely problem edits with colors 
and an \"{{int:ores-damaging-letter}}\" for \"needs review\"",
"ores-damaging-maybebad": "May have problems (flags most problem edits 
but includes many false positives)",
"ores-damaging-likelybad": "Likely have problems (medium probability)",
"ores-damaging-verylikelybad": "Very likely have problems (flags few 
false positives but finds a smaller % of problem edits)",
-   "ores-help-damaging-pref": "Sets the sensitivity of the \"Highlight 
likely problem edits...\" and \"Show only likely problem edits...\" options on 
Recent Changes and Watchlist.",
+   "ores-help-damaging-pref": "Change the \"threshold\" setting to make 
the options below broader or more selective.",
"ores-rcfilters-whats-this-link-text": "Learn more",
"ores-rcfilters-ores-conflicts-logactions-global": "The 
\"{{int:rcfilters-filter-logactions-label}}\" filter conflicts with one or more 
Contribution Quality or User Intent filters. Quality and Intent predictions are 
not available for logged actions. The conflicting filters are marked in the 
Active Filters area, above.",
"ores-rcfilters-logactions-conflicts-ores": "This filter conflicts with 
one or more Contribution Quality or User Intent filters. Quality and Intent 
predictions are not available for logged actions.",
@@ -48,7 +48,8 @@
"ores-pref-highlight": "Highlight likely problem edits with colors and 
an \"{{int:ores-damaging-letter}}\" for \"needs review\"",
"ores-pref-rc-hidenondamaging": "Show only likely problem edits (and 
hide probably good edits)",
"ores-pref-watchlist-hidenondamaging": "Show only likely problem edits 
(and hide probably good edits)",
-   "prefs-ores" : "Revision scoring",
+   "prefs-ores-wl" : "Revision scoring on Watchlist",
+   "prefs-ores-rc" : "Revision scoring on Recent changes, Related changes, 
Contributions",
"apihelp-query+ores-description": "Return ORES configuration and model 
data for this wiki.",
"apihelp-query+ores-summary": "Return ORES configuration and model data 
for this wiki.",
"apihelp-query+ores-example-simple": "Fetch ORES data:",
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 78c71c3..abaee0a 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -10,6 +10,8 @@
 use MediaWiki\Logger\LoggerFactory;
 use OutputPage;
 use RecentChange;
+use DerivativeContext;
+use DerivativeRequest;
 use RequestContext;
 use Skin;
 use SpecialRecentChanges;
@@ -115,7 +117,12 @@
 * @return string 'maybebad', 'likelybad', or 'verylikelybad'
 */
public static function getDamagingLevelPreference( User $user ) {
-   $pref = $user->getOption( 'oresDamagingPref' );
+   $context = new DerivativeContext( RequestContext::getMain() );
+   $context->setUser( $user );
+

[MediaWiki-commits] [Gerrit] operations/dumps[master]: gzip compress output from api jobs and abstracts dumps

2017-11-20 Thread ArielGlenn (Code Review)

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

Change subject: gzip compress output from api jobs and abstracts dumps
..

gzip compress output from api jobs and abstracts dumps

We don't really care if the output is large or small, just do it
all the time, regardless of the job.

Bug:T178046
Change-Id: I4be42637b4f0ee5d99aa0ef0bf3eeec97979e8d0
---
M xmldumps-backup/dumps/apijobs.py
M xmldumps-backup/dumps/xmljobs.py
M xmldumps-backup/xmlabstracts.py
3 files changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps 
refs/changes/55/392455/1

diff --git a/xmldumps-backup/dumps/apijobs.py b/xmldumps-backup/dumps/apijobs.py
index ad31c55..3991add 100644
--- a/xmldumps-backup/dumps/apijobs.py
+++ b/xmldumps-backup/dumps/apijobs.py
@@ -17,7 +17,7 @@
 return "json"
 
 def get_file_ext(self):
-return ""
+return "gz"
 
 def run(self, runner):
 retries = 0
@@ -53,5 +53,5 @@
 properties = '|'.join(self._properties)
 api_url = 
"{baseurl}?action=query=siteinfo={props}=json"
 url = api_url.format(baseurl=base_url, props=properties)
-command = [["/usr/bin/curl", "-s", url]]
+command = [["/usr/bin/curl", "-s", url], [runner.wiki.config.gzip]]
 return command
diff --git a/xmldumps-backup/dumps/xmljobs.py b/xmldumps-backup/dumps/xmljobs.py
index 8a999ec..3b6ea86 100644
--- a/xmldumps-backup/dumps/xmljobs.py
+++ b/xmldumps-backup/dumps/xmljobs.py
@@ -268,7 +268,7 @@
 return "xml"
 
 def get_file_ext(self):
-return ""
+return "gz"
 
 def get_variant_from_dumpname(self, dumpname):
 fields = dumpname.split("-")
diff --git a/xmldumps-backup/xmlabstracts.py b/xmldumps-backup/xmlabstracts.py
index 28abd31..c39f748 100644
--- a/xmldumps-backup/xmlabstracts.py
+++ b/xmldumps-backup/xmlabstracts.py
@@ -12,7 +12,7 @@
 import getopt
 from dumps.WikiDump import Config
 from dumps.utils import MultiVersion
-from xmlstreams import do_xml_stream, catit
+from xmlstreams import do_xml_stream, gzippit
 
 
 def do_abstractsbackup(wikidb, output_files, variants,
@@ -35,7 +35,7 @@
 if dryrun:
 outfiles[filetype]['compr'] = None
 else:
-outfiles[filetype]['compr'] = catit(outfiles[filetype]['name'])
+outfiles[filetype]['compr'] = gzippit(outfiles[filetype]['name'])
 
 script_command = MultiVersion.mw_script_as_array(wikiconf,
  "dumpBackup.php")

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4be42637b4f0ee5d99aa0ef0bf3eeec97979e8d0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: master
Gerrit-Owner: ArielGlenn 

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

[MediaWiki-commits] [Gerrit] marvin[master]: Chore: extract Thumbnail to separate component

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Chore: extract Thumbnail to separate component
..


Chore: extract Thumbnail to separate component

Thumbnail is currently used by the summary endpoint and soon to be used
by the image File pages. Extract the component to a distinct file so it
can be reused.

Bug: T179829
Change-Id: I65cf8246f4285828f1b0070c1fb8c0d85266d962
---
M package.json
M src/common/components/page-summary/page-summary.css
M src/common/components/page-summary/page-summary.tsx
A src/common/components/thumbnail/thumbnail.css
A src/common/components/thumbnail/thumbnail.tsx
5 files changed, 93 insertions(+), 76 deletions(-)

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



diff --git a/package.json b/package.json
index 1d5d82c..72e1e48 100644
--- a/package.json
+++ b/package.json
@@ -127,7 +127,7 @@
 },
 {
   "path": "dist/public/pages/summary.*.js",
-  "maxSize": "2.9KB"
+  "maxSize": "3KB"
 },
 {
   "path": "dist/public/pages/wiki.*.js",
diff --git a/src/common/components/page-summary/page-summary.css 
b/src/common/components/page-summary/page-summary.css
index 5f77601..a1a3894 100644
--- a/src/common/components/page-summary/page-summary.css
+++ b/src/common/components/page-summary/page-summary.css
@@ -15,54 +15,5 @@
   visibility: hidden;
 }
 
-.PageSummary-thumbnail {
-  background: var(--wmui-color-base0);
-
-  /* Center the image within the container. */
-  text-align: center;
-
-  /* Set the container to occupy the full-width. */
-  display: inline-block;
-  width: 100%;
-
-  /* Since the image is below the extract, set a top margin. */
-  margin-top: var(--space);
-}
-/* TODO: use CSS variable. */
-@media (min-width: 1024px) {
-  .PageSummary-thumbnail {
-/* Wrap the container to the width of the image and left-align it. Floating
-   takes precedence over display. */
-width: unset;
-float: left;
-
-/* Since the image is both side-by-side and below the extract, set a right
-   margin too. Since the side-by-side text may wrap around, set a bottom
-   margin. */
-margin-right: var(--space);
-margin-bottom: var(--space);
-  }
-}
-.PageSummary-thumbnail-image {
-  /* Don't pad the linked image with text descender space. */
-  vertical-align: top;
-}
-.PageSummary-thumbnail-image-landscape {
-  /* Stretch the image to occupy the available width and proprotionally scale
- the height. */
-  width: 100%;
-  height: auto;
-}
-/* TODO: use CSS variable. */
-@media (min-width: 1024px) {
-  .PageSummary-thumbnail-image-landscape {
-/* The screen is too large to maximize the image. Use the image's native
-   width and height. */
-width: unset;
-height: unset;
-  }
-}
-.PageSummary-thumbnail-image-portrait {}
-
 .PageSummary-extract-lead {}
 .PageSummary-extract-body {}
diff --git a/src/common/components/page-summary/page-summary.tsx 
b/src/common/components/page-summary/page-summary.tsx
index cd13a9a..93839c5 100644
--- a/src/common/components/page-summary/page-summary.tsx
+++ b/src/common/components/page-summary/page-summary.tsx
@@ -2,6 +2,7 @@
 import "./page-summary.css";
 import { PageSummary as PageSummaryModel } from "../../models/page/summary";
 import Content from "../content/content";
+import { Thumbnail } from "../thumbnail/thumbnail";
 
 export interface Props {
   summary: PageSummaryModel;
@@ -15,36 +16,17 @@
 class="PageSummary-extract-lead"
 dangerouslySetInnerHTML={{ __html: lead }}
   />
-  
+  {summary.thumbnail && (
+
+  )}
   
 
-  );
-};
-
-const Thumbnail = ({ summary }: Props) => {
-  if (!summary.thumbnail || !summary.image) {
-return null;
-  }
-
-  const landscape = summary.image.landscape;
-  const imageOrientationClass = `PageSummary-thumbnail-image-${landscape
-? "landscape"
-: "portrait"}`;
-  return (
-// todo: replace anchor with Link.
-
-  
-
-  
-
   );
 };
diff --git a/src/common/components/thumbnail/thumbnail.css 
b/src/common/components/thumbnail/thumbnail.css
new file mode 100644
index 000..e872aac
--- /dev/null
+++ b/src/common/components/thumbnail/thumbnail.css
@@ -0,0 +1,54 @@
+
+.Thumbnail {
+  background: var(--wmui-color-base0);
+
+  /* Center the image within the container. */
+  text-align: center;
+
+  /* Set the container to occupy the full-width. */
+  display: inline-block;
+  width: 100%;
+
+  /* Since the image is below the extract, set a top margin. */
+  margin-top: var(--space);
+}
+
+/* TODO: use CSS variable. */
+@media (min-width: 1024px) {
+  .Thumbnail {
+/* Wrap the container to the width of the image and left-align it. Floating
+   takes precedence over display. */
+width: unset;
+float: left;
+
+/* Since the image is both side-by-side and below the extract, set a right
+

[MediaWiki-commits] [Gerrit] operations/puppet[production]: EventLogging analytics capsule discrepency fixes

2017-11-20 Thread Ottomata (Code Review)

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

Change subject: EventLogging analytics capsule discrepency fixes
..


EventLogging analytics capsule discrepency fixes

Bug: T179625
Change-Id: I3d5f8650c416c71f7b8cc904a58f979c852a723f
---
M modules/camus/templates/eventlogging.erb
D modules/eventlogging/files/filters.py
A modules/eventlogging/files/plugins.py
M modules/role/manifests/eventlogging/analytics/mysql.pp
M modules/role/manifests/eventlogging/analytics/processor.pp
M modules/role/manifests/eventlogging/analytics/server.pp
6 files changed, 95 insertions(+), 47 deletions(-)

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



diff --git a/modules/camus/templates/eventlogging.erb 
b/modules/camus/templates/eventlogging.erb
index 579d1ec..9397226 100644
--- a/modules/camus/templates/eventlogging.erb
+++ b/modules/camus/templates/eventlogging.erb
@@ -16,10 +16,10 @@
 
etl.execution.history.path=hdfs://analytics-hadoop/wmf/camus/eventlogging/history
 
 # Our timestamps look like 2013-09-20T15:40:17
-camus.message.timestamp.format=unix_seconds
+camus.message.timestamp.format=-MM-dd'T'HH:mm:ss
 
 # use the dt field
-camus.message.timestamp.field=timestamp
+camus.message.timestamp.field=dt
 
 # Store output into hourly buckets
 etl.output.file.time.partition.mins=60
diff --git a/modules/eventlogging/files/filters.py 
b/modules/eventlogging/files/filters.py
deleted file mode 100644
index 9ad0fe2..000
--- a/modules/eventlogging/files/filters.py
+++ /dev/null
@@ -1,35 +0,0 @@
-import json
-import logging
-
-
-def should_insert_event(e):
-"""
-Given an Event dict e, returns true if this event should be inserted into 
the
-EventLogging storage (MySQL), or false otherwise.  This is used
-to filter out events generated by unwanted bots.
-"""
-# If no userAgent information, then insert anyway.
-if 'userAgent' not in e:
-return True
-
-if isinstance(e['userAgent'], dict):
-user_agent_dict = e['userAgent']
-else:
-try:
-user_agent_dict = json.loads(e['userAgent'])
-except Exception as ex:
-logging.warn('userAgent is a {}.  Skipping insertion. userAgent: 
{}. ({})'.format(
-type(e['userAgent']), e['userAgent'], ex
-))
-return False
-
-is_bot = user_agent_dict.get('is_bot', False)
-is_mediawiki = user_agent_dict.get('is_mediawiki', False)
-
-# Don't insert events generated by bots unless they are mediawiki bots.
-if is_bot and not is_mediawiki:
-return False
-else:
-if isinstance(e['userAgent'], dict):
-e['userAgent'] = json.dumps(e['userAgent'])
-return True
diff --git a/modules/eventlogging/files/plugins.py 
b/modules/eventlogging/files/plugins.py
new file mode 100644
index 000..985799d
--- /dev/null
+++ b/modules/eventlogging/files/plugins.py
@@ -0,0 +1,74 @@
+import dateutil.parser
+import json
+import time
+import unittest
+
+
+def mysql_mapper(e):
+"""
+The WMF EventLogging Analytics MySQL log database has a lot of curious
+legacy compatibility problems.  This function converts an event
+to a format that the MySQL database expects.  If an event comes from
+a non-Mediawiki bot, it will be mapped to 'None' and thus excluded from 
the stream.
+"""
+if 'userAgent' in e and isinstance(e['userAgent'], dict):
+# Get rid of unwanted bots. T67508
+is_bot = e['userAgent'].get('is_bot', False)
+is_mediawiki = e['userAgent'].get('is_mediawiki', False)
+# Don't insert events generated by bots unless they are mediawiki bots.
+if is_bot and not is_mediawiki:
+# Returning None will cause map://
+# reader to exclude this event.
+return None
+
+# MySQL expects that userAgent is a string, so we
+# convert it to JSON string now.  T153207
+e['userAgent'] = json.dumps(e['userAgent'])
+
+# jrm.py expects an integer `timestamp` field to convert into
+#  Mediawiki timestamp. Inject it into the event.
+if 'dt' in e:
+# Use the time from `dt`
+e['timestamp'] = int(dateutil.parser.parse(e['dt']).strftime("%s"))
+# Historicaly, EventCapsule did not have `dt` so we remove it from
+# insertion into MySQL.
+del e['dt']
+else:
+# Else just use current time.
+e['timestamp'] = int(time.time())
+
+return e
+
+
+# # Tests ##
+# To run:
+#   python -m unittest -v plugins.py
+# Or:
+#   python plugins.py
+#
+class TestEventLoggingPlugins(unittest.TestCase):
+
+def test_mysql_mapper(self):
+e1 = {
+'dt': '2017-11-01T11:00:00',
+'userAgent': {'browser_family': 'Chrome'}
+}
+should_be1 = {'timestamp': 1509548400, 'userAgent': 
'{"browser_family": "Chrome"}'}
+

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

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: mariadb: Depool db2068 for maintenance
..


mariadb: Depool db2068 for maintenance

Bug: T180927
Change-Id: Ib0f1088231ee30cb0d72c3efe914d734788b7604
---
M wmf-config/db-codfw.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index b2b29b9..24755d6 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -181,7 +181,7 @@
'db2047' => 400, # C6 2.9TB 160GB,
'db2054' => 200, # D6 2.9TB 160GB, dump (inactive), vslow
'db2061' => 200, # D6 3.3TB 160GB, api
-   'db2068' => 300, # D6 3.3TB 160GB
+   # 'db2068' => 300, # D6 3.3TB 160GB, down for maintenance 
T180927
'db2077' => 400, # C1 3.3TB 512GB
'db2086:3317' => 1, # B1 3.3TB 512GB # rc, log: s5 and s7
'db2087:3317' => 1, # C1 3.3TB 512GB # rc, log: s6 and s7

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

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

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

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

2017-11-20 Thread Jdrewniak (Code Review)

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

Change subject: Bumping portals to master
..

Bumping portals to master

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


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

diff --git a/portals b/portals
index 3862e2f..2651daa 16
--- a/portals
+++ b/portals
@@ -1 +1 @@
-Subproject commit 3862e2f5c2c3196872b960a6e63cc5f1a70e9a2b
+Subproject commit 2651daa4bf7dc360773459e0d1100507375d70fb

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib0997c5dca43dac3da12e6670c4d8305da3de6fe
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] marvin[master]: Fix: update page summaries for new endpoint responses

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Fix: update page summaries for new endpoint responses
..


Fix: update page summaries for new endpoint responses

The MCS page summary response format appears to have made an API
breaking change by dropping the `thumbnail.original` field. This patch
revises the Marvin implementation.

Change-Id: Ibc0c03d48a08c971c90e6a34d7f96e8af1163421
---
M src/common/marshallers/page-summary/page-summary-expected.test.json
M src/common/marshallers/page-summary/page-summary-restbase.test.json
M src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
M src/common/marshallers/page-summary/page-summary-unmarshaller.ts
M src/common/marshallers/restbase.ts
M src/common/models/page/image.ts
M src/common/models/page/summary.ts
7 files changed, 10 insertions(+), 60 deletions(-)

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



diff --git 
a/src/common/marshallers/page-summary/page-summary-expected.test.json 
b/src/common/marshallers/page-summary/page-summary-expected.test.json
index b6a741f..4b78760 100644
--- a/src/common/marshallers/page-summary/page-summary-expected.test.json
+++ b/src/common/marshallers/page-summary/page-summary-expected.test.json
@@ -14,8 +14,7 @@
 "url": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/c/c7/Mount-Everest.jpg/320px-Mount-Everest.jpg;,
 "width": 320,
 "height": 213,
-"landscape": true,
-"originalURL": 
"http://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;
+"landscape": true
   },
   "image": {
 "url": 
"https://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;,
@@ -25,7 +24,7 @@
   },
   "wikiLanguageCode": "en",
   "localeDirection": "ltr",
-  "lastModified": "2017-09-11T16:00:59Z",
+  "lastModified": "2017-11-17T03:58:31Z",
   "descriptionText": "Earth's highest mountain, with a peak at 8,848 metres 
(29,029 feet) above sea level, part of the Himalaya mountain range between 
Nepal and China",
   "geolocation": {
 "latitude": 27.98805556,
diff --git 
a/src/common/marshallers/page-summary/page-summary-restbase.test.json 
b/src/common/marshallers/page-summary/page-summary-restbase.test.json
index 95940a3..d4e3168 100644
--- a/src/common/marshallers/page-summary/page-summary-restbase.test.json
+++ b/src/common/marshallers/page-summary/page-summary-restbase.test.json
@@ -7,8 +7,7 @@
   "thumbnail": {
 "source": 
"https://upload.wikimedia.org/wikipedia/commons/thumb/c/c7/Mount-Everest.jpg/320px-Mount-Everest.jpg;,
 "width": 320,
-"height": 213,
-"original": 
"http://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;
+"height": 213
   },
   "originalimage": {
 "source": 
"https://upload.wikimedia.org/wikipedia/commons/c/c7/Mount-Everest.jpg;,
@@ -17,7 +16,7 @@
   },
   "lang": "en",
   "dir": "ltr",
-  "timestamp": "2017-09-11T16:00:59Z",
+  "timestamp": "2017-11-17T03:58:31Z",
   "description": "Earth's highest mountain, with a peak at 8,848 metres 
(29,029 feet) above sea level, part of the Himalaya mountain range between 
Nepal and China",
   "coordinates": {
 "lat": 27.98805556,
diff --git 
a/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts 
b/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
index 091474e..368494e 100644
--- a/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
+++ b/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
@@ -1,41 +1,16 @@
 import * as assert from "assert";
 import { PageSummary, pageSummaryReviver } from "../../models/page/summary";
-import { PageImage, PageThumbnail } from "../../models/page/image";
+import { PageImage } from "../../models/page/image";
 import { RESTBase } from "../restbase";
 import { EXPECTED_ETAG, HEADERS, reviveFile } from "../utils.test";
 import {
   unmarshalPageImage,
-  unmarshalPageThumbnail,
   unmarshalPageSummary
 } from "./page-summary-unmarshaller";
 
 const NOW = new Date(Date.now()).toString();
 
 describe("page-summary-unmarshaller", () => {
-  describe(".unmarshalPageThumbnail()", () => {
-[false, true].forEach(landscape => {
-  it(`unmarshals ${landscape ? "landscape" : "portrait"}`, () => {
-const width = landscape ? 2 : 1;
-const height = landscape ? 1 : 2;
-const json: RESTBase.PageSummary.Thumbnail = {
-  source: "source",
-  original: "original",
-  width,
-  height
-};
-const expected: PageThumbnail = {
-  url: "source",
-  width,
-  height,
-  landscape,
-  originalURL: "original"
-};
-const result = unmarshalPageThumbnail(json as {});
-assert.deepStrictEqual(result, expected);
-  });
-});
-  });
-
   describe(".unmarshalPageImage()", () => {
 [false,

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add component/git for jessie-wikimedia

2017-11-20 Thread Muehlenhoff (Code Review)

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

Change subject: Add component/git for jessie-wikimedia
..

Add component/git for jessie-wikimedia

We're using a git 2.11 backport (from stretch) on deployment servers. This
is currently present in experimental. This isn't ideal though since exp is used
for various other purposes as well. With the new repository layout we're more
flexible, so let's switch this to component/git.

Change-Id: I21c3c339e05f2f58381b87dcd66e877066f4bc99
---
M modules/aptrepo/files/distributions-wikimedia
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/36/392436/1

diff --git a/modules/aptrepo/files/distributions-wikimedia 
b/modules/aptrepo/files/distributions-wikimedia
index fd63f08..d0b3706 100644
--- a/modules/aptrepo/files/distributions-wikimedia
+++ b/modules/aptrepo/files/distributions-wikimedia
@@ -20,7 +20,7 @@
 AlsoAcceptFor: jessie jessie-backports
 Version: 8
 Architectures: source amd64 i386
-Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci thirdparty/ci component/elastic55 thirdparty/elastic55 
component/icu57
+Components: main backports thirdparty experimental thirdparty/cloudera 
component/ci thirdparty/ci component/elastic55 thirdparty/elastic55 
component/icu57 component/git
 UDebComponents: main backports thirdparty experimental
 Update: hwraid cassandra cloudera-jessie grafana tor hp-mcp-jessie confluent 
elastic elasticsearch-curator docker jenkins elastic55
 Description: Wikimedia packages for Debian Jessie

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

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

___
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, db-codfw.php: Add db1109 and db1110

2017-11-20 Thread Marostegui (Code Review)

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

Change subject: db-eqiad,db-codfw.php: Add db1109 and db1110
..

db-eqiad,db-codfw.php: Add db1109 and db1110

db1109 and db1110 will be part of s5/s8.
Adding it to the config, depooled, till they catch up

Bug: T180700
Change-Id: Ife402984a4ac9ac3ea922c826c96817cae126009
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 24755d6..61ebd9c 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -608,6 +608,8 @@
'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out
'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
+   'db1109' => '10.64.48.172', # do not remove or comment out
+   'db1110' => '10.64.32.31', # do not remove or comment out
'db2001' => '10.192.0.4', # do not remove or comment out
'db2002' => '10.192.0.5', # do not remove or comment out
'db2003' => '10.192.0.6', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index aebac7e..21ca4c2 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,6 +154,8 @@
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 100,  # B3 3.6TB 512GB, api #low weight
'db1106' => 500,  # D3 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB #provisioning
+   # 'db1110' => 500,  # C3 3.6TB 512GB #provisioning
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master
@@ -539,6 +541,8 @@
'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out
'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
+   'db1109' => '10.64.48.172', # do not remove or comment out
+   'db1110' => '10.64.32.31', # do not remove or comment out
'db2001' => '10.192.0.4', # do not remove or comment out
'db2002' => '10.192.0.5', # do not remove or comment out
'db2003' => '10.192.0.6', # do not remove or comment out

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ife402984a4ac9ac3ea922c826c96817cae126009
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] research...wheels[master]: Remove old revscoring 2.0.9 wheel

2017-11-20 Thread Awight (Code Review)

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

Change subject: Remove old revscoring 2.0.9 wheel
..

Remove old revscoring 2.0.9 wheel

Change-Id: I4a82efb4ee94f500316fcc7924e9fe9d0bda2ce4
---
D revscoring-2.0.9-py2.py3-none-any.whl
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/revscoring-2.0.9-py2.py3-none-any.whl 
b/revscoring-2.0.9-py2.py3-none-any.whl
deleted file mode 100644
index ea3716d..000
--- a/revscoring-2.0.9-py2.py3-none-any.whl
+++ /dev/null
Binary files differ

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a82efb4ee94f500316fcc7924e9fe9d0bda2ce4
Gerrit-PatchSet: 1
Gerrit-Project: research/ores/wheels
Gerrit-Branch: master
Gerrit-Owner: Awight 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Add postgresql::prometheus class to user of postgresql

2017-11-20 Thread Alexandros Kosiaris (Code Review)

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

Change subject: Add postgresql::prometheus class to user of postgresql
..

Add postgresql::prometheus class to user of postgresql

Include in all postgresql defining modules the postgres::prometheus class

Bug: T177196
Change-Id: I5f13d34de9c532db2678087ac4fca4fc4df829a3
---
M modules/profile/manifests/maps/osm_slave.pp
M modules/profile/manifests/netbox.pp
M modules/puppetmaster/manifests/puppetdb/database.pp
M modules/role/manifests/osm/master.pp
M modules/role/manifests/osm/slave.pp
M modules/role/manifests/postgres/master.pp
6 files changed, 23 insertions(+), 3 deletions(-)


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

diff --git a/modules/profile/manifests/maps/osm_slave.pp 
b/modules/profile/manifests/maps/osm_slave.pp
index ca338fc..8598ecc 100644
--- a/modules/profile/manifests/maps/osm_slave.pp
+++ b/modules/profile/manifests/maps/osm_slave.pp
@@ -20,10 +20,14 @@
 pg_password => $replication_pass,
 }
 
+class { 'postgresql::prometheus':
+require => Class['::postgresql::slave'],
+}
+
 $prometheus_command = "/usr/bin/prometheus_postgresql_replication_lag -m 
${master} -P ${replication_pass}"
 cron { 'prometheus-pg-replication-lag':
 ensure  => present,
 command => "${prometheus_command} >/dev/null 2>&1",
 }
 
-}
\ No newline at end of file
+}
diff --git a/modules/profile/manifests/netbox.pp 
b/modules/profile/manifests/netbox.pp
index 63be3f7..f7a8472 100644
--- a/modules/profile/manifests/netbox.pp
+++ b/modules/profile/manifests/netbox.pp
@@ -58,6 +58,9 @@
   $on_master = false
   }
 
+class { 'postgresql::prometheus':
+require => Class['$require_class'],
+}
 postgresql::user { 'replication@netmon2001':
 ensure   => present,
 user => 'replication',
@@ -131,6 +134,4 @@
   description   => 'Netbox HTTPS',
   check_command => 
'check_https_url!netbox.wikimedia.org!https://netbox.wikimedia.org',
   }
-
-
 }
diff --git a/modules/puppetmaster/manifests/puppetdb/database.pp 
b/modules/puppetmaster/manifests/puppetdb/database.pp
index 6af3f13..1432533 100644
--- a/modules/puppetmaster/manifests/puppetdb/database.pp
+++ b/modules/puppetmaster/manifests/puppetdb/database.pp
@@ -25,6 +25,9 @@
 }
 $on_master = false
 }
+class { 'postgresql::prometheus':
+require => Class[$require_class],
+}
 # Postgres replication and users
 $postgres_users = hiera('puppetmaster::puppetdb::postgres_users', undef)
 if $postgres_users {
diff --git a/modules/role/manifests/osm/master.pp 
b/modules/role/manifests/osm/master.pp
index 58fa6dd..4803f61 100644
--- a/modules/role/manifests/osm/master.pp
+++ b/modules/role/manifests/osm/master.pp
@@ -33,6 +33,10 @@
 pgstats_user => $passwords::osm::ganglia_user,
 pgstats_pass => $passwords::osm::ganglia_pass,
 }
+
+class { 'postgresql::prometheus':
+require => Class['postgresql::master'],
+}
 class { 'osm::ganglia':
 state_path   => '/srv/osmosis/state.txt',
 }
diff --git a/modules/role/manifests/osm/slave.pp 
b/modules/role/manifests/osm/slave.pp
index b1f9d17..07cc4e5 100644
--- a/modules/role/manifests/osm/slave.pp
+++ b/modules/role/manifests/osm/slave.pp
@@ -25,4 +25,8 @@
 pgstats_user => $passwords::osm::ganglia_user,
 pgstats_pass => $passwords::osm::ganglia_pass,
 }
+
+class { 'postgresql::prometheus':
+require => Class['postgresql::master'],
+}
 }
diff --git a/modules/role/manifests/postgres/master.pp 
b/modules/role/manifests/postgres/master.pp
index fe06b89..30ea388 100644
--- a/modules/role/manifests/postgres/master.pp
+++ b/modules/role/manifests/postgres/master.pp
@@ -14,6 +14,10 @@
 pgstats_pass => $passwords::postgres::ganglia_pass,
 }
 
+class { 'postgresql::prometheus':
+require => Class['postgresql::master'],
+}
+
 system::role { 'postgres::master':
 ensure  => 'present',
 description => 'Postgres db master',

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

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

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

[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: db-eqiad, db-codfw.php: Add db1109 and db1110

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: db-eqiad,db-codfw.php: Add db1109 and db1110
..


db-eqiad,db-codfw.php: Add db1109 and db1110

db1109 and db1110 will be part of s5/s8.
Adding it to the config, depooled, till they catch up

Bug: T180700
Change-Id: Ife402984a4ac9ac3ea922c826c96817cae126009
---
M wmf-config/db-codfw.php
M wmf-config/db-eqiad.php
2 files changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/wmf-config/db-codfw.php b/wmf-config/db-codfw.php
index 24755d6..61ebd9c 100644
--- a/wmf-config/db-codfw.php
+++ b/wmf-config/db-codfw.php
@@ -608,6 +608,8 @@
'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out
'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
+   'db1109' => '10.64.48.172', # do not remove or comment out
+   'db1110' => '10.64.32.31', # do not remove or comment out
'db2001' => '10.192.0.4', # do not remove or comment out
'db2002' => '10.192.0.5', # do not remove or comment out
'db2003' => '10.192.0.6', # do not remove or comment out
diff --git a/wmf-config/db-eqiad.php b/wmf-config/db-eqiad.php
index aebac7e..21ca4c2 100644
--- a/wmf-config/db-eqiad.php
+++ b/wmf-config/db-eqiad.php
@@ -154,6 +154,8 @@
'db1100' => 1,   # C2 3.6TB 512GB, old master, vslow
'db1104' => 100,  # B3 3.6TB 512GB, api #low weight
'db1106' => 500,  # D3 3.6TB 512GB
+   # 'db1109' => 500,  # D8 3.6TB 512GB #provisioning
+   # 'db1110' => 500,  # C3 3.6TB 512GB #provisioning
],
's6' => [
'db1061' => 0,   # C3 2.8TB 128GB, master
@@ -539,6 +541,8 @@
'db1105:3311' => '10.64.32.222:3311', # do not remove or comment out
'db1105:3312' => '10.64.32.222:3312', # do not remove or comment out
'db1106' => '10.64.48.13', # do not remove or comment out
+   'db1109' => '10.64.48.172', # do not remove or comment out
+   'db1110' => '10.64.32.31', # do not remove or comment out
'db2001' => '10.192.0.4', # do not remove or comment out
'db2002' => '10.192.0.5', # do not remove or comment out
'db2003' => '10.192.0.6', # do not remove or comment out

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ife402984a4ac9ac3ea922c826c96817cae126009
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/mediawiki-config[master]: Remove obsolete WikibaseQualityConstraints settings

2017-11-20 Thread Lucas Werkmeister (WMDE) (Code Review)

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

Change subject: Remove obsolete WikibaseQualityConstraints settings
..

Remove obsolete WikibaseQualityConstraints settings

The option to import constraints from statements has defaulted to true
for over three months (since I82a84b9eed). The option to use the new
wbcheckconstraints API output format has defaulted to true for one month
(since I1e1057622), and has since been entirely removed (in
Idc30ec9ea0). The options to check constraints on qualifiers and
references have defaulted to true for almost one month (since
I0ba0e6d073).

Change-Id: I528bac0706a54879b94b7d7f4f50f93d35b1e895
---
M wmf-config/Wikibase-production.php
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/wmf-config/Wikibase-production.php 
b/wmf-config/Wikibase-production.php
index c0e59d0..1d271eb 100644
--- a/wmf-config/Wikibase-production.php
+++ b/wmf-config/Wikibase-production.php
@@ -152,11 +152,6 @@
];
}
 
-   $wgWBQualityConstraintsEnableConstraintsImportFromStatements = true;
-   $wgWBQualityConstraintsNewApiOutputFormat = true;
-   $wgWBQualityConstraintsCheckQualifiers = true;
-   $wgWBQualityConstraintsCheckReferences = true;
-
$wgWBRepoSettings['writeFullEntityIdColumn'] = true;
 
// T112606

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I528bac0706a54879b94b7d7f4f50f93d35b1e895
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) 

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

[MediaWiki-commits] [Gerrit] mediawiki...WikibaseLexeme[master]: Introduce local NewStatement instead of reusing the Wikibase...

2017-11-20 Thread WMDE

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

Change subject: Introduce local NewStatement instead of reusing the 
WikibaseRepo one
..

Introduce local NewStatement instead of reusing the WikibaseRepo one

This also reduces the duplication in NewForm and NewSense that was
already growing.

The NewStatement class introduced here is *not* a copy from
WikibaseRepo, but rewritten in the most minimal way possible. Only
code that is actually called and needed is in there.

Change-Id: I53cd1f571d0100f9b8d976022c990b126615e72b
---
M src/DemoData/AskOut2Populator.php
M src/DemoData/HardLexemePopulator.php
M src/DemoData/LeiterLexemePopulator.php
M tests/phpunit/composer/DataModel/FormTest.php
M tests/phpunit/composer/DataModel/NewForm.php
M tests/phpunit/composer/DataModel/NewSense.php
A tests/phpunit/composer/DataModel/NewStatement.php
M 
tests/phpunit/composer/DataModel/Serialization/ExternalLexemeSerializerTest.php
M tests/phpunit/composer/DataModel/Serialization/StorageLexemeSerializerTest.php
M tests/phpunit/composer/DataModel/Services/Diff/FormDifferPatcherTest.php
10 files changed, 176 insertions(+), 53 deletions(-)


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

diff --git a/src/DemoData/AskOut2Populator.php 
b/src/DemoData/AskOut2Populator.php
index bc551f7..fb43c76 100644
--- a/src/DemoData/AskOut2Populator.php
+++ b/src/DemoData/AskOut2Populator.php
@@ -4,7 +4,7 @@
 
 use Wikibase\Lexeme\DataModel\Lexeme;
 use Wikibase\Lexeme\Tests\DataModel\NewSense;
-use Wikibase\Repo\Tests\NewStatement;
+use Wikibase\Lexeme\Tests\DataModel\NewStatement;
 
 /**
  * @license GPL-2.0+
diff --git a/src/DemoData/HardLexemePopulator.php 
b/src/DemoData/HardLexemePopulator.php
index 923172c..966bcea 100644
--- a/src/DemoData/HardLexemePopulator.php
+++ b/src/DemoData/HardLexemePopulator.php
@@ -6,7 +6,7 @@
 use Wikibase\Lexeme\DataModel\Lexeme;
 use Wikibase\Lexeme\Tests\DataModel\NewForm;
 use Wikibase\Lexeme\Tests\DataModel\NewSense;
-use Wikibase\Repo\Tests\NewStatement;
+use Wikibase\Lexeme\Tests\DataModel\NewStatement;
 
 /**
  * @license GPL-2.0+
diff --git a/src/DemoData/LeiterLexemePopulator.php 
b/src/DemoData/LeiterLexemePopulator.php
index 012241b..aa55020 100644
--- a/src/DemoData/LeiterLexemePopulator.php
+++ b/src/DemoData/LeiterLexemePopulator.php
@@ -6,7 +6,7 @@
 use Wikibase\Lexeme\DataModel\Lexeme;
 use Wikibase\Lexeme\Tests\DataModel\NewForm;
 use Wikibase\Lexeme\Tests\DataModel\NewSense;
-use Wikibase\Repo\Tests\NewStatement;
+use Wikibase\Lexeme\Tests\DataModel\NewStatement;
 
 /**
  * @license GPL-2.0+
diff --git a/tests/phpunit/composer/DataModel/FormTest.php 
b/tests/phpunit/composer/DataModel/FormTest.php
index 615ed57..acedf82 100644
--- a/tests/phpunit/composer/DataModel/FormTest.php
+++ b/tests/phpunit/composer/DataModel/FormTest.php
@@ -10,7 +10,6 @@
 use Wikibase\DataModel\Term\TermList;
 use Wikibase\Lexeme\DataModel\Form;
 use Wikibase\Lexeme\DataModel\FormId;
-use Wikibase\Repo\Tests\NewStatement;
 
 /**
  * @covers \Wikibase\Lexeme\DataModel\Form
@@ -93,7 +92,7 @@
->build()
],
'1 statement' => [
-   NewForm::havingStatement( 
NewStatement::noValueFor( 'P1' ) )
+   NewForm::havingStatement( 
NewStatement::forProperty( 'P1' ) )
->build()
],
];
@@ -109,7 +108,7 @@
public function provideEqualForms() {
$minimal = NewForm::havingRepresentation( 'en', 'minimal' );
$nonEmpty = $minimal->andGrammaticalFeature( 'Q1' )
-   ->andStatement( NewStatement::noValueFor( 'P1' ) );
+   ->andStatement( NewStatement::forProperty( 'P1' ) );
 
$minimalInstance = $minimal->build();
 
@@ -158,7 +157,7 @@
],
'+1 statement' => [
$form->build(),
-   $form->andStatement( NewStatement::noValueFor( 
'P1' ) )->build()
+   $form->andStatement( NewStatement::forProperty( 
'P1' ) )->build()
],
// FIXME: What kind of equality do we want for lists of 
ItemIds?
'grammatical feature in different order' => [
@@ -182,7 +181,7 @@
// Edit all mutable fields on the original
$original->getRepresentations()->setTextForLanguage( 'en', 
'added' );
$original->setGrammaticalFeatures( [ new ItemId( 'Q2' ) ] );
-   $original->getStatements()->addStatement( 
NewStatement::noValueFor( 'P1' )->build() );
+   $original->getStatements()->addStatement(

[MediaWiki-commits] [Gerrit] operations...mwbzutils[master]: gcc warning are now fatals (-Werror)

2017-11-20 Thread Hashar (Code Review)

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

Change subject: gcc warning are now fatals (-Werror)
..

gcc warning are now fatals (-Werror)

Change-Id: Ice5cf5d65a6b3b4add80a30d156f1d12cbb81b59
---
M xmldumps-backup/mwbzutils/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/mwbzutils 
refs/changes/43/392443/1

diff --git a/xmldumps-backup/mwbzutils/Makefile 
b/xmldumps-backup/mwbzutils/Makefile
index 6c92410..57be30e 100644
--- a/xmldumps-backup/mwbzutils/Makefile
+++ b/xmldumps-backup/mwbzutils/Makefile
@@ -20,7 +20,7 @@
 CC?= gcc
 BIGFILES   = -D_FILE_OFFSET_BITS=64
 CPPFLAGS  += $(BIGFILES) -DVERSION=\"$(VERSION)\"
-CFLAGS?= -Wall -O2
+CFLAGS?= -Wall -Werror -O2
 
 build: checkforbz2footer dumpbz2filefromoffset \
dumplastbz2block findpageidinbz2xml \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice5cf5d65a6b3b4add80a30d156f1d12cbb81b59
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/mwbzutils
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]: deployment servers: Switch to component/git

2017-11-20 Thread Muehlenhoff (Code Review)

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

Change subject: deployment servers: Switch to component/git
..

deployment servers: Switch to component/git

Initially this was kept in experimental, but this needs to be phased out
in favour of more split-out components. Previously this was switched to
jessie-backports already, but it hasn't been updated for a while (misses
two security updates), so switch the component/git.

Change-Id: I6295dcf8fe36cf678b16b1a586b3bd1bbf3da920
---
M modules/profile/manifests/mediawiki/deployment/server.pp
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/47/392447/1

diff --git a/modules/profile/manifests/mediawiki/deployment/server.pp 
b/modules/profile/manifests/mediawiki/deployment/server.pp
index 4a28ee8..050ca4f 100644
--- a/modules/profile/manifests/mediawiki/deployment/server.pp
+++ b/modules/profile/manifests/mediawiki/deployment/server.pp
@@ -35,15 +35,11 @@
 $deployable_networks = $::network::constants::deployable_networks
 $deployable_networks_ferm = join($deployable_networks, ' ')
 
-$git_packages = [
-'git',
-'git-man'
-]
-
 if os_version('debian == jessie') {
-apt::pin { $git_packages:
-pin  => 'release a=jessie-backports',
-priority => '1001',
+apt::repository { 'wikimedia-git':
+uri=> 'http://apt.wikimedia.org/wikimedia',
+dist   => "${::lsbdistcodename}-wikimedia",
+components => 'component/git',
 }
 }
 

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

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

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

[MediaWiki-commits] [Gerrit] mediawiki...Wikibase[master]: Fix NewStatement generating invalid statement GUIDs

2017-11-20 Thread WMDE

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

Change subject: Fix NewStatement generating invalid statement GUIDs
..

Fix NewStatement generating invalid statement GUIDs

Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
---
M repo/tests/phpunit/includes/NewStatement.php
1 file changed, 6 insertions(+), 6 deletions(-)


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

diff --git a/repo/tests/phpunit/includes/NewStatement.php 
b/repo/tests/phpunit/includes/NewStatement.php
index 1d5ab56..287a9cc 100644
--- a/repo/tests/phpunit/includes/NewStatement.php
+++ b/repo/tests/phpunit/includes/NewStatement.php
@@ -204,12 +204,12 @@
$result = new Statement( $snack );
$result->setRank( $this->rank );
 
-   if ( $this->guid ) {
-   if ( $this->guid === self::GENERATE_GUID ) {
-   $result->setGuid( $this->generateUuidV4() );
-   } else {
-   $result->setGuid( $this->guid );
-   }
+   if ( $this->guid === self::GENERATE_GUID ) {
+   $result->setGuid(
+   $this->propertyId->getSerialization() . '$' . 
$this->generateUuidV4()
+   );
+   } elseif ( $this->guid ) {
+   $result->setGuid( $this->guid );
}
 
foreach ( $this->qualifiers as $qualifier ) {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I731312a810bb9d97dd3cf78fb8a7125aecb82340
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] operations/puppet[production]: adding jdrewniak to deployment group

2017-11-20 Thread RobH (Code Review)

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

Change subject: adding jdrewniak to deployment group
..


adding jdrewniak to deployment group

Adding WMF staff Jan Drewniak to deployment group for updates on
mediawiki-portal deployments.

DO NOT MERGE THIS UNLESS YOU ARE IN OPERATIONS.  This sudo access must be
approved in the weekly operations team meeting, next on 2017-11-20

Bug: T180639
Change-Id: I2fb025f0d968f32c3cbd0e0af07d06a627554b0a
---
M modules/admin/data/data.yaml
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 68ee880..b35cc2d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -64,7 +64,7 @@
   mobrovac, nuria, thcipriani, joal, eevans, mforns, dpatrick, 
dcausse,
   bsitzmann, mholloway-shell, dduvall, dereckson,
   ladsgroup, bawolff, zfilipin, addshore, niharika29, ppchelko, 
pmiazga,
-  musikanimal]
+  musikanimal, jdrewniak]
 privileges: ['ALL = (www-data,apache,mwdeploy,l10nupdate) NOPASSWD: ALL',
  'ALL = NOPASSWD: /sbin/restart hhvm',
  'ALL = NOPASSWD: /sbin/start hhvm',

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

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

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

[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Small fixes

2017-11-20 Thread Chelsyx (Code Review)

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

Change subject: Small fixes
..


Small fixes

Change-Id: Ic5fb7e72a97ef532d5c84b2b07ccf655e401e1b2
---
M modules/test_summary/browser_os.R
M run.R
2 files changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/test_summary/browser_os.R 
b/modules/test_summary/browser_os.R
index 741e639..b73886d 100644
--- a/modules/test_summary/browser_os.R
+++ b/modules/test_summary/browser_os.R
@@ -1,6 +1,7 @@
 if ("user_agent" %in% names(events)) {
 
   user_agents <- dplyr::distinct(events, wiki, session_id, group, user_agent)
+  user_agents$user_agent <- gsub('(Kindle Fire HD[X]? [0-9\\.]{1,3})"', '\\1', 
user_agents$user_agent, fixed = FALSE) # remove double quote in kindle name
   user_agents <- user_agents %>%
 cbind(., purrr::map_df(.$user_agent, ~ wmf::null2na(jsonlite::fromJSON(.x, 
simplifyVector = FALSE %>%
 mutate(
diff --git a/run.R b/run.R
index 0d86df4..cd78fa1 100644
--- a/run.R
+++ b/run.R
@@ -33,7 +33,6 @@
 
 # Set up
 report_params <- yaml::yaml.load_file(opt$yaml_file)
-report_params <- yaml::yaml.load_file("reports/ltr_test_18lang.yaml")
 if (!dir.exists("reports")) {
   dir.create("reports")
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5fb7e72a97ef532d5c84b2b07ccf655e401e1b2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/autoreporter
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 
Gerrit-Reviewer: Chelsyx 

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

[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Small fixes

2017-11-20 Thread Chelsyx (Code Review)

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

Change subject: Small fixes
..

Small fixes

Change-Id: Ic5fb7e72a97ef532d5c84b2b07ccf655e401e1b2
---
M modules/test_summary/browser_os.R
M run.R
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/autoreporter 
refs/changes/06/392506/1

diff --git a/modules/test_summary/browser_os.R 
b/modules/test_summary/browser_os.R
index 741e639..b73886d 100644
--- a/modules/test_summary/browser_os.R
+++ b/modules/test_summary/browser_os.R
@@ -1,6 +1,7 @@
 if ("user_agent" %in% names(events)) {
 
   user_agents <- dplyr::distinct(events, wiki, session_id, group, user_agent)
+  user_agents$user_agent <- gsub('(Kindle Fire HD[X]? [0-9\\.]{1,3})"', '\\1', 
user_agents$user_agent, fixed = FALSE) # remove double quote in kindle name
   user_agents <- user_agents %>%
 cbind(., purrr::map_df(.$user_agent, ~ wmf::null2na(jsonlite::fromJSON(.x, 
simplifyVector = FALSE %>%
 mutate(
diff --git a/run.R b/run.R
index 0d86df4..cd78fa1 100644
--- a/run.R
+++ b/run.R
@@ -33,7 +33,6 @@
 
 # Set up
 report_params <- yaml::yaml.load_file(opt$yaml_file)
-report_params <- yaml::yaml.load_file("reports/ltr_test_18lang.yaml")
 if (!dir.exists("reports")) {
   dir.create("reports")
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5fb7e72a97ef532d5c84b2b07ccf655e401e1b2
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/autoreporter
Gerrit-Branch: master
Gerrit-Owner: Chelsyx 

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

[MediaWiki-commits] [Gerrit] operations/puppet[production]: Repool labvirt1015, again

2017-11-20 Thread Andrew Bogott (Code Review)

Andrew Bogott has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392514 )

Change subject: Repool labvirt1015, again
..

Repool labvirt1015, again

Change-Id: I4a276e98cd21100da327c93da01cfff28a46f252
---
M hieradata/eqiad/profile/openstack/main/nova.yaml
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/hieradata/eqiad/profile/openstack/main/nova.yaml 
b/hieradata/eqiad/profile/openstack/main/nova.yaml
index d8d80f6..29a501f 100644
--- a/hieradata/eqiad/profile/openstack/main/nova.yaml
+++ b/hieradata/eqiad/profile/openstack/main/nova.yaml
@@ -27,4 +27,5 @@
   - labvirt1012
   - labvirt1013
   - labvirt1014
+  - labvirt1015
   - labvirt1017

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a276e98cd21100da327c93da01cfff28a46f252
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

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

[MediaWiki-commits] [Gerrit] mediawiki/core[wmf/1.31.0-wmf.7]: objectcache: make sure variant keys are namespaced as keys s...

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: objectcache: make sure variant keys are namespaced as keys 
should be
..


objectcache: make sure variant keys are namespaced as keys should be

Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
(cherry picked from commit f23fb835fc49dcb38f9ec898831921a908e8c6e4)
---
M includes/libs/objectcache/WANObjectCache.php
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/includes/libs/objectcache/WANObjectCache.php 
b/includes/libs/objectcache/WANObjectCache.php
index e19cf48..f39ac4b 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -912,7 +912,7 @@
// Value existed before with a 
different version; use variant key.
// Reflect purges to $key by requiring 
that this key value be newer.
$value = $this->doGetWithSetCallback(
-   'cache-variant:' . md5( $key ) 
. ":$version",
+   $this->makeGlobalKey( 
'WANCache-key-variant', md5( $key ), $version ),
$ttl,
$callback,
// Regenerate value if not 
newer than $key

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.31.0-wmf.7
Gerrit-Owner: Aaron Schulz 
Gerrit-Reviewer: Aaron Schulz 
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]: Crimean Tatar Transliteration

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Crimean Tatar Transliteration
..


Crimean Tatar Transliteration

This is a first pass at Latin/Cyrillic translitertion for Crimean
Tatar (crh).

Includes transliteration tables, prefix/suffix mappings, regex
mappings, and exceptions lists for words and abbreviations.

Regularize CRH language name in messages/* files.

Fix "varient" typos in qqq.json.

Add unit tests for CRH transliteration.

Bug: T23582
Change-Id: I424703f99adf837f6217872b882d1ea26bfdd068
---
M autoload.php
M languages/LanguageConverter.php
A languages/classes/LanguageCrh.php
A languages/data/CrhExceptions.php
M languages/i18n/crh-cyrl.json
M languages/i18n/crh-latn.json
M languages/i18n/en.json
M languages/i18n/qqq.json
M languages/messages/MessagesCrh.php
M languages/messages/MessagesCrh_cyrl.php
M languages/messages/MessagesCrh_latn.php
A tests/phpunit/languages/classes/LanguageCrhTest.php
12 files changed, 1,227 insertions(+), 13 deletions(-)

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



diff --git a/autoload.php b/autoload.php
index aef7e5e..fe28857 100644
--- a/autoload.php
+++ b/autoload.php
@@ -312,6 +312,7 @@
'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
'CreateFileOp' => __DIR__ . 
'/includes/libs/filebackend/fileop/CreateFileOp.php',
'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
+   'CrhConverter' => __DIR__ . '/languages/classes/LanguageCrh.php',
'CryptHKDF' => __DIR__ . '/includes/libs/CryptHKDF.php',
'CryptRand' => __DIR__ . '/includes/libs/CryptRand.php',
'CssContent' => __DIR__ . '/includes/content/CssContent.php',
@@ -706,6 +707,7 @@
'LanguageBs' => __DIR__ . '/languages/classes/LanguageBs.php',
'LanguageCode' => __DIR__ . '/languages/LanguageCode.php',
'LanguageConverter' => __DIR__ . '/languages/LanguageConverter.php',
+   'LanguageCrh' => __DIR__ . '/languages/classes/LanguageCrh.php',
'LanguageCu' => __DIR__ . '/languages/classes/LanguageCu.php',
'LanguageDsb' => __DIR__ . '/languages/classes/LanguageDsb.php',
'LanguageEn' => __DIR__ . '/languages/classes/LanguageEn.php',
@@ -885,6 +887,7 @@
'MediaWiki\\Interwiki\\ClassicInterwikiLookup' => __DIR__ . 
'/includes/interwiki/ClassicInterwikiLookup.php',
'MediaWiki\\Interwiki\\InterwikiLookup' => __DIR__ . 
'/includes/interwiki/InterwikiLookup.php',
'MediaWiki\\Interwiki\\InterwikiLookupAdapter' => __DIR__ . 
'/includes/interwiki/InterwikiLookupAdapter.php',
+   'MediaWiki\\Languages\\Data\\CrhExceptions' => __DIR__ . 
'/languages/data/CrhExceptions.php',
'MediaWiki\\Languages\\Data\\Names' => __DIR__ . 
'/languages/data/Names.php',
'MediaWiki\\Languages\\Data\\ZhConversion' => __DIR__ . 
'/languages/data/ZhConversion.php',
'MediaWiki\\Linker\\LinkRenderer' => __DIR__ . 
'/includes/linker/LinkRenderer.php',
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 1f720af..a84c4b8 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -39,6 +39,7 @@
 */
static public $languagesWithVariants = [
'en',
+   'crh',
'gan',
'iu',
'kk',
diff --git a/languages/classes/LanguageCrh.php 
b/languages/classes/LanguageCrh.php
new file mode 100644
index 000..f384471
--- /dev/null
+++ b/languages/classes/LanguageCrh.php
@@ -0,0 +1,296 @@
+https://crh.wikipedia.org/wiki/Qullan%C4%B1c%C4%B1:Don_Alessandro/Translit
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Language
+ */
+
+/**
+ * Crimean Tatar (Qırımtatarca) converter routines
+ *
+ * @ingroup Language
+ */
+class CrhConverter extends LanguageConverter {
+   // Defines working character ranges
+   const WORD_BEGINS = '\r\s\"\'\(\)\-<>\[\]\/.,:;!?';
+   const WORD_ENDS = '\r\s\"\'\(\)\-<>\[\]\/.,:;!?';
+
+   // Cyrillic
+   const C_UC = 'АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ'; # Crimean Tatar 
Cyrillic uppercase
+

[MediaWiki-commits] [Gerrit] wikimedia...crm[deployment]: Merge branch 'master' of https://gerrit.wikimedia.org/r/wiki...

2017-11-20 Thread Eileen (Code Review)

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

Change subject: Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment
..

Merge branch 'master' of 
https://gerrit.wikimedia.org/r/wikimedia/fundraising/crm into deployment

3cbf0818a75e21dd0eb5029c1ad8c0c721aa111c Add extended reports extension to add 
Address History tab option.
7292e063a2f0274415ac7066550b985a42022674 Enable extended report

Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be
---
0 files changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm 
refs/changes/30/392530/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38db002a3b2ca5cfb30b9a6fb1338da03cce26be
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: deployment
Gerrit-Owner: Eileen 

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

[MediaWiki-commits] [Gerrit] wikimedia...crm[master]: (trivial) Fix index value for overall message age

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: (trivial) Fix index value for overall message age
..


(trivial) Fix index value for overall message age

Change-Id: I68e7d6589638283fa2f9bf1178666b658238ba6d
---
M sites/all/modules/queue2civicrm/queue2civicrm.module
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/sites/all/modules/queue2civicrm/queue2civicrm.module 
b/sites/all/modules/queue2civicrm/queue2civicrm.module
index 3f2f4cc..c15367e 100644
--- a/sites/all/modules/queue2civicrm/queue2civicrm.module
+++ b/sites/all/modules/queue2civicrm/queue2civicrm.module
@@ -161,7 +161,7 @@
 
   if ($processed > 0) {
 watchdog('queue2civicrm', 'Successfully processed ' . $processed . ' 
contribution(s).');
-watchdog('queue2civicrm', 'Average message age: ' . $ageMetrics['overall'] 
. ' seconds.');
+watchdog('queue2civicrm', 'Average message age: ' . 
$ageMetrics['overall_message_age'] . ' seconds.');
   }
   else {
 watchdog('queue2civicrm', 'No contributions processed.');

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68e7d6589638283fa2f9bf1178666b658238ba6d
Gerrit-PatchSet: 2
Gerrit-Project: wikimedia/fundraising/crm
Gerrit-Branch: master
Gerrit-Owner: Ejegg 
Gerrit-Reviewer: Eileen 
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]: Ores: Emergency disable on frwiki and ruwiki

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Ores: Emergency disable on frwiki and ruwiki
..


Ores: Emergency disable on frwiki and ruwiki

Bug: T181006
Change-Id: I887eb8e30061e2e8fac448c7512ee420142b6874
---
M wmf-config/InitialiseSettings.php
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index c651927..8eef61b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -18945,13 +18945,13 @@
'etwiki' => true, // T159609
'fawiki' => true, // T130211
'fiwiki' => true, // T163011
-   'frwiki' => true, // T165044
+   'frwiki' => false, // T181006
'hewiki' => true, // T161621
'nlwiki' => true, // T139432
'plwiki' => true, // T140005
'ptwiki' => true, // T139692
'rowiki' => true, // T170723
-   'ruwiki' => true, // T139541
+   'ruwiki' => false, // T181006
'sqwiki' => true, // T170723
'trwiki' => true, // T139992
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I887eb8e30061e2e8fac448c7512ee420142b6874
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Jcrespo 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Legoktm 
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...CirrusSearch[master]: HTMLCompletionProfileSettings: Do not use `` tags

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: HTMLCompletionProfileSettings: Do not use `` tags
..


HTMLCompletionProfileSettings: Do not use `` tags

This is invalid HTML, `` is only allowed as the first child of
a ``.

Change-Id: I774fca049d517bea72bed0a1b772008e12a3cddd
---
M includes/HTMLCompletionProfileSettings.php
1 file changed, 3 insertions(+), 3 deletions(-)

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



diff --git a/includes/HTMLCompletionProfileSettings.php 
b/includes/HTMLCompletionProfileSettings.php
index 94d7c93..2b2039e 100644
--- a/includes/HTMLCompletionProfileSettings.php
+++ b/includes/HTMLCompletionProfileSettings.php
@@ -37,7 +37,7 @@
 */
public function getInputHTML( $value ) {
$html = Html::openElement( 'div' );
-   $html .= Html::element( 'legend',
+   $html .= Html::element( 'p',
[],
wfMessage( 'cirrussearch-pref-completion-profile-help' )
);
@@ -46,7 +46,7 @@
[],
wfMessage( 'cirrussearch-pref-completion-section-desc' 
)->text()
);
-   $html .= Html::rawElement( 'legend',
+   $html .= Html::rawElement( 'p',
[],
wfMessage( 
'cirrussearch-pref-completion-section-legend' )->parse()
);
@@ -61,7 +61,7 @@
[],
wfMessage( 
'cirrussearch-pref-completion-legacy-section-desc' )->text()
);
-   $html .= Html::rawElement( 'legend',
+   $html .= Html::rawElement( 'p',
[],
wfMessage( 
'cirrussearch-pref-completion-legacy-section-legend' )->parse()
);

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I774fca049d517bea72bed0a1b772008e12a3cddd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CirrusSearch
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński 
Gerrit-Reviewer: DCausse 
Gerrit-Reviewer: EBernhardson 
Gerrit-Reviewer: Gehel 
Gerrit-Reviewer: Jforrester 
Gerrit-Reviewer: Smalyshev 
Gerrit-Reviewer: Tjones 
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]: Set wgCommentTableSchemaMigrationStage for some RevisionTests

2017-11-20 Thread jenkins-bot (Code Review)

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

Change subject: Set wgCommentTableSchemaMigrationStage for some RevisionTests
..


Set wgCommentTableSchemaMigrationStage for some RevisionTests

Bug: T180922
Change-Id: Ib88b53e36a66042b3c177cae0663040b4fb14a4c
---
M tests/phpunit/includes/RevisionTest.php
1 file changed, 3 insertions(+), 0 deletions(-)

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



diff --git a/tests/phpunit/includes/RevisionTest.php 
b/tests/phpunit/includes/RevisionTest.php
index 6965f09..d933d93 100644
--- a/tests/phpunit/includes/RevisionTest.php
+++ b/tests/phpunit/includes/RevisionTest.php
@@ -372,6 +372,7 @@
 * @covers Revision::fetchFromConds
 */
public function testFetchFromConds( $flags, array $options ) {
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$conditions = [ 'conditionsArray' ];
 
$db = $this->getMock( IDatabase::class );
@@ -650,6 +651,7 @@
public function testSelectFields( $contentHandlerUseDB, $expected ) {
$this->hideDeprecated( 'Revision::selectFields' );
$this->setMwGlobals( 'wgContentHandlerUseDB', 
$contentHandlerUseDB );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals( $expected, Revision::selectFields() );
}
 
@@ -708,6 +710,7 @@
public function testSelectArchiveFields( $contentHandlerUseDB, 
$expected ) {
$this->hideDeprecated( 'Revision::selectArchiveFields' );
$this->setMwGlobals( 'wgContentHandlerUseDB', 
$contentHandlerUseDB );
+   $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', 
MIGRATION_OLD );
$this->assertEquals( $expected, Revision::selectArchiveFields() 
);
}
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib88b53e36a66042b3c177cae0663040b4fb14a4c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore 
Gerrit-Reviewer: Anomie 
Gerrit-Reviewer: Daniel Kinzler 
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

1 2 3 4 >

1 - 100 of 326 matches

Mail list logo