[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Add cluster manager hosts to allowed admin port users
Jcrespo has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/362217 )
Change subject: mariadb: Add cluster manager hosts to allowed admin port users
..
mariadb: Add cluster manager hosts to allowed admin port users
Because socket authentication, accessing the port 3307 is no
longer possible from localhost. Adding extra hosts that should
be root-only as clients to admin in case of an emergency.
Firewall + grant changes was the cause why alternative admin port
was not available, not overload.
Allow only ipv4 for now, as there is not application-level suport
for ipv6 yet (it requires grants refactoring).
Reopen the port on labs dns hosts for root/tendril monitoring and
managing (with a very restricted range).
Change-Id: I2de60f5310a24bea1a5f9726fc8b53a76e45fedd
---
M modules/network/manifests/constants.pp
M modules/role/manifests/labs/dns.pp
M modules/role/manifests/mariadb/ferm.pp
3 files changed, 11 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, but someone else must approve
jenkins-bot: Verified
Jcrespo: Looks good to me, approved
diff --git a/modules/network/manifests/constants.pp
b/modules/network/manifests/constants.pp
index 50d8fb3..3877e3e 100644
--- a/modules/network/manifests/constants.pp
+++ b/modules/network/manifests/constants.pp
@@ -77,6 +77,12 @@
'10.192.0.140',# sarin.codfw.wmnet
'2620:0:860:101:10:192:0:140', # sarin.codfw.wmnet
],
+'mysql_root_clients' => [
+# ipv6 interfaces are not yet allowed due to mysql grants
+'10.64.0.15', # db1011.eqiad.wmnet
+'10.64.32.20', # neodymium.eqiad.wmnet
+'10.192.0.140',# sarin.codfw.wmnet
+],
'kafka_brokers_main' => [
'10.64.0.11', #
kafka1001.eqiad.wmnet
'2620:0:861:101:1618:77ff:fe33:5242', #
kafka1001.eqiad.wmnet
diff --git a/modules/role/manifests/labs/dns.pp
b/modules/role/manifests/labs/dns.pp
index 0da4ff3..8e3416e 100644
--- a/modules/role/manifests/labs/dns.pp
+++ b/modules/role/manifests/labs/dns.pp
@@ -16,6 +16,10 @@
# install mysql locally on all dns servers
include role::mariadb::monitor::dba
+# for DBA admin root purposes
+ferm::rule { 'mariadb_dba':
+rule => 'saddr @resolve(($MYSQL_ROOT_CLIENTS)) proto tcp dport (3306)
ACCEPT;',
+}
# Note: This will install mariadb but won't set up the
# pdns database. Manual steps are:
diff --git a/modules/role/manifests/mariadb/ferm.pp
b/modules/role/manifests/mariadb/ferm.pp
index 239761a..40af1b3 100644
--- a/modules/role/manifests/mariadb/ferm.pp
+++ b/modules/role/manifests/mariadb/ferm.pp
@@ -12,6 +12,6 @@
# for DBA purposes
ferm::rule { 'mariadb_dba':
-rule => 'saddr @resolve((db1011.eqiad.wmnet)) proto tcp dport (3307)
ACCEPT;',
+rule => 'saddr @resolve(($MYSQL_ROOT_CLIENTS)) proto tcp dport (3307)
ACCEPT;',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/362217
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2de60f5310a24bea1a5f9726fc8b53a76e45fedd
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Jcrespo
Gerrit-Reviewer: Alexandros Kosiaris
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] search/extra[master]: degrade queries based on latency percentiles
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/370986 )
Change subject: degrade queries based on latency percentiles
..
degrade queries based on latency percentiles
Expose p95 latency as a condition for degrading search queries.
Change-Id: I70ae1b148e1f15ea77f2fec5315c47f7b3dc
---
M docs/degraded_router.md
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
M src/main/java/org/wikimedia/search/extra/latency/LatencyStatsAction.java
M src/main/java/org/wikimedia/search/extra/latency/SearchLatencyListener.java
M src/main/java/org/wikimedia/search/extra/latency/SearchLatencyProbe.java
M
src/main/java/org/wikimedia/search/extra/router/AbstractRouterQueryBuilder.java
M
src/main/java/org/wikimedia/search/extra/router/DegradedRouterQueryBuilder.java
A src/main/java/org/wikimedia/search/extra/router/SystemLoad.java
M
src/test/java/org/wikimedia/search/extra/router/DegradedRouterBuilderESTest.java
M
src/test/java/org/wikimedia/search/extra/router/DegradedRouterQueryBuilderParserTest.java
10 files changed, 226 insertions(+), 95 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, but someone else must approve
DCausse: Looks good to me, approved
diff --git a/docs/degraded_router.md b/docs/degraded_router.md
index c727c2f..905b74f 100644
--- a/docs/degraded_router.md
+++ b/docs/degraded_router.md
@@ -31,6 +31,35 @@
}
}
+
+GET /_search
+{
+"stats": ["some_bucket"],
+"query": {
+"degraded_router": {
+"fallback": {
+"phrase_match": {
+"content": "what should we do today?",
+}
+}
+"conditions": [
+{
+"gte": 1000,
+"type": "latency",
+"bucket": "some_bucket",
+"percentile": 95,
+"query": {
+"match": {
+"content": "what should we do today?"
+}
+}
+}
+]
+}
+}
+}
+
+
A match query will be issued if system cpu usage is above 70%. Otherwise
a phrase match query will be issued.
@@ -39,10 +68,17 @@
* `fallback` The query to apply if none of the conditions applies.
* `conditions` Array of conditions (the first that matches wins):
-* `type`: The type of metric to compare against. Can be `cpu` for cpu%, or
- `load`for 1 minute load average.
+* `type`: The type of metric to compare against. Can be `cpu` for cpu%,
+ `load`for 1 minute load average, or latency for percentile latency
+ in milliseconds of a specific stats bucket.
+* `bucket` : A stats bucket matching one provided in the `stats` key of
+ some query. Must only be provided with the `latency` type.
+* `percentile` : A latency percentile, in [0, 100], to compare against.
+ Latency percentiles represent the last 1 minute of queries and are
+ updated every 5 seconds. Must only be provided with the `latency` type.
* `predicate` : can be `eq`, `gt`, `gte`, `lt`, or `lte`, the value is the
number
-to compare against the value reported by `type`
+ to compare against the value reported by `type`
* `query` The query to apply if the condition is met.
+
Note that the query parser does not check the conditions coherence
diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
index 159918a..1862eaa 100644
--- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
+++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
@@ -35,6 +35,7 @@
import org.wikimedia.search.extra.levenshtein.LevenshteinDistanceScoreBuilder;
import org.wikimedia.search.extra.regex.SourceRegexQueryBuilder;
import org.wikimedia.search.extra.router.DegradedRouterQueryBuilder;
+import org.wikimedia.search.extra.router.SystemLoad;
import org.wikimedia.search.extra.router.TokenCountRouterQueryBuilder;
import org.wikimedia.search.extra.superdetectnoop.ChangeHandler;
import org.wikimedia.search.extra.superdetectnoop.SetHandler;
@@ -61,13 +62,13 @@
public class ExtraPlugin extends Plugin implements SearchPlugin,
AnalysisPlugin, ScriptPlugin, ActionPlugin {
private final SearchLatencyListener latencyListener;
-private final OsService osService;
private final MutableSupplier threadPoolSupplier;
+private final SystemLoad loadStats;
public ExtraPlugin(Settings settings) {
threadPoolSupplier = new MutableSupplier<>();
latencyListener = new SearchLatencyListener(settings,
threadPoolSupplier);
-osService = new OsService(settings);
+loadStats = new SystemLoad(latencyListener, new OsService(settings));
}
@Override
@@ -88,7 +89,7 @@
new QuerySpec<>(So
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Extend aliases
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376196 )
Change subject: Extend aliases
..
Extend aliases
Change-Id: I9b3b55b4c1a94762be8b81f72d889a5b5b2060d9
---
M modules/profile/templates/cumin/aliases.yaml.erb
1 file changed, 16 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/376196/1
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index 5f365d7..74164ca 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -15,6 +15,7 @@
conf-canary: P{conf2001.codfw.wmnet}
conf-codfw: A:conf and A:codfw
conf-eqiad: A:conf and A:eqiad
+contint: P{R:class = role::ci::master}
cp: P{R:class = role::cache::misc or R:class = role::cache::upload or R:class
= role::cache::text}
cp-canary: P{R:class = role::cache::canary}
cp-codfw: A:cp and A:codfw
@@ -33,6 +34,7 @@
db-misc-servers: P{R:class = role::mariadb::labs_deprecated}
db-parsercache: P{R:class = role::mariadb::parsercache}
dbmonitor: P{R:class = role::tendril}
+debugproxy: P{R:class = role::debug_proxy}
deployment-servers: P{R:class = role::deployment_server}
dns-auth: P{R:class = role::authdns::server}
dns-auth-canary: P{eeden.wikimedia.org}
@@ -50,12 +52,14 @@
ganeti-canary: P{ganeti2001.codfw.wmnet}
ganeti-codfw: A:ganeti and A:codfw
ganeti-eqiad: A:ganeti and A:eqiad
+gerrit: P{R:class = role::gerrit::server}
graphite: P{R:class = role::graphite::production or R:class =
role::labs::graphite}
hadoop: A:hadoop-worker or A:hadoop-master or A:hadoop-standby
hadoop-master: P{R:class = role::analytics_cluster::hadoop::master}
hadoop-standby: P{R:class = role::analytics_cluster::hadoop::standby}
hadoop-worker: P{R:class = role::analytics_cluster::hadoop::worker}
hadoop-worker-canary: P{analytics1030.eqiad.wmnet}
+icinga: P{R:class = role::icinga}
installserver: P{R:class = role::installserver::http}
jobqueue-redis-codfw: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:codfw
jobqueue-redis-eqiad: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:eqiad
@@ -78,6 +82,7 @@
labtest: P{R:class = role::wmcs::openstack::labtestn::net or R:class =
role::wmcs::openstack::labtest::virt or R:class =
role::wmcs::openstack::labtest::net or R:class =
role::wmcs::openstack::labtest::control or R:class =
role::wmcs::openstack::labtestn::control or R:class =
role::labs::puppetmaster::frontend or R:class =
role::wmcs::openstack::labtest::services or R:class =
role::wmcs::openstack::labtestn::services}
labvirt: P{R:class = role::wmcs::openstack::main::virt}
labvirt-canary: P{labvirt1001.eqiad.wmnet}
+labweb: P{R:class = role::wmcs::openstack::main::web or R:class =
role::wmcs::openstack::main::wikitech or R:class =
role::wmcs::openstack::main::horizon}
logstash: P{R:class = role::logstash::collector or R:class =
role::logstash::elasticsearch}
logstash-canary: P{logstash1001.eqiad.wmnet}
lvs: P{R:class = role::lvs::balancer}
@@ -93,7 +98,6 @@
memcached-canary: P{mc1019.eqiad.wmnet}
memcached-codfw: A:memcached and A:codfw
memcached-eqiad: A:memcached and A:eqiad
-misc-others: P{R:class = role::spare::system or R:class = role::test::system
or R:class = role::security::tools}
mw: P{R:class = role::mediawiki::appserver}
mw-api: P{R:class = role::mediawiki::appserver::api}
mw-api-canary: P{R:class = role::mediawiki::appserver::canary_api}
@@ -115,8 +119,10 @@
mw-videoscaler-canary: P{mw1168.eqiad.wmnet}
mw-videoscaler-codfw: A:mw-videoscaler and A:codfw
mw-videoscaler-eqiad: A:mw-videoscaler and A:eqiad
+mwlog: P{R:class = role::xenon}
mx: P{R:class = role::mail::mx}
mx-canary: P{mx2001.wikimedia.org}
+netmon: P{R:class = role::network::monitor}
notebook: P{R:class = role::paws_internal::jupyterhub}
ocg: P{R:class = role::ocg}
openldap: P{R:class = role::openldap::corp or R:class = role::openldap::labs}
@@ -131,6 +137,7 @@
parsoid-canary: P{wtp1001.eqiad.wmnet}
parsoid-codfw: A:parsoid and A:codfw
parsoid-eqiad: A:parsoid and A:eqiad
+planet: P{R:class = role::planet_server}
poolcounter: P{R:class = role::poolcounter::server}
poolcounter-codfw: A:poolcounter and A:codfw
poolcounter-eqiad: A:poolcounter and A:eqiad
@@ -171,5 +178,11 @@
yubiauth: P{R:class = role::yubiauth_server}
# Miscellaneous groups
-misc-apache: P{R:class = role::microsites::peopleweb or R:class =
grafana::production or R:class = role::requesttracker_server}
-misc-ops: A:installserver or A:cumin or A:url-downloader
+misc-analytics: P{R:class = role::statistics::web or R:class =
role::piwik::server} or A:eventlogging
+misc-apache: P{R:class = role::microsites::peopleweb or R:class =
grafana::production or R:class = role::requesttracker_server or R:class =
role::releases or R:class = role::otrs or R:class = role::ganglia::web} or
A:planet
+m
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: reprovision restbase1009 with cassandra 3
Filippo Giunchedi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376195 )
Change subject: cassandra: reprovision restbase1009 with cassandra 3
..
cassandra: reprovision restbase1009 with cassandra 3
Bug: T169939
Change-Id: I2a3f37d9e3a48c5a2ab2432df3c3143fac4b5b42
---
M hieradata/hosts/restbase1009.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
4 files changed, 53 insertions(+), 15 deletions(-)
Approvals:
jenkins-bot: Verified
Filippo Giunchedi: Looks good to me, approved
diff --git a/hieradata/hosts/restbase1009.yaml
b/hieradata/hosts/restbase1009.yaml
index ad21885..a9b287b 100644
--- a/hieradata/hosts/restbase1009.yaml
+++ b/hieradata/hosts/restbase1009.yaml
@@ -1 +1,2 @@
profile::cassandra::rack: 'd'
+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 4a28e98..b7d378a 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -33,6 +33,9 @@
- restbase2005-a.codfw.wmnet
- restbase2005-b.codfw.wmnet
- restbase2005-c.codfw.wmnet
+ - restbase1009-a.eqiad.wmnet
+ - restbase1009-b.eqiad.wmnet
+ - restbase1009-c.eqiad.wmnet
#
# Cassandra
@@ -89,13 +92,13 @@
listen_address: 10.64.32.195
c:
listen_address: 10.64.32.196
- "restbase1009.eqiad.wmnet":
-a:
- listen_address: 10.64.48.120
-b:
- listen_address: 10.64.48.130
-c:
- listen_address: 10.64.48.131
+ #"restbase1009.eqiad.wmnet":
+ # a:
+ #listen_address: 10.64.48.120
+ # b:
+ #listen_address: 10.64.48.130
+ # c:
+ #listen_address: 10.64.48.131
"restbase1010.eqiad.wmnet":
a:
listen_address: 10.64.0.114
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 8f48d17..f9e80dc 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -55,13 +55,43 @@
# listen_address: 10.64.32.195
# c:
# listen_address: 10.64.32.196
- # "restbase1009.eqiad.wmnet":
- # a:
- # listen_address: 10.64.48.120
- # b:
- # listen_address: 10.64.48.130
- # c:
- # listen_address: 10.64.48.131
+ "restbase1009.eqiad.wmnet":
+a:
+ listen_address: 10.64.48.120
+ 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
+b:
+ listen_address: 10.64.48.130
+ 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
+c:
+ listen_address: 10.64.48.131
+ 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
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 6099a1f..f0b0ab1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2073,10 +2073,14 @@
}
# restbase eqiad cluster
-node /^restbase10(0[789]|1[012345678])\.eqiad\.wmnet$/ {
+node /^restbase10(0[78]|1[012345678])\.eqiad\.wmnet$/ {
role(restbase::production)
}
+node /^restbase100[9]\.eqiad\.wmnet$/ {
+role(restbase::production_ng)
+}
+
# restbase codfw cluster
node /^restbase20(0[246789]|1[012])\.codfw\.wmnet$/ {
role(restbase::production)
--
To view, visit https://gerrit.wikimedia.org/r/376195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2a3f37d9e3a48c5a2ab2432df3c3143fac4b5b42
Gerrit-Patc
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cassandra: reprovision restbase1009 with cassandra 3
Filippo Giunchedi has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376195 )
Change subject: cassandra: reprovision restbase1009 with cassandra 3
..
cassandra: reprovision restbase1009 with cassandra 3
Bug: T169939
Change-Id: I2a3f37d9e3a48c5a2ab2432df3c3143fac4b5b42
---
M hieradata/hosts/restbase1009.yaml
M hieradata/role/common/restbase/production.yaml
M hieradata/role/common/restbase/production_ng.yaml
M manifests/site.pp
4 files changed, 53 insertions(+), 15 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/376195/1
diff --git a/hieradata/hosts/restbase1009.yaml
b/hieradata/hosts/restbase1009.yaml
index ad21885..a9b287b 100644
--- a/hieradata/hosts/restbase1009.yaml
+++ b/hieradata/hosts/restbase1009.yaml
@@ -1 +1,2 @@
profile::cassandra::rack: 'd'
+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 4a28e98..b7d378a 100644
--- a/hieradata/role/common/restbase/production.yaml
+++ b/hieradata/role/common/restbase/production.yaml
@@ -33,6 +33,9 @@
- restbase2005-a.codfw.wmnet
- restbase2005-b.codfw.wmnet
- restbase2005-c.codfw.wmnet
+ - restbase1009-a.eqiad.wmnet
+ - restbase1009-b.eqiad.wmnet
+ - restbase1009-c.eqiad.wmnet
#
# Cassandra
@@ -89,13 +92,13 @@
listen_address: 10.64.32.195
c:
listen_address: 10.64.32.196
- "restbase1009.eqiad.wmnet":
-a:
- listen_address: 10.64.48.120
-b:
- listen_address: 10.64.48.130
-c:
- listen_address: 10.64.48.131
+ #"restbase1009.eqiad.wmnet":
+ # a:
+ #listen_address: 10.64.48.120
+ # b:
+ #listen_address: 10.64.48.130
+ # c:
+ #listen_address: 10.64.48.131
"restbase1010.eqiad.wmnet":
a:
listen_address: 10.64.0.114
diff --git a/hieradata/role/common/restbase/production_ng.yaml
b/hieradata/role/common/restbase/production_ng.yaml
index 8f48d17..f9e80dc 100644
--- a/hieradata/role/common/restbase/production_ng.yaml
+++ b/hieradata/role/common/restbase/production_ng.yaml
@@ -55,13 +55,43 @@
# listen_address: 10.64.32.195
# c:
# listen_address: 10.64.32.196
- # "restbase1009.eqiad.wmnet":
- # a:
- # listen_address: 10.64.48.120
- # b:
- # listen_address: 10.64.48.130
- # c:
- # listen_address: 10.64.48.131
+ "restbase1009.eqiad.wmnet":
+a:
+ listen_address: 10.64.48.120
+ 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
+b:
+ listen_address: 10.64.48.130
+ 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
+c:
+ listen_address: 10.64.48.131
+ 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
"restbase2001.codfw.wmnet":
a:
listen_address: 10.192.16.162
diff --git a/manifests/site.pp b/manifests/site.pp
index 6099a1f..f0b0ab1 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2073,10 +2073,14 @@
}
# restbase eqiad cluster
-node /^restbase10(0[789]|1[012345678])\.eqiad\.wmnet$/ {
+node /^restbase10(0[78]|1[012345678])\.eqiad\.wmnet$/ {
role(restbase::production)
}
+node /^restbase100[9]\.eqiad\.wmnet$/ {
+role(restbase::production_ng)
+}
+
# restbase codfw cluster
node /^restbase20(0[246789]|1[012])\.codfw\.wmnet$/ {
role(restbase::production)
--
To view, visit https://gerrit.wikimedia.org/r/376195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2a3f37d9e3a48c5a2ab2432df3c3143fac4b5b42
Gerrit-Patch
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add WMDE log channel
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376191 ) Change subject: Add WMDE log channel .. Add WMDE log channel Bug: T174948 Change-Id: If515dfb93420ea8bdcd708f200155a36bfadae18 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index dbd4eba..45cd34c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -5228,6 +5228,7 @@ 'DBConnection' => 'error', 'DBQuery' => 'warning', 'LoginNotify' => 'debug', + 'WMDE' => 'debug', // WMDE & Addshore T174948 (Can be removed after 2017/10/14) ], '+private' => [ -- To view, visit https://gerrit.wikimedia.org/r/376191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If515dfb93420ea8bdcd708f200155a36bfadae18 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore Gerrit-Reviewer: Urbanecm Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...rdf[master]: Reduce logging level of MWAPI requests.
Gehel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376194 )
Change subject: Reduce logging level of MWAPI requests.
..
Reduce logging level of MWAPI requests.
Bug: T175017
Change-Id: I371302d2d285903de4b80994d9916991e5fcc1e7
---
M
blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceCall.java
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/rdf
refs/changes/94/376194/1
diff --git
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceCall.java
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceCall.java
index a75d141..2c628e7 100644
---
a/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceCall.java
+++
b/blazegraph/src/main/java/org/wikidata/query/rdf/blazegraph/mwapi/MWApiServiceCall.java
@@ -315,7 +315,7 @@
*/
private Iterator doSearchFromBinding(IBindingSet binding)
{
final Request req = getHttpRequest(binding);
-log.info("MWAPI REQUEST: " + req.getQuery());
+log.debug("MWAPI REQUEST: {}", req.getQuery());
final Response response;
InputStreamResponseListener listener = new
InputStreamResponseListener();
try {
--
To view, visit https://gerrit.wikimedia.org/r/376194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I371302d2d285903de4b80994d9916991e5fcc1e7
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/rdf
Gerrit-Branch: master
Gerrit-Owner: Gehel
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Enable Newsletter on mediawikiwiki
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/364734 ) Change subject: Enable Newsletter on mediawikiwiki .. Enable Newsletter on mediawikiwiki Bug: T110170 Change-Id: If7cee2c9d2f07a06f09ba0c1ad925528af700fe5 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Addshore: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 144a1a7..dbd4eba 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -19379,6 +19379,7 @@ 'wmgUseNewsletter' => [ 'default' => false, 'testwiki' => true, // T110170 + 'mediawikiwiki' => true, // T110170 ], 'wmgUseLoginNotify' => [ -- To view, visit https://gerrit.wikimedia.org/r/364734 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If7cee2c9d2f07a06f09ba0c1ad925528af700fe5 Gerrit-PatchSet: 4 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Addshore Gerrit-Reviewer: Addshore Gerrit-Reviewer: Florianschmidtwelzow Gerrit-Reviewer: Qgil Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: [bugfix] publish WikibasePage in pywikibot/__init__.py
Xqt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376193 ) Change subject: [bugfix] publish WikibasePage in pywikibot/__init__.py .. [bugfix] publish WikibasePage in pywikibot/__init__.py Bug: 175115 Change-Id: Ic25a1cf26f381eaa9fcdd9b1526ed4cb69f49853 --- M pywikibot/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/93/376193/1 diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index e4000cc..811e6b5 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -95,7 +95,7 @@ __all__ = ( 'config', 'ui', 'Site', 'UnicodeMixin', 'translate', 'Page', 'FilePage', 'Category', 'Link', 'User', -'ItemPage', 'PropertyPage', 'Claim', +'WikibasePage', 'ItemPage', 'PropertyPage', 'Claim', 'html2unicode', 'url2unicode', 'unicode2html', 'stdout', 'output', 'warning', 'error', 'critical', 'debug', 'exception', 'input_choice', 'input', 'input_yn', 'inputChoice', -- To view, visit https://gerrit.wikimedia.org/r/376193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic25a1cf26f381eaa9fcdd9b1526ed4cb69f49853 Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultiLanguageManager[master]: Also hide the MLM label in the left sidebar for monobook skin
Pwirth has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376192 )
Change subject: Also hide the MLM label in the left sidebar for monobook skin
..
Also hide the MLM label in the left sidebar for monobook skin
Change-Id: I72e5670352c91ebd32cefd9812ffee1b7c452e6d
---
M resources/ext.mlm.less
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiLanguageManager
refs/changes/92/376192/1
diff --git a/resources/ext.mlm.less b/resources/ext.mlm.less
index e884375..1021019 100644
--- a/resources/ext.mlm.less
+++ b/resources/ext.mlm.less
@@ -1,4 +1,4 @@
-#p-MLM-label {
+#p-MLM-label, #p-MLM h3 {
display: none;
}
li.mlm-flag {
--
To view, visit https://gerrit.wikimedia.org/r/376192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72e5670352c91ebd32cefd9812ffee1b7c452e6d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultiLanguageManager
Gerrit-Branch: master
Gerrit-Owner: Pwirth
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Add WMDE log channel
Addshore has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376191 ) Change subject: Add WMDE log channel .. Add WMDE log channel Bug: T174948 Change-Id: If515dfb93420ea8bdcd708f200155a36bfadae18 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/91/376191/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 144a1a7..13e22d0 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -5228,6 +5228,7 @@ 'DBConnection' => 'error', 'DBQuery' => 'warning', 'LoginNotify' => 'debug', + 'WMDE' => 'debug', // WMDE & Addshore T174948 (Can be removed after 2017/10/14) ], '+private' => [ -- To view, visit https://gerrit.wikimedia.org/r/376191 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If515dfb93420ea8bdcd708f200155a36bfadae18 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config 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] labs...heritage[master]: Construct registrar_url in country table rather than monumen...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376005 )
Change subject: Construct registrar_url in country table rather than
monuments_all
..
Construct registrar_url in country table rather than monuments_all
Apart from making it easier to understand this makes the data
available for the migration tools.
Updated url in ru_ru per the corresponding property on Wikidata.
Change-Id: I9d6ed8fc054e1dc8e43c997350eecab04f3e1f65
---
M erfgoedbot/monuments_config/ar_es.json
M erfgoedbot/monuments_config/cz_cs.json
M erfgoedbot/monuments_config/ru_ru.json
3 files changed, 18 insertions(+), 6 deletions(-)
Approvals:
Jean-Frédéric: Looks good to me, approved
jenkins-bot: Verified
diff --git a/erfgoedbot/monuments_config/ar_es.json
b/erfgoedbot/monuments_config/ar_es.json
index 4442c1d..039d2cd 100644
--- a/erfgoedbot/monuments_config/ar_es.json
+++ b/erfgoedbot/monuments_config/ar_es.json
@@ -16,6 +16,7 @@
"commonsCategoryBase": "Cultural heritage monuments in Argentina",
"unusedImagesPage": "Wikiproyecto:Patrimonio histórico/Fotos de monumentos
de Argentina sin usar",
"imagesWithoutIdPage": "Wikiproyecto:Patrimonio histórico/Fotos de
monumentos de Argentina sin id",
+"registrantUrlBase":
"http://www.monumentosysitios.gov.ar/ficha.php?idMonumento=%s";,
"fields": [
{
"dest": "id",
@@ -75,6 +76,11 @@
{
"dest": "imagen",
"source": "imagen"
+},
+{
+"dest": "registrant_url",
+"source": "id",
+"conv": "generateRegistrantUrl"
}
],
"sql_lang": "Spanish",
@@ -149,8 +155,8 @@
"type": "Field"
},
"registrant_url": {
-"value":
"CONCAT('http://www.monumentosysitios.gov.ar/ficha.php?idMonumento=', id)",
-"type": "Raw"
+"value": "registrant_url",
+"type": "Field"
}
}
}
diff --git a/erfgoedbot/monuments_config/cz_cs.json
b/erfgoedbot/monuments_config/cz_cs.json
index 7ee7090..4b1125a 100644
--- a/erfgoedbot/monuments_config/cz_cs.json
+++ b/erfgoedbot/monuments_config/cz_cs.json
@@ -17,6 +17,7 @@
"unusedImagesPage": "Wikipedie:WikiProjekt Wiki Loves Monuments/Nevyužité
obrázky",
"imagesWithoutIdPage": "User:Multichill/Images of cultural heritage
monuments in Czech Republic without id",
"missingCommonscatPage": "Wikipedie:WikiProjekt Wiki Loves
Monuments/Missing commons category links",
+"registrantUrlBase":
"http://monumnet.npu.cz/pamfond/list.php?hledani=1&CiRejst=%s";,
"fields": [
{
"dest": "id_objektu",
@@ -80,6 +81,11 @@
{
"dest": "remark",
"source": "Poznámka"
+},
+{
+"dest": "registrant_url",
+"source": "Id_objektu",
+"conv": "generateRegistrantUrl"
}
],
"sql_lang": "Czech language",
@@ -154,8 +160,8 @@
"type": "Field"
},
"registrant_url": {
-"value":
"CONCAT('http://monumnet.npu.cz/pamfond/list.php?hledani=1&CiRejst=',`id_objektu`)",
-"type": "Raw"
+"value": "registrant_url",
+"type": "Field"
}
}
-}
\ No newline at end of file
+}
diff --git a/erfgoedbot/monuments_config/ru_ru.json
b/erfgoedbot/monuments_config/ru_ru.json
index ef4f5f7..06bac3b 100644
--- a/erfgoedbot/monuments_config/ru_ru.json
+++ b/erfgoedbot/monuments_config/ru_ru.json
@@ -15,7 +15,7 @@
"commonsCategoryBase": "Cultural heritage monuments in Russia",
"unusedImagesPage": "Культурное наследие России/Неиспользуемые
изображения",
"imagesWithoutIdPage": "Культурное наследие России/Изображения без ID",
-"registrantUrlBase": "http://kulturnoe-nasledie.ru/monuments.php?id=%s";,
+"registrantUrlBase":
"http://old.kulturnoe-nasledie.ru/monuments.php?id=%s";,
"fields": [
{
"dest": "id",
--
To view, visit https://gerrit.wikimedia.org/r/376005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9d6ed8fc054e1dc8e43c997350eecab04f3e1f65
Gerrit-PatchSet: 2
Gerrit-Project: labs/tools/heritage
Gerrit-Branch: master
Gerrit-Owner: Lokal Profil
Gerrit-Reviewer: Jean-Frédéric
Gerrit-Reviewer: Multichill
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: Archive extension AWS
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376055 ) Change subject: Archive extension AWS .. Archive extension AWS Bug: T174864 Change-Id: I1d70effa78b9e01c721aa6b7c134710ad24a68ce --- M groups/MediaWiki/mediawiki-extensions.txt 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Raimond Spekking: Looks good to me, approved jenkins-bot: Verified diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index 484c24f..94b41a0 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -133,7 +133,7 @@ Automatic Board Welcome -AWS +# AWS // 2017-09-05: Archived (T174864) # AWS SDK // 2017-06-15: Archived -- To view, visit https://gerrit.wikimedia.org/r/376055 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1d70effa78b9e01c721aa6b7c134710ad24a68ce Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow Gerrit-Reviewer: Raimond Spekking 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...Gadgets[master]: Opt out of being available as a global preference
Samwilson has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376190 ) Change subject: Opt out of being available as a global preference .. Opt out of being available as a global preference Bug: T175118 Depends-On: I9cad21057472bee83d8146cc6992be07bc65a717 Change-Id: Id6df3fd233471048a84edfdd2b7876b3b84b8c66 --- M GadgetHooks.php 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Gadgets refs/changes/90/376190/1 diff --git a/GadgetHooks.php b/GadgetHooks.php index 5dd756a..449e707 100644 --- a/GadgetHooks.php +++ b/GadgetHooks.php @@ -121,6 +121,7 @@ 'section' => 'gadgets', 'raw' => 1, 'rawrow' => 1, + 'noglobal' => true, ]; $preferences['gadgets'] = @@ -131,6 +132,7 @@ 'label' => ' ', 'prefix' => 'gadget-', 'default' => $default, + 'noglobal' => true, ]; return true; -- To view, visit https://gerrit.wikimedia.org/r/376190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6df3fd233471048a84edfdd2b7876b3b84b8c66 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: master Gerrit-Owner: Samwilson ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Article Creation Workflow] Register extension
Raimond Spekking has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376189 ) Change subject: [Article Creation Workflow] Register extension .. [Article Creation Workflow] Register extension Was deployed on Beta Cluster today https://phabricator.wikimedia.org/rOMWCa3e2176e0c9d976514ca32ce9b62bb046d8a202f Change-Id: I319e09718168e96c4c85a4819e27c18f32a66320 --- M groups/MediaWiki/WikimediaAgg.yaml M groups/MediaWiki/mediawiki-extensions.txt 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Raimond Spekking: Verified; Looks good to me, approved diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 79c92b2..6f82cb3 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,6 +13,7 @@ - ext-abusefilter - ext-apifeatureusage # 2015-05-19 6251bf51beb00a6bfd57a46eb485d5c5eef188a7 - ext-apisandbox + - ext-articlecreationworkflow # 2017-09-06 Beta Cluster - ext-articleplaceholder # 2016-02-09 - ext-bouncehandler # 2014-11-05 Change-Id: I64c09d17146bf9a3cee582fcea0e19aed6f4ce3d - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c1c62ed..98dd5aa 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -99,6 +99,9 @@ descmsg = article-comments-desc ignored = article-comments-prefilled-comment-text, article-comments-new-comment-heading, article-comments-comment-contents +Article Creation Workflow +descmsg = acw-desc + Article Feedback v5 aliasfile = ArticleFeedbackv5/ArticleFeedbackv5.alias.php optional=articlefeedbackv5-cta1-learn-how-url, articlefeedbackv5-cta6-button-link, articlefeedbackv5-error-abuse-link, articlefeedbackv5-help-form-linkurl -- To view, visit https://gerrit.wikimedia.org/r/376189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I319e09718168e96c4c85a4819e27c18f32a66320 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking Gerrit-Reviewer: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] translatewiki[master]: [Article Creation Workflow] Register extension
Raimond Spekking has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376189 ) Change subject: [Article Creation Workflow] Register extension .. [Article Creation Workflow] Register extension Was deployed on Beta Cluster today https://phabricator.wikimedia.org/rOMWCa3e2176e0c9d976514ca32ce9b62bb046d8a202f Change-Id: I319e09718168e96c4c85a4819e27c18f32a66320 --- M groups/MediaWiki/WikimediaAgg.yaml M groups/MediaWiki/mediawiki-extensions.txt 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/translatewiki refs/changes/89/376189/1 diff --git a/groups/MediaWiki/WikimediaAgg.yaml b/groups/MediaWiki/WikimediaAgg.yaml index 79c92b2..6f82cb3 100644 --- a/groups/MediaWiki/WikimediaAgg.yaml +++ b/groups/MediaWiki/WikimediaAgg.yaml @@ -13,6 +13,7 @@ - ext-abusefilter - ext-apifeatureusage # 2015-05-19 6251bf51beb00a6bfd57a46eb485d5c5eef188a7 - ext-apisandbox + - ext-articlecreationworkflow # 2017-09-06 Beta Cluster - ext-articleplaceholder # 2016-02-09 - ext-bouncehandler # 2014-11-05 Change-Id: I64c09d17146bf9a3cee582fcea0e19aed6f4ce3d - ext-calendar # Change id bc3616c74aab74b74f78bbb2ce3241e5a564b4f9 for Wikivoyage diff --git a/groups/MediaWiki/mediawiki-extensions.txt b/groups/MediaWiki/mediawiki-extensions.txt index c1c62ed..98dd5aa 100644 --- a/groups/MediaWiki/mediawiki-extensions.txt +++ b/groups/MediaWiki/mediawiki-extensions.txt @@ -99,6 +99,9 @@ descmsg = article-comments-desc ignored = article-comments-prefilled-comment-text, article-comments-new-comment-heading, article-comments-comment-contents +Article Creation Workflow +descmsg = acw-desc + Article Feedback v5 aliasfile = ArticleFeedbackv5/ArticleFeedbackv5.alias.php optional=articlefeedbackv5-cta1-learn-how-url, articlefeedbackv5-cta6-button-link, articlefeedbackv5-error-abuse-link, articlefeedbackv5-help-form-linkurl -- To view, visit https://gerrit.wikimedia.org/r/376189 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I319e09718168e96c4c85a4819e27c18f32a66320 Gerrit-PatchSet: 1 Gerrit-Project: translatewiki Gerrit-Branch: master Gerrit-Owner: Raimond Spekking ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Translate[master]: Remove third parameter for mw.loader.load
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/376170 ) Change subject: Remove third parameter for mw.loader.load .. Remove third parameter for mw.loader.load The third parameter of mw.loader.load was removed in mediawiki.js with change d7905627 and is included since MediaWiki 1.26. Change-Id: I5e1231f088d045898127cea82cfc1788321c921d --- M resources/js/ext.translate.editor.js 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: jenkins-bot: Verified Nikerabbit: Looks good to me, approved diff --git a/resources/js/ext.translate.editor.js b/resources/js/ext.translate.editor.js index e4de848..b2adaa5 100644 --- a/resources/js/ext.translate.editor.js +++ b/resources/js/ext.translate.editor.js @@ -1223,7 +1223,7 @@ } // Load the diff styles - mw.loader.load( 'mediawiki.action.history.diff', undefined, true ); + mw.loader.load( 'mediawiki.action.history.diff' ); $trigger = $( '' ) .addClass( 'show-diff-link' ) -- To view, visit https://gerrit.wikimedia.org/r/376170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5e1231f088d045898127cea82cfc1788321c921d Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Fomafix Gerrit-Reviewer: Nikerabbit 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...GlobalPreferences[master]: Add 'noglobal' preference parameter, for extensions to opt out
Samwilson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376188 )
Change subject: Add 'noglobal' preference parameter, for extensions to opt out
..
Add 'noglobal' preference parameter, for extensions to opt out
Not all extensions want their preferences to be able to be set
globally (e.g. Gadgets, where the preference contains the gadget
name that may be repeated on multiple wikis). This adds a new
boolean preference parameter 'noglobal' to make this possible.
Bug: T174099
Change-Id: I9cad21057472bee83d8146cc6992be07bc65a717
---
M includes/Hooks.php
1 file changed, 7 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalPreferences
refs/changes/88/376188/1
diff --git a/includes/Hooks.php b/includes/Hooks.php
index f18f1f1..9ab9ffd 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -215,6 +215,13 @@
$user->getOption( '' );
}
foreach ( $prefs as $name => $info ) {
+ // Preferences can opt out of being globalized
by setting the 'noglobal' flag.
+ $hasOptedOut = ( isset( $info['noglobal'] ) &&
$info['noglobal'] === true );
+ if ( $hasOptedOut ) {
+ unset( $prefs[ $name ] );
+ continue;
+ }
+
// FIXME: This whole code section sucks
if ( !isset( $prefs["$name-global"] )
&& self::isGlobalizablePreference(
$name, $info )
--
To view, visit https://gerrit.wikimedia.org/r/376188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9cad21057472bee83d8146cc6992be07bc65a717
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalPreferences
Gerrit-Branch: master
Gerrit-Owner: Samwilson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix typo
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376187 )
Change subject: Fix typo
..
Fix typo
Change-Id: I599d57482762d8a766162f693eb055b43c5d9726
---
M modules/profile/templates/cumin/aliases.yaml.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
Volans: Looks good to me, but someone else must approve
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index 269d2fa..5f365d7 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -158,7 +158,7 @@
swift-be-canary: P{ms-be1013.eqiad.wmnet}
swift-be-codfw: A:swift-be and A:codfw
swift-be-eqiad: A:swift-be and A:eqiad
-swift-fe: {R:class = role::swift::proxy}
+swift-fe: P{R:class = role::swift::proxy}
swift-fe-canary: P{ms-fe1005.eqiad.wmnet}
swift-fe-codfw: A:swift-fe and A:codfw
swift-fe-eqiad: A:swift-fe and A:eqiad
--
To view, visit https://gerrit.wikimedia.org/r/376187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I599d57482762d8a766162f693eb055b43c5d9726
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Muehlenhoff
Gerrit-Reviewer: Muehlenhoff
Gerrit-Reviewer: Volans
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Fix typo
Muehlenhoff has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376187 )
Change subject: Fix typo
..
Fix typo
Change-Id: I599d57482762d8a766162f693eb055b43c5d9726
---
M modules/profile/templates/cumin/aliases.yaml.erb
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/87/376187/1
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index 269d2fa..5f365d7 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -158,7 +158,7 @@
swift-be-canary: P{ms-be1013.eqiad.wmnet}
swift-be-codfw: A:swift-be and A:codfw
swift-be-eqiad: A:swift-be and A:eqiad
-swift-fe: {R:class = role::swift::proxy}
+swift-fe: P{R:class = role::swift::proxy}
swift-fe-canary: P{ms-fe1005.eqiad.wmnet}
swift-fe-codfw: A:swift-fe and A:codfw
swift-fe-eqiad: A:swift-fe and A:eqiad
--
To view, visit https://gerrit.wikimedia.org/r/376187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I599d57482762d8a766162f693eb055b43c5d9726
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] search/extra[master]: Add per-node latency percentiles collection
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/373121 )
Change subject: Add per-node latency percentiles collection
..
Add per-node latency percentiles collection
* Adds a SearchOperationListener to listen to shard search request took times
* Adds a rest endpoint at /_nodes/latencyStats to report latencies
* Latencies are reported for the last minute of requests
Change-Id: I76d4178bd7da51c6cd234574c254bfe6000508eb
---
A docs/latency_percentiles.md
M src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
A src/main/java/org/wikimedia/search/extra/latency/LatencyStatsAction.java
A src/main/java/org/wikimedia/search/extra/latency/RestGetLatencyStats.java
A src/main/java/org/wikimedia/search/extra/latency/SearchLatencyListener.java
A src/main/java/org/wikimedia/search/extra/latency/SearchLatencyProbe.java
A
src/main/java/org/wikimedia/search/extra/latency/TransportLatencyStatsAction.java
M
src/main/java/org/wikimedia/search/extra/router/DegradedRouterQueryBuilder.java
A src/main/java/org/wikimedia/search/extra/util/Suppliers.java
A
src/test/java/org/wikimedia/search/extra/latency/GetLatencyStatsIntegrationTest.java
A
src/test/java/org/wikimedia/search/extra/latency/SearchLatencyListenerTest.java
11 files changed, 862 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Gehel: Looks good to me, but someone else must approve
DCausse: Looks good to me, approved
diff --git a/docs/latency_percentiles.md b/docs/latency_percentiles.md
new file mode 100644
index 000..286c62b
--- /dev/null
+++ b/docs/latency_percentiles.md
@@ -0,0 +1,70 @@
+latency percentiles
+===
+
+The ```latency percentiles``` stats collections is always enabled when the
+extra plugin is installed. This collects histograms of per-stat bucket latency
+of full text search requests on each node and exposes them through a REST api.
+
+Usage
+=
+
+Queries must specify one or more statistics buckets to be added to a
histogram. The
+histogram tracks latencies between 1ms and 5 minutes. Queries longer than 5
minutes
+are clamped to 5 minutes for tracking purposes.
+
+Example query:
+
+GET /_search
+{
+"stats": ["whiz", "bang"],
+"query": { "match_all": {} }
+}
+
+Latency statistics are collected via the REST api which reports both the
per-node latencies
+and the average latency across nodes. The REST api reports 4 percentiles: 50,
75, 95 and 99.
+
+GET /_nodes/latencyStats
+
+Example Response:
+{
+"_nodes": {
+"total": 1,
+"successful": 1,
+"failed": 0
+},
+"cluster_name": "elasticsearch",
+"all": {
+"whiz": [
+{ "percentile": 50", "latencyMs": 38 },
+{ "percentile": 75, "latencyMs": 42 },
+{ "percentile": 95, "latencyMs", 70 },
+{ "percentile": 99, "latencyMs", 144 }
+],
+"bang": [
+{ "percentile": 50", "latencyMs": 182 },
+{ "percentile": 75, "latencyMs": 244 },
+{ "percentile": 95, "latencyMs", 412 },
+{ "percentile": 99, "latencyMs", 2201 }
+],
+},
+"nodes": {
+"o8nS4AQPT52O5gDmgz7u7Q": {
+"name": "o8nS4AQ",
+"hostname": "127.0.0.1",
+"latencies": {
+"whiz": [
+{ "percentile": 50", "latencyMs": 38 },
+{ "percentile": 75, "latencyMs": 42 },
+{ "percentile": 95, "latencyMs", 70 },
+{ "percentile": 99, "latencyMs", 144 }
+],
+"bang": [
+{ "percentile": 50", "latencyMs": 182 },
+{ "percentile": 75, "latencyMs": 244 },
+{ "percentile": 95, "latencyMs", 412 },
+{ "percentile": 99, "latencyMs", 2201 }
+],
+}
+}
+}
+}
diff --git a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
index 229ccaa..159918a 100644
--- a/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
+++ b/src/main/java/org/wikimedia/search/extra/ExtraPlugin.java
@@ -1,16 +1,37 @@
package org.wikimedia.search.extra;
+import org.elasticsearch.action.ActionRequest;
+import org.elasticsearch.action.ActionResponse;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
+import org.elasticsearch.cluster.node.DiscoveryNodes;
+import org.elasticsearch.cluster.service.ClusterService;
+import org.elasticsearch.common.settings.ClusterSettings;
+import org.elasticsearch.common.settings.IndexScopedSettings;
import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.settings.SettingsFilter;
+import org.elasticsearch.common.xcontent.NamedXContentRegistry;
+import org.elasticsearch.index.IndexModule;
import org.el
[MediaWiki-commits] [Gerrit] operations/puppet[production]: cumin: extend aliases
Muehlenhoff has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376029 )
Change subject: cumin: extend aliases
..
cumin: extend aliases
Bug: T164817
Change-Id: If4fa305389363c61ecd1a874ac3f613b2862fbca
---
M modules/profile/templates/cumin/aliases.yaml.erb
1 file changed, 171 insertions(+), 0 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/profile/templates/cumin/aliases.yaml.erb
b/modules/profile/templates/cumin/aliases.yaml.erb
index af5553b..269d2fa 100644
--- a/modules/profile/templates/cumin/aliases.yaml.erb
+++ b/modules/profile/templates/cumin/aliases.yaml.erb
@@ -1,4 +1,175 @@
all: P{*}
+# Sites
<% @datacenters.each do |dc| -%>
<%= dc %>: P{R:class = profile::cumin::target and R:class%site = <%= dc %>}
<% end -%>
+
+# Server group definitions
+all-mw-codfw: (A:mw-videoscaler or A:mw-imagescaler or A:mw-api or A:mw or
A:mw-jobrunner) and A:codfw
+all-mw-eqiad: (A:mw-videoscaler or A:mw-imagescaler or A:mw-api or A:mw or
A:mw-jobrunner) and A:eqiad
+aqs: P{R:class = role::aqs}
+aqs-canary: P{aqs1004.eqiad.wmnet}
+bastion: P{R:class = role::bastionhost::general or R:class =
role::bastionhost::twofa}
+bastion-canary: P{bast4001.wikimedia.org}
+conf: P{R:class = role::configcluster}
+conf-canary: P{conf2001.codfw.wmnet}
+conf-codfw: A:conf and A:codfw
+conf-eqiad: A:conf and A:eqiad
+cp: P{R:class = role::cache::misc or R:class = role::cache::upload or R:class
= role::cache::text}
+cp-canary: P{R:class = role::cache::canary}
+cp-codfw: A:cp and A:codfw
+cp-eqiad: A:cp and A:eqiad
+cp-esams: A:cp and A:esams
+cp-ulsfo: A:cp and A:ulsfo
+cumin: P{R:class = role::cluster::management}
+db-all-codfw: (A:db-parsercache or A:db-labsdb or A:db-dbstore or A:db-core or
A:db-misc-servers) and A:codfw
+db-all-eqiad: (A:db-parsercache or A:db-labsdb or A:db-dbstore or A:db-core or
A:db-misc-servers) and A:eqiad
+db-core: P{R:class = role::mariadb::core or R:class = role::mariadb::misc or
R:class = role::mariadb::misc::phabricator or R:class =
role::mariadb::misc::eventlogging}
+db-core-codfw: A:db-core and A:codfw
+db-core-eqiad: A:db-core and A:eqiad
+db-dbproxy: P{R:class = role::mariadb::proxy::master}
+db-dbstore: P{R:class = role::mariadb::backup or R:class =
role::mariadb::dbstore or R:class = role::mariadb::dbstore_multiinstance}
+db-labsdb: P{R:class = role::labs::db::replica}
+db-misc-servers: P{R:class = role::mariadb::labs_deprecated}
+db-parsercache: P{R:class = role::mariadb::parsercache}
+dbmonitor: P{R:class = role::tendril}
+deployment-servers: P{R:class = role::deployment_server}
+dns-auth: P{R:class = role::authdns::server}
+dns-auth-canary: P{eeden.wikimedia.org}
+dns-rec: P{R:class = role::dnsrecursor}
+dns-rec-canary: P{hydrogen.wikimedia.org}
+druid: P{R:class = role::analytics_cluster::druid::worker}
+dumps: P{R:class = role::dumps::server or R:class = role::dumpsdata or R:class
= role::dumps::zim}
+elastic: P{R:class = role::elasticsearch::cirrus}
+elastic-canary: P{elastic1017.eqiad.wmnet}
+elastic-codfw: A:elastic and A:codfw
+elastic-eqiad: A:elastic and A:eqiad
+eventlogging: P{R:class = role::eventlogging::analytics::processor}
+failoid: P{R:class = role::failoid}
+ganeti: P{R:class = role::ganeti}
+ganeti-canary: P{ganeti2001.codfw.wmnet}
+ganeti-codfw: A:ganeti and A:codfw
+ganeti-eqiad: A:ganeti and A:eqiad
+graphite: P{R:class = role::graphite::production or R:class =
role::labs::graphite}
+hadoop: A:hadoop-worker or A:hadoop-master or A:hadoop-standby
+hadoop-master: P{R:class = role::analytics_cluster::hadoop::master}
+hadoop-standby: P{R:class = role::analytics_cluster::hadoop::standby}
+hadoop-worker: P{R:class = role::analytics_cluster::hadoop::worker}
+hadoop-worker-canary: P{analytics1030.eqiad.wmnet}
+installserver: P{R:class = role::installserver::http}
+jobqueue-redis-codfw: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:codfw
+jobqueue-redis-eqiad: (A:jobqueue-redis-master or A:jobqueue-redis-slave) and
A:eqiad
+jobqueue-redis-master: P{R:class = role::jobqueue_redis::master}
+jobqueue-redis-slave: P{R:class = role::jobqueue_redis::slave}
+kafka-analytics: P{R:class = role::kafka::analytics::broker}
+kafka-analytics-canary: P{kafka1012.eqiad.wmnet}
+kafka-main: P{R:class = role::kafka::main::broker}
+kafka-main-canary: P{kafka2001.codfw.wmnet}
+kafka-main-codfw: A:kafka-main and A:codfw
+kafka-main-eqiad: A:kafka-main and A:eqiad
+kubernetes-etcd: P{R:class = role::etcd::kubernetes}
+kubernetes-masters: P{R:class = role::kubernetes::master}
+kubernetes-staging: P{R:class = role::kubernetes::staging::etcd or R:class =
role::kubernetes::staging::master}
+kubernetes-workers: P{R:class = role::kubernetes::worker}
+labcontrol: P{R:class = role::wmcs::openstack::main::control}
+labnet: P{R:class = role::wmcs::openstack::main::net or R:class =
role::wmcs::openstack::main::net_secondary}
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [BREAKING CHANGE] SelectWidget: Remove getRelativeSelectable...
Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376185 )
Change subject: [BREAKING CHANGE] SelectWidget: Remove getRelativeSelectableItem
..
[BREAKING CHANGE] SelectWidget: Remove getRelativeSelectableItem
Follows-up on I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5
Bug: T76630
Change-Id: I68bd2899cb2a8d6f2ff0dcc167028595a5996c60
---
M src/widgets/SelectWidget.js
1 file changed, 0 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/85/376185/1
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index 7aad00a..b1570a8 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -796,24 +796,6 @@
};
/**
- * Get an option by its position relative to the specified item (or to the
start of the option array,
- * if item is `null`). The direction in which to search through the option
array is specified with a
- * number: -1 for reverse (the default) or 1 for forward. The method will
return an option, or
- * `null` if there are no options in the array.
- *
- * @deprecated 0.24.0 Use {@link #findRelativeSelectableItem} instead
- * @param {OO.ui.OptionWidget|null} item Item to describe the start position,
or `null` to start at the beginning of the array.
- * @param {number} direction Direction to move in: -1 to move backward, 1 to
move forward
- * @param {Function} [filter] Only consider items for which this function
returns
- * true. Function takes an OO.ui.OptionWidget and returns a boolean.
- * @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no
items in the select
- */
-OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item,
direction, filter ) {
- OO.ui.warnDeprecation( 'SelectWidget#getRelativeSelectableItem:
Deprecated function. Use findRelativeSelectableItem instead. See T76630.' );
- return this.findRelativeSelectableItem( item, direction, filter );
-};
-
-/**
* Get the next selectable item or `null` if there are no selectable items.
* Disabled options and menu-section markers and breaks are not selectable.
*
--
To view, visit https://gerrit.wikimedia.org/r/376185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68bd2899cb2a8d6f2ff0dcc167028595a5996c60
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: [DEPRECATING CHANGE] SelectWidget: Rename getRelativeSelecta...
Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376183 )
Change subject: [DEPRECATING CHANGE] SelectWidget: Rename
getRelativeSelectableItem to findRelativeSelectableItem
..
[DEPRECATING CHANGE] SelectWidget: Rename getRelativeSelectableItem to
findRelativeSelectableItem
Bug: T76630
Change-Id: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5
---
M src/widgets/SelectWidget.js
1 file changed, 21 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/376183/1
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index fc5040a..e4887f7 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -757,7 +757,7 @@
};
/**
- * Get an option by its position relative to the specified item (or to the
start of the option array,
+ * Find an option by its position relative to the specified item (or to the
start of the option array,
* if item is `null`). The direction in which to search through the option
array is specified with a
* number: -1 for reverse (the default) or 1 for forward. The method will
return an option, or
* `null` if there are no options in the array.
@@ -768,7 +768,7 @@
* true. Function takes an OO.ui.OptionWidget and returns a boolean.
* @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no
items in the select
*/
-OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item,
direction, filter ) {
+OO.ui.SelectWidget.prototype.findRelativeSelectableItem = function ( item,
direction, filter ) {
var currentIndex, nextIndex, i,
increase = direction > 0 ? 1 : -1,
len = this.items.length;
@@ -796,13 +796,31 @@
};
/**
+ * Get an option by its position relative to the specified item (or to the
start of the option array,
+ * if item is `null`). The direction in which to search through the option
array is specified with a
+ * number: -1 for reverse (the default) or 1 for forward. The method will
return an option, or
+ * `null` if there are no options in the array.
+ *
+ * @deprecated 0.24.0 Use {@link #findRelativeSelectableItem} instead
+ * @param {OO.ui.OptionWidget|null} item Item to describe the start position,
or `null` to start at the beginning of the array.
+ * @param {number} direction Direction to move in: -1 to move backward, 1 to
move forward
+ * @param {Function} [filter] Only consider items for which this function
returns
+ * true. Function takes an OO.ui.OptionWidget and returns a boolean.
+ * @return {OO.ui.OptionWidget|null} Item at position, `null` if there are no
items in the select
+ */
+OO.ui.SelectWidget.prototype.getRelativeSelectableItem = function ( item,
direction, filter ) {
+ OO.ui.warnDeprecation( 'SelectWidget#getRelativeSelectableItem:
Deprecated function. Use findRelativeSelectableItem instead. See T76630.' );
+ return this.findRelativeSelectableItem( item, direction, filter );
+};
+
+/**
* Get the next selectable item or `null` if there are no selectable items.
* Disabled options and menu-section markers and breaks are not selectable.
*
* @return {OO.ui.OptionWidget|null} Item, `null` if there aren't any
selectable items
*/
OO.ui.SelectWidget.prototype.getFirstSelectableItem = function () {
- return this.getRelativeSelectableItem( null, 1 );
+ return this.findRelativeSelectableItem( null, 1 );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/376183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Use findRelativeSelectableItem instead of getRela...
Prtksxna has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376186 ) Change subject: RCFilters: Use findRelativeSelectableItem instead of getRelativeSelectableitem .. RCFilters: Use findRelativeSelectableItem instead of getRelativeSelectableitem Change-Id: I92c3fbea22ee59cb6aa9cda994f43752973924e0 Depends-on: I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5 Bug: T76630 --- M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/86/376186/1 diff --git a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js index 07d4506..19a2490 100644 --- a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js +++ b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MenuSelectWidget.js @@ -321,12 +321,12 @@ case OO.ui.Keys.UP: case OO.ui.Keys.LEFT: // Get the next item - nextItem = this.getRelativeSelectableItem( currentItem, -1 ); + nextItem = this.findRelativeSelectableItem( currentItem, -1 ); break; case OO.ui.Keys.DOWN: case OO.ui.Keys.RIGHT: // Get the next item - nextItem = this.getRelativeSelectableItem( currentItem, 1 ); + nextItem = this.findRelativeSelectableItem( currentItem, 1 ); break; } -- To view, visit https://gerrit.wikimedia.org/r/376186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I92c3fbea22ee59cb6aa9cda994f43752973924e0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Prtksxna ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: Use findRelativeSelectableItem instead of getRelativeSelecta...
Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376184 )
Change subject: Use findRelativeSelectableItem instead of
getRelativeSelectableItem
..
Use findRelativeSelectableItem instead of getRelativeSelectableItem
Follows-up on I7b556fcae7ac4c4a6508d931d7a5d9ee1e7c59e5
Bug: T76630
Change-Id: Ic0895ceb11ec0101de4d41b47ce36257ac985fcb
---
M src/widgets/SearchWidget.js
M src/widgets/SelectWidget.js
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/376184/1
diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js
index fbce361..7f8f519 100644
--- a/src/widgets/SearchWidget.js
+++ b/src/widgets/SearchWidget.js
@@ -75,7 +75,7 @@
if ( !highlightedItem ) {
highlightedItem = this.results.getSelectedItem();
}
- nextItem = this.results.getRelativeSelectableItem(
highlightedItem, dir );
+ nextItem = this.results.findRelativeSelectableItem(
highlightedItem, dir );
this.results.highlightItem( nextItem );
nextItem.scrollElementIntoView();
}
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index e4887f7..7aad00a 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -296,13 +296,13 @@
case OO.ui.Keys.UP:
case OO.ui.Keys.LEFT:
this.clearKeyPressBuffer();
- nextItem = this.getRelativeSelectableItem(
currentItem, -1 );
+ nextItem = this.findRelativeSelectableItem(
currentItem, -1 );
handled = true;
break;
case OO.ui.Keys.DOWN:
case OO.ui.Keys.RIGHT:
this.clearKeyPressBuffer();
- nextItem = this.getRelativeSelectableItem(
currentItem, 1 );
+ nextItem = this.findRelativeSelectableItem(
currentItem, 1 );
handled = true;
break;
case OO.ui.Keys.ESCAPE:
@@ -414,7 +414,7 @@
// Common (if weird) special case: typing "" will cycle
through all
// the items beginning with "x".
if ( item ) {
- item = this.getRelativeSelectableItem( item, 1 );
+ item = this.findRelativeSelectableItem( item, 1 );
}
} else {
this.keyPressBuffer += c;
@@ -422,7 +422,7 @@
filter = this.getItemMatcher( this.keyPressBuffer, false );
if ( !item || !filter( item ) ) {
- item = this.getRelativeSelectableItem( item, 1, filter );
+ item = this.findRelativeSelectableItem( item, 1, filter );
}
if ( item ) {
if ( this.isVisible() && item.constructor.static.highlightable
) {
--
To view, visit https://gerrit.wikimedia.org/r/376184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic0895ceb11ec0101de4d41b47ce36257ac985fcb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] wikidata...gui[master]: Handle Query Helper exception gracefully
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376098 )
Change subject: Handle Query Helper exception gracefully
..
Handle Query Helper exception gracefully
Catch exception and open editor in new window.
Change-Id: I8130182b595e00fa0e522022aee3cda83ca0f7c4
---
M embed.html
1 file changed, 8 insertions(+), 4 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/embed.html b/embed.html
index bdf172a..bc1efa6 100644
--- a/embed.html
+++ b/embed.html
@@ -152,8 +152,8 @@
-
-
+
+
@@ -232,8 +232,12 @@
}, 1500 ) );
var $editor = $( '' );
- qh.setQuery( query );
- qh.draw( $editor );
+ try {
+ qh.setQuery( query );
+ qh.draw( $editor );
+ } catch ( e ) {
+ return;
+ }
$('.edit').on('click',function(e){
e.preventDefault();
--
To view, visit https://gerrit.wikimedia.org/r/376098
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8130182b595e00fa0e522022aee3cda83ca0f7c4
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE)
Gerrit-Reviewer: Smalyshev
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: SelectWidget: Rename getHighlightedItem to findHighlightedItem
Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/376182 )
Change subject: SelectWidget: Rename getHighlightedItem to findHighlightedItem
..
SelectWidget: Rename getHighlightedItem to findHighlightedItem
No need for deprecation or breaking change since this is not
being used anywhere else.
Bug: T76630
Change-Id: If5d05ace671c028eb27a19913fd3b6cb6704fbed
---
M src/widgets/ComboBoxInputWidget.js
M src/widgets/MenuSelectWidget.js
M src/widgets/MenuTagMultiselectWidget.js
M src/widgets/SearchWidget.js
M src/widgets/SelectWidget.js
5 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/82/376182/1
diff --git a/src/widgets/ComboBoxInputWidget.js
b/src/widgets/ComboBoxInputWidget.js
index 3ef7793..cfba538 100644
--- a/src/widgets/ComboBoxInputWidget.js
+++ b/src/widgets/ComboBoxInputWidget.js
@@ -165,7 +165,7 @@
var match = this.menu.getItemFromData( value );
this.menu.selectItem( match );
- if ( this.menu.getHighlightedItem() ) {
+ if ( this.menu.findHighlightedItem() ) {
this.menu.highlightItem( match );
}
@@ -213,7 +213,7 @@
OO.ui.ComboBoxInputWidget.prototype.onMenuItemsChange = function () {
var match = this.menu.getItemFromData( this.getValue() );
this.menu.selectItem( match );
- if ( this.menu.getHighlightedItem() ) {
+ if ( this.menu.findHighlightedItem() ) {
this.menu.highlightItem( match );
}
this.$element.toggleClass( 'oo-ui-comboBoxInputWidget-empty',
this.menu.isEmpty() );
diff --git a/src/widgets/MenuSelectWidget.js b/src/widgets/MenuSelectWidget.js
index 3823021..da3f9f5 100644
--- a/src/widgets/MenuSelectWidget.js
+++ b/src/widgets/MenuSelectWidget.js
@@ -119,7 +119,7 @@
* @inheritdoc
*/
OO.ui.MenuSelectWidget.prototype.onKeyDown = function ( e ) {
- var currentItem = this.getHighlightedItem() || this.getSelectedItem();
+ var currentItem = this.findHighlightedItem() || this.getSelectedItem();
if ( !this.isDisabled() && this.isVisible() ) {
switch ( e.keyCode ) {
diff --git a/src/widgets/MenuTagMultiselectWidget.js
b/src/widgets/MenuTagMultiselectWidget.js
index 6cca479..ce74690 100644
--- a/src/widgets/MenuTagMultiselectWidget.js
+++ b/src/widgets/MenuTagMultiselectWidget.js
@@ -148,7 +148,7 @@
OO.ui.MenuTagMultiselectWidget.prototype.addTagFromInput = function () {
var inputValue = this.input.getValue(),
validated = false,
- highlightedItem = this.menu.getHighlightedItem(),
+ highlightedItem = this.menu.findHighlightedItem(),
item = this.menu.getItemFromData( inputValue );
// Override the parent method so we add from the menu
diff --git a/src/widgets/SearchWidget.js b/src/widgets/SearchWidget.js
index fbce361..4a257d0 100644
--- a/src/widgets/SearchWidget.js
+++ b/src/widgets/SearchWidget.js
@@ -71,7 +71,7 @@
dir = e.which === OO.ui.Keys.DOWN ? 1 : ( e.which ===
OO.ui.Keys.UP ? -1 : 0 );
if ( dir ) {
- highlightedItem = this.results.getHighlightedItem();
+ highlightedItem = this.results.findHighlightedItem();
if ( !highlightedItem ) {
highlightedItem = this.results.getSelectedItem();
}
@@ -103,7 +103,7 @@
* @param {string} value New value
*/
OO.ui.SearchWidget.prototype.onQueryEnter = function () {
- var highlightedItem = this.results.getHighlightedItem();
+ var highlightedItem = this.results.findHighlightedItem();
if ( highlightedItem ) {
this.results.chooseItem( highlightedItem );
}
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index fc5040a..f1770a4 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -282,7 +282,7 @@
OO.ui.SelectWidget.prototype.onKeyDown = function ( e ) {
var nextItem,
handled = false,
- currentItem = this.getHighlightedItem() ||
this.getSelectedItem();
+ currentItem = this.findHighlightedItem() ||
this.getSelectedItem();
if ( !this.isDisabled() && this.isVisible() ) {
switch ( e.keyCode ) {
@@ -408,7 +408,7 @@
}
this.keyPressBufferTimer = setTimeout( this.clearKeyPressBuffer.bind(
this ), 1500 );
- item = this.getHighlightedItem() || this.getSelectedItem();
+ item = this.findHighlightedItem() || this.getSelectedItem();
if ( this.keyPressBuffer === c ) {
// Common (if weird) special case: typing "" will cycle
through all
@@ -532,11 +532,11 @@
};
/**
- * Get highlighted item.
+ * Find highlighted item.
*
* @return {OO.ui.OptionWidget|null} Highlighted item, `null` if no item is
highlighted
*/
-OO.ui.SelectWidget.prot
[MediaWiki-commits] [Gerrit] operations/puppet[production]: mariadb: Add db1100 to s5
Marostegui has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376178 )
Change subject: mariadb: Add db1100 to s5
..
mariadb: Add db1100 to s5
This host is going to be added to s5 and will later serve s8 (or remain
in s5 after the split between s5 and s8)
Bug: T172679
Change-Id: I9685f242b32213131cb6d63bd4b13f7c302ead24
---
A hieradata/hosts/db1100.yaml
M manifests/site.pp
M modules/role/files/prometheus/mysql-core_eqiad.yaml
3 files changed, 3 insertions(+), 1 deletion(-)
Approvals:
Marostegui: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/hosts/db1100.yaml b/hieradata/hosts/db1100.yaml
new file mode 100644
index 000..0d8bce2
--- /dev/null
+++ b/hieradata/hosts/db1100.yaml
@@ -0,0 +1 @@
+mariadb::shard: 's5'
diff --git a/manifests/site.pp b/manifests/site.pp
index 2ef2319..6099a1f 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -479,7 +479,7 @@
role(mariadb::core)
}
-node /^db10(49|70|71|82|87|92|96|99)\.eqiad\.wmnet/ {
+node /^db1(0(49|70|71|82|87|92|96|99))|(1(00))\.eqiad\.wmnet/ {
role(mariadb::core)
}
diff --git a/modules/role/files/prometheus/mysql-core_eqiad.yaml
b/modules/role/files/prometheus/mysql-core_eqiad.yaml
index 5e4cf75..e91b2d5 100644
--- a/modules/role/files/prometheus/mysql-core_eqiad.yaml
+++ b/modules/role/files/prometheus/mysql-core_eqiad.yaml
@@ -80,6 +80,7 @@
- db1092:9104
- db1096:9104
- db1099:9104
+ - db1100:9104
- labels:
shard: s5
role: master
--
To view, visit https://gerrit.wikimedia.org/r/376178
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9685f242b32213131cb6d63bd4b13f7c302ead24
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Marostegui
Gerrit-Reviewer: Giuseppe Lavagetto
Gerrit-Reviewer: Jcrespo
Gerrit-Reviewer: Marostegui
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: New throttle rule
Urbanecm has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/376181 ) Change subject: New throttle rule .. New throttle rule Bug: T175113 Change-Id: I0d8cca08304eb3b32c8f716c52f8d0e79d74dbb6 --- M wmf-config/throttle.php 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/81/376181/1 diff --git a/wmf-config/throttle.php b/wmf-config/throttle.php index 0e6724c..ec3f6d6 100644 --- a/wmf-config/throttle.php +++ b/wmf-config/throttle.php @@ -28,6 +28,14 @@ # ]; ## Add throttling definitions below. +$wmgThrottlingExceptions[] = [ // T175113 + 'from' => '2017-09-05T0:00 +2:00', + 'to' => '2017-09-30T0:00 +2:00', + 'IP' => '93.91.145.154', + 'dbname' => [ 'cswiki', 'cswikiversity' ], + 'value' => 70, // 50 expected +]; + $wmgThrottlingExceptions[] = [ 'from' => '2017-09-29T12:00 UTC', 'to' => '2017-09-30T02:00 UTC', -- To view, visit https://gerrit.wikimedia.org/r/376181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0d8cca08304eb3b32c8f716c52f8d0e79d74dbb6 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Urbanecm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
