from:"Filippo Giunchedi \(Code Review\)"

[MediaWiki-commits] [Gerrit] es-tool: output cluster status during fast-restart - change (operations/puppet)

2015-02-13 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: es-tool: output cluster status during fast-restart
..

es-tool: output cluster status during fast-restart

also add a 'status' subcommand (output can be improved)

Change-Id: Ie5582416f6cc71e36199a391ef008bdec5a4ad51
---
M modules/elasticsearch/files/es-tool
1 file changed, 20 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/75/190475/1

diff --git a/modules/elasticsearch/files/es-tool 
b/modules/elasticsearch/files/es-tool
index 31ed715..10ff906 100755
--- a/modules/elasticsearch/files/es-tool
+++ b/modules/elasticsearch/files/es-tool
@@ -16,6 +16,20 @@
 return es.cluster.health()[status]
 
 
+def cluster_status(columns=None):
+es = Elasticsearch(args.server)
+cluster_health = es.cluster.health()
+if columns is None:
+columns = sorted(cluster_health)
+values = [cluster_health[x] for x in columns]
+
+column_fmt = ' '.join('{:}' for x in columns)
+value_fmt = ' '.join('{:%s}' % len(x) for x in columns)
+
+yield column_fmt.format(*columns)
+yield value_fmt.format(*values)
+
+
 def set_setting(setting, value, settingtype=transient):
 es = Elasticsearch(args.server)
 res = es.cluster.put_settings(
@@ -136,9 +150,12 @@
 
 # Wait a bit
 time.sleep(5)
-printu(Waiting for green (you can ctrl+c here if you have to)...)
+print Waiting for green (you can ctrl+c here if you have to)...\n
 while cluster_health() != green:
-time.sleep(1)
+print '\n'.join(cluster_status(columns=('status',
+'initializing_shards',
+'relocating_shards')))
+time.sleep(60)
 print ok
 
 return os.EX_OK
@@ -188,6 +205,7 @@
 start-replication: es_start_replication,
 stop-replication: es_stop_replication,
 unban-node: es_unban_node,
+status: lambda: '\n'.join(cluster_status()),
 }
 
 # main()

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie5582416f6cc71e36199a391ef008bdec5a4ad51
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] public entry point for restbase - change (operations/dns)

2015-02-09 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: public entry point for restbase
..


public entry point for restbase

also provision restbase.wikimedia.org to be consistent with other services
event though it won't be the advertised name to use.

Bug: T78194
Change-Id: I17e6f9ff9563b70d0499e4b7296017ed72561760
---
M templates/wikimedia.org
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/templates/wikimedia.org b/templates/wikimedia.org
index dc8b8f1..d2331a2 100644
--- a/templates/wikimedia.org
+++ b/templates/wikimedia.org
@@ -246,6 +246,10 @@
 citoid.eqiad1H  IN A208.80.154.248
 1H  IN  2620:0:861:ed1a::3:14
 citoid  1H  IN CNAME citoid.eqiad
+restbase.eqiad  1H  IN A208.80.154.248
+1H  IN  2620:0:861:ed1a::3:14
+restbase1H  IN CNAME restbase.eqiad
+rest1H  IN CNAME restbase.eqiad
 
 ;;; ulsfo
 text-lb.ulsfo   600 IN DYNA geoip!text-addrs/ulsfo

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I17e6f9ff9563b70d0499e4b7296017ed72561760
Gerrit-PatchSet: 2
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] restbase: fix partman swap and ordering - change (operations/puppet)

2015-02-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: fix partman swap and ordering
..

restbase: fix partman swap and ordering

Change-Id: I7c241875552bc390bb17c4a848923678c87b108c
---
M modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
1 file changed, 5 insertions(+), 10 deletions(-)


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

diff --git 
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg 
b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
index 14f026c..bbd67dd 100644
--- a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
@@ -21,10 +21,10 @@
3   1   3   raid\
$primary{ } method{ raid }  \
$lvmignore{ }   \
-   format{ }   \
-   use_filesystem{ }   \
-   filesystem{ ext4 }  \
-   mountpoint{ / } \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
.   \
50  3   -1  raid\
$primary{ } method{ raid }  \
@@ -39,11 +39,6 @@
use_filesystem{ }   \
filesystem{ ext4 }  \
mountpoint{ /var }  \
-   .   \
-   10002   1000raid\
-   $primary{ } method{ raid }  \
-   $lvmignore{ }   \
-   format{ }   \
.
 
 # Parameters are:
@@ -53,7 +48,7 @@
1   3   1   ext4/   \
/dev/sda1#/dev/sdb1#/dev/sdc1   \
.   \
-   1   3   1   swap-   \
+   1   3   0   swap-   \
/dev/sda2#/dev/sdb2#/dev/sdc2   \
.   \
0   3   0   lvm -   \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7c241875552bc390bb17c4a848923678c87b108c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] restbase: fix partman swap and ordering - change (operations/puppet)

2015-02-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: restbase: fix partman swap and ordering
..


restbase: fix partman swap and ordering

Change-Id: I7c241875552bc390bb17c4a848923678c87b108c
---
M modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
1 file changed, 5 insertions(+), 10 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git 
a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg 
b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
index 14f026c..bbd67dd 100644
--- a/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
+++ b/modules/install-server/files/autoinstall/partman/cassandrahosts.cfg
@@ -21,10 +21,10 @@
3   1   3   raid\
$primary{ } method{ raid }  \
$lvmignore{ }   \
-   format{ }   \
-   use_filesystem{ }   \
-   filesystem{ ext4 }  \
-   mountpoint{ / } \
+   .   \
+   10002   1000raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
.   \
50  3   -1  raid\
$primary{ } method{ raid }  \
@@ -39,11 +39,6 @@
use_filesystem{ }   \
filesystem{ ext4 }  \
mountpoint{ /var }  \
-   .   \
-   10002   1000raid\
-   $primary{ } method{ raid }  \
-   $lvmignore{ }   \
-   format{ }   \
.
 
 # Parameters are:
@@ -53,7 +48,7 @@
1   3   1   ext4/   \
/dev/sda1#/dev/sdb1#/dev/sdc1   \
.   \
-   1   3   1   swap-   \
+   1   3   0   swap-   \
/dev/sda2#/dev/sdb2#/dev/sdc2   \
.   \
0   3   0   lvm -   \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7c241875552bc390bb17c4a848923678c87b108c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] wmf-reimage: ask for ipmi password if possible - change (operations/puppet)

2015-02-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: wmf-reimage: ask for ipmi password if possible
..

wmf-reimage: ask for ipmi password if possible

aka don't troll the user

also just pass in IPMI_PASSWORD, don't export

Change-Id: Ib5e2350112bc0b6d850f7593e1a693df025fd435
---
M modules/puppetmaster/files/wmf-reimage
1 file changed, 12 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/190227/1

diff --git a/modules/puppetmaster/files/wmf-reimage 
b/modules/puppetmaster/files/wmf-reimage
index 29149c1..e45c982 100755
--- a/modules/puppetmaster/files/wmf-reimage
+++ b/modules/puppetmaster/files/wmf-reimage
@@ -102,15 +102,19 @@
 function set_pxe_and_reboot {
 mgmtname=${1}
 if [ -z $IPMI_PASSWORD ]; then
-   echo WARNING: IPMI_PASSWORD not found. Assuming bash, do: 
-   echo HISTCONTROL=ignorebothenter
-   echo spaceexport IPMI_PASSWORD='supersecretpass'
-   echo WARNING: Continuing without auto rebooting the box
-   return
+echo WARNING: IPMI_PASSWORD not found.
+if ! tty -s; then
+echo Assuming bash, do: 
+echo HISTCONTROL=ignorebothenter
+echo spaceexport IPMI_PASSWORD='supersecretpass'
+echo WARNING: Continuing without auto rebooting the box
+return
+fi
+read -s -p IPMI password: 
+IPMI_PASSWORD=$REPLY
 fi
-export IPMI_PASSWORD
-ipmitool -I lanplus -H ${mgmtname} -U root -E chassis bootdev pxe
-ipmitool -I lanplus -H ${mgmtname} -U root -E chassis power cycle
+IPMI_PASSWORD=$IPMI_PASSWORD ipmitool -I lanplus -H ${mgmtname} -U root -E 
chassis bootdev pxe
+IPMI_PASSWORD=$IPMI_PASSWORD ipmitool -I lanplus -H ${mgmtname} -U root -E 
chassis power cycle
 }
 
 function enable_and_run_puppet {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib5e2350112bc0b6d850f7593e1a693df025fd435
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] puppetmaster: rename reimage.sh to wmf-reimage - change (operations/puppet)

2015-02-12 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: puppetmaster: rename reimage.sh to wmf-reimage
..

puppetmaster: rename reimage.sh to wmf-reimage

Change-Id: I50f246ca06721d59dc008b8b0253ac56bad3134a
---
R modules/puppetmaster/files/wmf-reimage
M modules/puppetmaster/manifests/scripts.pp
2 files changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/190226/1

diff --git a/modules/puppetmaster/files/reimage.sh 
b/modules/puppetmaster/files/wmf-reimage
similarity index 100%
rename from modules/puppetmaster/files/reimage.sh
rename to modules/puppetmaster/files/wmf-reimage
diff --git a/modules/puppetmaster/manifests/scripts.pp 
b/modules/puppetmaster/manifests/scripts.pp
index 5148d55..4a08e9fb 100644
--- a/modules/puppetmaster/manifests/scripts.pp
+++ b/modules/puppetmaster/manifests/scripts.pp
@@ -52,6 +52,6 @@
 owner  = 'root',
 group  = 'root',
 mode   = '0544',
-source = 'puppet:///modules/puppetmaster/reimage.sh'
+source = 'puppet:///modules/puppetmaster/wmf-reimage'
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50f246ca06721d59dc008b8b0253ac56bad3134a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] es-tool: output cluster status during fast-restart - change (operations/puppet)

2015-02-16 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: es-tool: output cluster status during fast-restart
..


es-tool: output cluster status during fast-restart

also add a 'status' subcommand (output can be improved)

Change-Id: Ie5582416f6cc71e36199a391ef008bdec5a4ad51
---
M modules/elasticsearch/files/es-tool
1 file changed, 20 insertions(+), 2 deletions(-)

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



diff --git a/modules/elasticsearch/files/es-tool 
b/modules/elasticsearch/files/es-tool
index 31ed715..10ff906 100755
--- a/modules/elasticsearch/files/es-tool
+++ b/modules/elasticsearch/files/es-tool
@@ -16,6 +16,20 @@
 return es.cluster.health()[status]
 
 
+def cluster_status(columns=None):
+es = Elasticsearch(args.server)
+cluster_health = es.cluster.health()
+if columns is None:
+columns = sorted(cluster_health)
+values = [cluster_health[x] for x in columns]
+
+column_fmt = ' '.join('{:}' for x in columns)
+value_fmt = ' '.join('{:%s}' % len(x) for x in columns)
+
+yield column_fmt.format(*columns)
+yield value_fmt.format(*values)
+
+
 def set_setting(setting, value, settingtype=transient):
 es = Elasticsearch(args.server)
 res = es.cluster.put_settings(
@@ -136,9 +150,12 @@
 
 # Wait a bit
 time.sleep(5)
-printu(Waiting for green (you can ctrl+c here if you have to)...)
+print Waiting for green (you can ctrl+c here if you have to)...\n
 while cluster_health() != green:
-time.sleep(1)
+print '\n'.join(cluster_status(columns=('status',
+'initializing_shards',
+'relocating_shards')))
+time.sleep(60)
 print ok
 
 return os.EX_OK
@@ -188,6 +205,7 @@
 start-replication: es_start_replication,
 stop-replication: es_stop_replication,
 unban-node: es_unban_node,
+status: lambda: '\n'.join(cluster_status()),
 }
 
 # main()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5582416f6cc71e36199a391ef008bdec5a4ad51
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alex Monk kren...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] restbase: allocate LVS service ip - change (operations/dns)

2015-02-16 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: allocate LVS service ip
..

restbase: allocate LVS service ip

Bug: T89636
Change-Id: I1af894432f57df379f2953cdb090becba4cb2de6
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/dns 
refs/changes/84/190784/1

diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 20e197a..e6490a7 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -40,6 +40,7 @@
 29  1H  IN PTR  parsoidcache.svc.eqiad.wmnet.
 30  1H  IN PTR  search.svc.eqiad.wmnet.
 31  1H  IN PTR  ocg.svc.eqiad.wmnet.
+32  1H  IN PTR  restbase.svc.eqiad.wmnet.
 
 ; esams svc ips
 
diff --git a/templates/wmnet b/templates/wmnet
index f0f71eb..7f104b2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -3066,6 +3066,7 @@
 parsoidcache1H  IN A10.2.2.29
 search  1H  IN A10.2.2.30
 ocg 1H  IN A10.2.2.31
+restbase 1H  IN A10.2.2.32
 labstore1H  IN A10.64.37.10
 apertium1H  IN A10.64.32.153
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1af894432f57df379f2953cdb090becba4cb2de6
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] restbase: add LVS configuration - change (operations/puppet)

2015-02-16 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: add LVS configuration
..

restbase: add LVS configuration

note: as a followup to this we'll need a role or variable not to deploy LVS
realserver during testing

Bug: T89636
Change-Id: I85d70c5b2aded256ab808789e9ec0e6b8ca3bd8b
---
M manifests/role/lvs.pp
M manifests/role/restbase.pp
M modules/lvs/manifests/configuration.pp
M modules/lvs/manifests/monitor.pp
4 files changed, 24 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/lvs.pp b/manifests/role/lvs.pp
index 7692336..9123a1b 100644
--- a/manifests/role/lvs.pp
+++ b/manifests/role/lvs.pp
@@ -44,6 +44,7 @@
 $sip['citoid'][$::site],
 $sip['cxserver'][$::site],
 $sip['search'][$::site],
+$sip['restbase'][$::site],
 ],
 
 # codfw (should mirror eqiad above, eventually, and become merged with 
it via regex
diff --git a/manifests/role/restbase.pp b/manifests/role/restbase.pp
index e003194..dd302a5 100644
--- a/manifests/role/restbase.pp
+++ b/manifests/role/restbase.pp
@@ -1,9 +1,14 @@
 # == Class role::restbase
 #
 
+@monitoring::group { 'restbase_eqiad': description = 'Restbase eqiad' }
+
 # Config should be pulled from hiera
 class role::restbase {
 system::role { 'restbase': description = Restbase ${::realm} }
 
 include ::restbase
+
+include lvs::configuration
+class { 'lvs::realserver': realserver_ips = 
$lvs::configuration::lvs_service_ips[$::realm]['restbase'][$::site] }
 }
diff --git a/modules/lvs/manifests/configuration.pp 
b/modules/lvs/manifests/configuration.pp
index 9ee3141..4c33669 100644
--- a/modules/lvs/manifests/configuration.pp
+++ b/modules/lvs/manifests/configuration.pp
@@ -173,6 +173,9 @@
 'cxserver' = {
 'eqiad' = 10.2.2.18,
 },
+'restbase' = {
+'eqiad' = 10.2.2.32,
+},
 },
 'labs' = {
 'text' = {
@@ -204,6 +207,7 @@
 'parsoidcache' = {},
 'search' = {},
 'stream' = {},
+'restbase' = {},
 }
 }
 
@@ -697,5 +701,18 @@
 'IdleConnection' = $idleconnection_monitor_options,
 }
 }
+'restbase' = {
+'description' = 'RESTBase, cxserver.svc.eqiad.wmnet',
+'class' = 'high-traffic2',
+'sites' = [ 'eqiad' ],
+'ip' = $service_ips['restbase'][$::site],
+'port' = 7231,
+'bgp' = 'yes',
+'depool-threshold' = '.5',
+'monitors' = {
+'ProxyFetch' = { 'url' = [ 'http://restbase.svc.eqiad.wmnet' 
] },
+'IdleConnection' = $idleconnection_monitor_options,
+}
+}
 }
 }
diff --git a/modules/lvs/manifests/monitor.pp b/modules/lvs/manifests/monitor.pp
index 487fff0..cd5493d 100644
--- a/modules/lvs/manifests/monitor.pp
+++ b/modules/lvs/manifests/monitor.pp
@@ -17,6 +17,7 @@
 lvs::monitor_service_http { 'mathoid.svc.eqiad.wmnet': ip_address = 
$ip['mathoid']['eqiad'], check_command = 
check_http_lvs_on_port!mathoid.svc.eqiad.wmnet!10042!/ }
 lvs::monitor_service_http { 'citoid.svc.eqiad.wmnet': ip_address = 
$ip['citoid']['eqiad'], check_command = 
check_http_lvs_on_port!citoid.svc.eqiad.wmnet!1970!/, contact_group = 
admins,parsoid }
 lvs::monitor_service_http { 'cxserver.svc.eqiad.wmnet': ip_address = 
$ip['cxserver']['eqiad'], check_command = 
check_http_lvs_on_port!citoid.svc.eqiad.wmnet!8080!/ }
+lvs::monitor_service_http { 'restbase.svc.eqiad.wmnet': ip_address = 
$ip['restbase']['eqiad'], check_command = 
check_http_lvs_on_port!restbase.svc.eqiad.wmnet!7231!/ }
 
 # INTERNAL CODFW
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I85d70c5b2aded256ab808789e9ec0e6b8ca3bd8b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] gdash: add carbon-cache utilization dashboard - change (operations/puppet)

2015-01-08 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: gdash: add carbon-cache utilization dashboard
..

gdash: add carbon-cache utilization dashboard

Change-Id: I5a6fbff8c8211771790e9c8b51f9f7dc91d9e17b
---
A files/gdash/dashboards/graphite/carbon_cache_cache.graph
1 file changed, 13 insertions(+), 0 deletions(-)


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

diff --git a/files/gdash/dashboards/graphite/carbon_cache_cache.graph 
b/files/gdash/dashboards/graphite/carbon_cache_cache.graph
new file mode 100644
index 000..7b2a2db
--- /dev/null
+++ b/files/gdash/dashboards/graphite/carbon_cache_cache.graph
@@ -0,0 +1,13 @@
+title   carbon cache utilization
+
+field :cache_size,
+   :alias = cache size (bytes),
+   :data  = sumSeries(carbon.agents.tungsten-*.cache.size),
+
+field :queues,
+   :alias = queues,
+   :data  = sumSeries(carbon.agents.tungsten-*.cache.queues),
+
+field :overflow,
+   :alias = overflow,
+   :data  = 
secondYAxis(sumSeries(carbon.agents.tungsten-*.cache.overflow)),

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a6fbff8c8211771790e9c8b51f9f7dc91d9e17b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] graphite: limit uwsgi workers memory - change (operations/puppet)

2015-01-08 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: graphite: limit uwsgi workers memory
..


graphite: limit uwsgi workers memory

querying graphite-web for many metrics/datapoints can make it consume large
amounts of memory, in turn trashing the machine's caches. Limit memory in a
cgroup for all uwsgi workers to limit the impact.

Change-Id: Id0823c35c06b778f743d8354b836a27dff3655d7
---
M modules/graphite/manifests/web.pp
1 file changed, 7 insertions(+), 1 deletion(-)

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



diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 4c61335..f112f65 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -8,6 +8,9 @@
 # [*uwsgi_processes*]
 #   Number of uWSGI workers to run (default: 8).
 #
+# [*max_memory*]
+#   Maximum memory allowed for uWSGI workers *combined* (default: 8G).
+#
 # [*memcached_size*]
 #   Size of memcached store, in megabytes (default: 200).
 #
@@ -38,6 +41,7 @@
 $secret_key,
 $storage_dir,
 $uwsgi_processes   = 8,
+$max_memory= to_bytes(8G),
 $memcached_size= 200,
 $admin_user= 'admin',
 $documentation_url = 'http://graphite.readthedocs.org/',
@@ -45,7 +49,7 @@
 ) {
 include ::graphite
 
-package { ['memcached', 'python-memcache', 'graphite-web']: }
+package { ['memcached', 'python-memcache', 'graphite-web', 'cgroup-bin']: }
 
 file { '/etc/graphite/cors.py':
 source  = 'puppet:///modules/graphite/cors.py',
@@ -104,6 +108,8 @@
 'die-on-term' = true,
 'master'  = true,
 'processes'   = $uwsgi_processes,
+'cgroup'  = '/sys/fs/cgroup/memory/graphite-web',
+'cgroup-opt'  = memory.limit_in_bytes=$max_memory,
 },
 },
 require  = File['/var/log/graphite-web'],

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Id0823c35c06b778f743d8354b836a27dff3655d7
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] lsearchd: remove udp2log configuration - change (operations/puppet)

2015-01-08 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: lsearchd: remove udp2log configuration
..

lsearchd: remove udp2log configuration

Bug: T85009
Change-Id: I3e14c8007ebef0fb05eb2e21f502fceb9697dc25
---
M manifests/role/logging.pp
M manifests/site.pp
D templates/udp2log/filters.lucene.erb
3 files changed, 0 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/69/183469/1

diff --git a/manifests/role/logging.pp b/manifests/role/logging.pp
index fa116c0..df887fd 100644
--- a/manifests/role/logging.pp
+++ b/manifests/role/logging.pp
@@ -369,18 +369,6 @@
 }
 }
 
-# lucene udp2log instance for capturing search logs
-class role::logging::udp2log::lucene inherits role::logging::udp2log {
-# udp2log::instance will ensure this is created
-$lucene_log_directory= $log_directory/lucene
-
-misc::udp2log::instance { 'lucene':
-port = '51234',
-log_directory= $lucene_log_directory,
-monitor_packet_loss  = false,
-monitor_log_age  = false,
-}
-}
 # == Class role::logging::udp2log::erbium
 # Erbium udp2log instance:
 # - Fundraising: This requires write permissions on the netapp mount.
diff --git a/manifests/site.pp b/manifests/site.pp
index 947f815..de95148 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2203,8 +2203,6 @@
 
 # main oxygen udp2log handles mostly Wikipedia Zero webrequest logs
 include role::logging::udp2log::oxygen
-# Also include lucene search loggging udp2log instance
-include role::logging::udp2log::lucene
 }
 
 node 'palladium.eqiad.wmnet' {
diff --git a/templates/udp2log/filters.lucene.erb 
b/templates/udp2log/filters.lucene.erb
deleted file mode 100644
index c0283d9..000
--- a/templates/udp2log/filters.lucene.erb
+++ /dev/null
@@ -1 +0,0 @@
-pipe 1 /bin/grep 'SearchResults:'  /a/log/lucene/lucene.log

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e14c8007ebef0fb05eb2e21f502fceb9697dc25
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] graphite: archive received metrics on disk - change (operations/puppet)

2015-01-08 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: archive received metrics on disk
..

graphite: archive received metrics on disk

Right now if the carbon pipeline can't properly persist metrics we have
data loss. To mitigate this we can store the received metrics in plaintext
format on disk for some time. This can be used to replay the metric traffic and
backfill in case of data loss and metrics are kept at full resolution with no
downsampling.

Note that the class isn't applied anywhere yet, the disk requirements are very
different than serving graphite (raw storage space as opposed to many IOPS).
Estimating the disk requirements is somewhat hard at the moment but taking a
guesstimate of 1MB/s it would be 86G/day uncompressed.

Bug: T85908
Change-Id: Ifbf0fa4f06c26ba142ebf3025d19be0f50b1d6ad
---
A modules/graphite/files/carbon-archive
A modules/graphite/manifests/archive.pp
A modules/graphite/templates/archive.logrotate.conf.erb
A modules/graphite/templates/archive.upstart.conf.erb
4 files changed, 71 insertions(+), 0 deletions(-)


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

diff --git a/modules/graphite/files/carbon-archive 
b/modules/graphite/files/carbon-archive
new file mode 100644
index 000..791d83d
--- /dev/null
+++ b/modules/graphite/files/carbon-archive
@@ -0,0 +1,13 @@
+#!/bin/bash
+# listen on LISTEN_PORT and log the received traffic to ARCHIVE_DIR according
+# to TEMPLATE
+set -e
+set -u
+
+listen_port=${LISTEN_PORT:-1803}
+archive_dir=${ARCHIVE_DIR:-/var/lib/carbon/archive}
+template=${TEMPLATE:-%Y-%m-%dT%H.log}
+
+nc -k -l ${listen_port} |
+  cronolog --symlink ${archive_dir}/current \
+${archive_dir}/${template}
diff --git a/modules/graphite/manifests/archive.pp 
b/modules/graphite/manifests/archive.pp
new file mode 100644
index 000..0156522
--- /dev/null
+++ b/modules/graphite/manifests/archive.pp
@@ -0,0 +1,39 @@
+# == Class: graphite::archive
+#
+# Provide a local listener to accept plaintext metrics and archive them to
+# disk. The metrics archive can be used to recover from data loss or backfill
+# the metrics elsewhere for example.
+
+class graphite::archive(
+$storage_dir = '/var/lib/carbon',
+) {
+require_package('cronolog', 'netcat-traditional', 'logrotate')
+
+$carbon_archive_path = '/usr/bin/carbon-archive'
+
+file { '/etc/init/carbon/archive.conf':
+owner   = 'root',
+group   = 'root',
+mode= '0444',
+content = template('graphite/archive.upstart.conf.erb'),
+notify  = Service['carbon/archive'],
+}
+
+file { $carbon_archive_path:
+source = 'puppet:///modules/graphite/carbon-archive',
+mode   = '0555',
+before = Service['carbon/archive'],
+}
+
+file { '/etc/logrotate.d/carbon-archive':
+owner   = 'root',
+group   = 'root',
+mode= '0444',
+content = template('graphite/archive.logrotate.conf.erb'),
+}
+
+service { 'carbon/archive':
+ensure   = 'running',
+provider = 'upstart',
+}
+}
diff --git a/modules/graphite/templates/archive.logrotate.conf.erb 
b/modules/graphite/templates/archive.logrotate.conf.erb
new file mode 100644
index 000..cce7a8c
--- /dev/null
+++ b/modules/graphite/templates/archive.logrotate.conf.erb
@@ -0,0 +1,7 @@
+%= #{storage_dir} -%/archive/*.log {
+  daily
+  delaycompress
+  compress
+  nocreate
+  rotate 90
+}
diff --git a/modules/graphite/templates/archive.upstart.conf.erb 
b/modules/graphite/templates/archive.upstart.conf.erb
new file mode 100644
index 000..851e05f
--- /dev/null
+++ b/modules/graphite/templates/archive.upstart.conf.erb
@@ -0,0 +1,12 @@
+description archive local carbon metric traffic to disk
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on [!12345]
+
+limit nofile 32768 32768
+
+setuid _graphite
+
+env ARCHIVE_DIR=%= #{storage_dir}/archive %
+
+exec %= #{carbon_archive_path} %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbf0fa4f06c26ba142ebf3025d19be0f50b1d6ad
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] gdash: add carbon-cache utilization dashboard - change (operations/puppet)

2015-01-08 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: gdash: add carbon-cache utilization dashboard
..


gdash: add carbon-cache utilization dashboard

Change-Id: I5a6fbff8c8211771790e9c8b51f9f7dc91d9e17b
---
A files/gdash/dashboards/graphite/carbon_cache_cache.graph
1 file changed, 13 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/files/gdash/dashboards/graphite/carbon_cache_cache.graph 
b/files/gdash/dashboards/graphite/carbon_cache_cache.graph
new file mode 100644
index 000..7b2a2db
--- /dev/null
+++ b/files/gdash/dashboards/graphite/carbon_cache_cache.graph
@@ -0,0 +1,13 @@
+title   carbon cache utilization
+
+field :cache_size,
+   :alias = cache size (bytes),
+   :data  = sumSeries(carbon.agents.tungsten-*.cache.size),
+
+field :queues,
+   :alias = queues,
+   :data  = sumSeries(carbon.agents.tungsten-*.cache.queues),
+
+field :overflow,
+   :alias = overflow,
+   :data  = 
secondYAxis(sumSeries(carbon.agents.tungsten-*.cache.overflow)),

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I5a6fbff8c8211771790e9c8b51f9f7dc91d9e17b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] txstatsd: add support for graphite line-protocol - change (operations...txstatsd)

2015-01-06 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: txstatsd: add support for graphite line-protocol
..


txstatsd: add support for graphite line-protocol

txstatsd uses graphite's native carbon client, which works well but only
supports pickle format.
However I couldn't find any non-graphite tools available that can route pickle
protocol, we are going to use carbon-c-relay in the first iteration which is
plaintext-only. See also
http://graphite.readthedocs.org/en/latest/feeding-carbon.html#the-plaintext-protocol

Changing carbon client code completely isn't an appealing option to me and we
already ship txstatsd via custom debian packages anyway.

So the ugly approach in this case is to monkey-patch the functions used to
serialize metrics and restrict plaintext protocol support to txstatsd only :(

Change-Id: I3b4230f8a358adaee7134bd586b503774574a31e
---
M txstatsd.conf-example
M txstatsd/service.py
2 files changed, 30 insertions(+), 1 deletion(-)

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



diff --git a/txstatsd.conf-example b/txstatsd.conf-example
index 1119fa9..53eef1d 100644
--- a/txstatsd.conf-example
+++ b/txstatsd.conf-example
@@ -5,6 +5,8 @@
 carbon-cache-port: 2003
 # The UDP port where we will listen.
 listen-port: 8125
+# Write metrics using graphite's line-oriented protocol instead of pickle
+use-line-protocol: 0
 
 # The number of milliseconds between each flush.
 flush-interval: 6
@@ -23,4 +25,4 @@
 monitor-response: txstatsd pong
 
 [plugin_sample]
-sample-key: sample-value
\ No newline at end of file
+sample-key: sample-value
diff --git a/txstatsd/service.py b/txstatsd/service.py
index f8721d7..bc77694 100644
--- a/txstatsd/service.py
+++ b/txstatsd/service.py
@@ -156,6 +156,8 @@
  The port where carbon cache is listening., int],
 [carbon-cache-name, n, None,
  An identifier for the carbon-cache instance.],
+[use-line-protocol, P, 0,
+ Use graphite line protocol when sending metrics.],
 [listen-port, l, 8125,
  The UDP port where we will listen., int],
 [flush-interval, i, 6,
@@ -252,6 +254,23 @@
 return current_stats
 
 
+def _CarbonClientLineProtocol_sendDatapoints(self, datapoints):
+Serialize data in line (or plaintext) format, one metric per line.
+def _serialize(data):
+return .join(%s %s %s\n % (x, y[1], y[0]) for x, y in data)
+
+from carbon import instrumentation
+self.sendString(_serialize(datapoints))
+instrumentation.increment(self.sent, len(datapoints))
+self.factory.checkQueue()
+
+
+def _Int32StringReceiver_sendString(self, string):
+Write data verbatim to the transport, StringReceiver standard
+   implementation would length-prefix the string instead.
+self.transport.write(string)
+
+
 def createService(options):
 Create a txStatsD service.
 from carbon.routers import ConsistentHashingRouter
@@ -331,6 +350,14 @@
 report_name.upper(), ()):
 reporting.schedule(reporter, 60, metrics.gauge)
 
+# monkey-patch line protocol sending function :(
+if options[use-line-protocol]:
+import carbon.client
+carbon.client.CarbonClientProtocol._sendDatapoints = \
+_CarbonClientLineProtocol_sendDatapoints
+carbon.client.CarbonClientProtocol.sendString = \
+_Int32StringReceiver_sendString
+
 # XXX Make this configurable.
 router = ConsistentHashingRouter()
 carbon_client = CarbonClientManager(router)

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I3b4230f8a358adaee7134bd586b503774574a31e
Gerrit-PatchSet: 4
Gerrit-Project: operations/debs/txstatsd
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Chasemp chas...@gmail.com
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com

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

[MediaWiki-commits] [Gerrit] graphite: limit uwsgi workers memory - change (operations/puppet)

2015-01-07 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: limit uwsgi workers memory
..

graphite: limit uwsgi workers memory

querying graphite-web for many metrics/datapoints can make it consume large
amounts of memory, in turn trashing the machine's caches. Limit memory in a
cgroup for all uwsgi workers to limit the impact.

Change-Id: Id0823c35c06b778f743d8354b836a27dff3655d7
---
M modules/graphite/manifests/web.pp
1 file changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/56/183256/1

diff --git a/modules/graphite/manifests/web.pp 
b/modules/graphite/manifests/web.pp
index 4c61335..f112f65 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -8,6 +8,9 @@
 # [*uwsgi_processes*]
 #   Number of uWSGI workers to run (default: 8).
 #
+# [*max_memory*]
+#   Maximum memory allowed for uWSGI workers *combined* (default: 8G).
+#
 # [*memcached_size*]
 #   Size of memcached store, in megabytes (default: 200).
 #
@@ -38,6 +41,7 @@
 $secret_key,
 $storage_dir,
 $uwsgi_processes   = 8,
+$max_memory= to_bytes(8G),
 $memcached_size= 200,
 $admin_user= 'admin',
 $documentation_url = 'http://graphite.readthedocs.org/',
@@ -45,7 +49,7 @@
 ) {
 include ::graphite
 
-package { ['memcached', 'python-memcache', 'graphite-web']: }
+package { ['memcached', 'python-memcache', 'graphite-web', 'cgroup-bin']: }
 
 file { '/etc/graphite/cors.py':
 source  = 'puppet:///modules/graphite/cors.py',
@@ -104,6 +108,8 @@
 'die-on-term' = true,
 'master'  = true,
 'processes'   = $uwsgi_processes,
+'cgroup'  = '/sys/fs/cgroup/memory/graphite-web',
+'cgroup-opt'  = memory.limit_in_bytes=$max_memory,
 },
 },
 require  = File['/var/log/graphite-web'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id0823c35c06b778f743d8354b836a27dff3655d7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] diamond: stop collecting disk partitions stats - change (operations/puppet)

2015-03-18 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: diamond: stop collecting disk partitions stats
..

diamond: stop collecting disk partitions stats

partition statistics roughly take up ~50% of iostat space for little benefit,
note md/lvm are unaffected, only sd* and x?vd*

Bug: T1075
Change-Id: Ia7926fe30e125e74f3d147f47221741730f54860
---
M modules/diamond/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)


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

diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 42e43c0..01a6c42 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -113,4 +113,10 @@
 }
 
 diamond::collector { 'Network': }
+
+diamond::collector { 'DiskUsage':
+settings = {
+devices   = 
'PhysicalDrive[0-9]+$|md[0-9]+$|sd[a-z]+$|x?vd[a-z]+$|disk[0-9]+$|dm-[0-9]+$',
+},
+}
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7926fe30e125e74f3d147f47221741730f54860
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swift: provision ms-be101[678] - change (operations/puppet)

2015-03-18 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: provision ms-be101[678]
..

swift: provision ms-be101[678]

HP machines have different disk ordering unfortunately as discovered in T90922,
thus duplicate/split site.pp entries and d-i preseed to accomodate that. The
swift ring will be also changed accordingly.

Bug: T90922
Change-Id: I45ad8699bf5f6b7cd17e646137c4e0bb3ff57bb2
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
3 files changed, 85 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/197526/1

diff --git a/manifests/site.pp b/manifests/site.pp
index beeab49..5fc1e5c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1815,7 +1815,7 @@
 include role::diamond
 }
 
-node /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/ {
+node /^ms-be10(0[0-9]|1[0-5])\.eqiad\.wmnet$/ {
 $all_drives = [
 '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
 '/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
@@ -1832,6 +1832,24 @@
 swift::mount_filesystem{ '/dev/sdn3': }
 }
 
+# HP machines have different disk ordering T90922
+node /^ms-be101[678]\.eqiad\.wmnet$/ {
+$all_drives = [
+'/dev/sdm', '/dev/sdn', '/dev/sdc', '/dev/sdd',
+'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
+'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
+   ]
+
+role swift::eqiad_prod::storage
+
+swift::create_filesystem{ $all_drives: partition_nr = '1' }
+# these are already partitioned and xfs formatted by the installer
+swift::label_filesystem{ '/dev/sda3': }
+swift::label_filesystem{ '/dev/sdb3': }
+swift::mount_filesystem{ '/dev/sda3': }
+swift::mount_filesystem{ '/dev/sdb3': }
+}
+
 node /^ms-fe300[1-2]\.esams\.wmnet$/ {
 role swift::esams_prod::proxy
 }
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 3d2744a..ed38f60 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -71,7 +71,9 @@
 #  sodium) echo partman/mailserver.cfg ;; \
mc[1-9]*) echo partman/mc.cfg ;; \
ms-fe[1-2]0[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
-   ms-be[1-2]0[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be20[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be100[0-9]|ms-be101[0-5]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be101[678]) echo partman/ms-be-eqiad-hp.cfg ;; \
ms-fe30[0-9][0-9]) echo partman/flat.cfg ;; \
ms-be30[0-9][0-9]) echo partman/ms-be-esams.cfg ;; \
mw[0-9]*|osmium|rcs[0-9]*) echo partman/mw.cfg ;; \
diff --git 
a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg 
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
new file mode 100644
index 000..65c03ed
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
@@ -0,0 +1,63 @@
+# Automatic software RAID partitioning
+#
+# * two disks, sda  sdb (SSD)
+# * primary partitions, no LVM
+# * layout:
+#   - /  : ext3, RAID1, 60GB
+#   - swap: RAID1, 1GB
+#   - the rest of each respective disk (no RAID) formatted as xfs, unmounted
+
+d-ipartman-auto/method string  raid
+
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb
+d-igrub-installer/bootdev  string  /dev/sda /dev/sdb
+
+# this workarounds LP #1012629 / Debian #666974
+# it makes grub-installer to jump to step 2, where it uses bootdev
+d-igrub-installer/only_debian  boolean false
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   multiraid ::\
+   3   80003   raid\
+   $primary{ } method{ raid }  \
+   .   \
+   100010001000raid\
+   $primary{ } method{ raid }  \
+   .   \
+   6   500 12  xfs \
+   $primary{ } method{ format }\
+   format{ } use_filesystem{ } \
+   filesystem{ xfs }   \
+   . \
+   3   1   -1  raid\
+   $primary{ } method{ raid }  \
+   .
+
+# Parameters are:
+#

[MediaWiki-commits] [Gerrit] diamond: stop collecting disk IO stats for partitions - change (operations/puppet)

2015-03-18 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: diamond: stop collecting disk IO stats for partitions
..


diamond: stop collecting disk IO stats for partitions

partition statistics roughly take up ~50% of iostat space for little benefit,
note md/lvm are unaffected, only sd* and x?vd*

Bug: T1075
Change-Id: Ia7926fe30e125e74f3d147f47221741730f54860
---
M modules/diamond/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/diamond/manifests/init.pp 
b/modules/diamond/manifests/init.pp
index 42e43c0..01a6c42 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -113,4 +113,10 @@
 }
 
 diamond::collector { 'Network': }
+
+diamond::collector { 'DiskUsage':
+settings = {
+devices   = 
'PhysicalDrive[0-9]+$|md[0-9]+$|sd[a-z]+$|x?vd[a-z]+$|disk[0-9]+$|dm-[0-9]+$',
+},
+}
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia7926fe30e125e74f3d147f47221741730f54860
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Chasemp chas...@gmail.com
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] graphite: increase relay queue size - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: increase relay queue size
..

graphite: increase relay queue size

with increased statsd capacity the relay queue is filling up

Bug: T92965
Change-Id: I0bda8cbacbeb195140560dc0bc41ec3fca4c3e23
---
M manifests/role/graphite.pp
1 file changed, 1 insertion(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/44/197344/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index c915936..4fce5df 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -146,6 +146,7 @@
 udp_receiver_interface= '0.0.0.0',
 enable_udp_listener   = true,
 relay_method  = 'consistent-hashing',
+max_queue_size= '50',
 destinations  = [
 '127.0.0.1:2104:a',
 '127.0.0.1:2204:b',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0bda8cbacbeb195140560dc0bc41ec3fca4c3e23
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] graphite: increase relay queue size - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: graphite: increase relay queue size
..


graphite: increase relay queue size

with increased statsd capacity the relay queue is filling up

Bug: T92965
Change-Id: I0bda8cbacbeb195140560dc0bc41ec3fca4c3e23
---
M manifests/role/graphite.pp
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index c915936..4fce5df 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -146,6 +146,7 @@
 udp_receiver_interface= '0.0.0.0',
 enable_udp_listener   = true,
 relay_method  = 'consistent-hashing',
+max_queue_size= '50',
 destinations  = [
 '127.0.0.1:2104:a',
 '127.0.0.1:2204:b',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0bda8cbacbeb195140560dc0bc41ec3fca4c3e23
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] restbase: restbase1006 back in service - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: restbase: restbase1006 back in service
..

restbase: restbase1006 back in service

This reverts commit 8532fb8af0dc17fe1f81d4e43dfa61fee9207391.

Change-Id: I7ee7fa1c7524b6e3a3a24b6149a52edcce05d59d
---
M hieradata/role/common/restbase.yaml
1 file changed, 2 insertions(+), 0 deletions(-)


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

diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 336151f..4fb1557 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -7,6 +7,7 @@
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1006.eqiad.wmnet
 cassandra::max_heap_size: 8g
 cassandra::heap_newsize: 1200m
 
@@ -19,6 +20,7 @@
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1006.eqiad.wmnet
 restbase::logstash_host: logstash1001.eqiad.wmnet
 restbase::cassandra_defaultConsistency: localQuorum
 restbase::cassandra_localDc: %{::site}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ee7fa1c7524b6e3a3a24b6149a52edcce05d59d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] restbase: restbase1006 back in service - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: restbase: restbase1006 back in service
..


restbase: restbase1006 back in service

This reverts commit 8532fb8af0dc17fe1f81d4e43dfa61fee9207391.

Change-Id: I7ee7fa1c7524b6e3a3a24b6149a52edcce05d59d
---
M hieradata/role/common/restbase.yaml
1 file changed, 2 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/role/common/restbase.yaml 
b/hieradata/role/common/restbase.yaml
index 336151f..4fb1557 100644
--- a/hieradata/role/common/restbase.yaml
+++ b/hieradata/role/common/restbase.yaml
@@ -7,6 +7,7 @@
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1006.eqiad.wmnet
 cassandra::max_heap_size: 8g
 cassandra::heap_newsize: 1200m
 
@@ -19,6 +20,7 @@
 - restbase1003.eqiad.wmnet
 - restbase1004.eqiad.wmnet
 - restbase1005.eqiad.wmnet
+- restbase1006.eqiad.wmnet
 restbase::logstash_host: logstash1001.eqiad.wmnet
 restbase::cassandra_defaultConsistency: localQuorum
 restbase::cassandra_localDc: %{::site}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7ee7fa1c7524b6e3a3a24b6149a52edcce05d59d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] swift: provision ms-be101[678] - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift: provision ms-be101[678]
..


swift: provision ms-be101[678]

HP machines have different disk ordering unfortunately as discovered in T90922,
thus duplicate/split site.pp entries and d-i preseed to accomodate that. The
swift ring will be also changed accordingly.

Bug: T90922
Change-Id: I45ad8699bf5f6b7cd17e646137c4e0bb3ff57bb2
---
M manifests/site.pp
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
3 files changed, 85 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/site.pp b/manifests/site.pp
index 98f3904..7be6c5a 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1805,7 +1805,7 @@
 include role::diamond
 }
 
-node /^ms-be10[0-9][0-9]\.eqiad\.wmnet$/ {
+node /^ms-be10(0[0-9]|1[0-5])\.eqiad\.wmnet$/ {
 $all_drives = [
 '/dev/sda', '/dev/sdb', '/dev/sdc', '/dev/sdd',
 '/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
@@ -1822,6 +1822,24 @@
 swift::mount_filesystem{ '/dev/sdn3': }
 }
 
+# HP machines have different disk ordering T90922
+node /^ms-be101[678]\.eqiad\.wmnet$/ {
+$all_drives = [
+'/dev/sdm', '/dev/sdn', '/dev/sdc', '/dev/sdd',
+'/dev/sde', '/dev/sdf', '/dev/sdg', '/dev/sdh',
+'/dev/sdi', '/dev/sdj', '/dev/sdk', '/dev/sdl'
+   ]
+
+role swift::eqiad_prod::storage
+
+swift::create_filesystem{ $all_drives: partition_nr = '1' }
+# these are already partitioned and xfs formatted by the installer
+swift::label_filesystem{ '/dev/sda3': }
+swift::label_filesystem{ '/dev/sdb3': }
+swift::mount_filesystem{ '/dev/sda3': }
+swift::mount_filesystem{ '/dev/sdb3': }
+}
+
 node /^ms-fe300[1-2]\.esams\.wmnet$/ {
 role swift::esams_prod::proxy
 }
diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index 3d2744a..ed38f60 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -71,7 +71,9 @@
 #  sodium) echo partman/mailserver.cfg ;; \
mc[1-9]*) echo partman/mc.cfg ;; \
ms-fe[1-2]0[0-9][0-9]) echo partman/raid1-1partition.cfg ;; \
-   ms-be[1-2]0[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be20[0-9][0-9]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be100[0-9]|ms-be101[0-5]) echo partman/ms-be-eqiad.cfg ;; \
+   ms-be101[678]) echo partman/ms-be-eqiad-hp.cfg ;; \
ms-fe30[0-9][0-9]) echo partman/flat.cfg ;; \
ms-be30[0-9][0-9]) echo partman/ms-be-esams.cfg ;; \
mw[0-9]*|osmium|rcs[0-9]*) echo partman/mw.cfg ;; \
diff --git 
a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg 
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
new file mode 100644
index 000..65c03ed
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
@@ -0,0 +1,63 @@
+# Automatic software RAID partitioning
+#
+# * two disks, sda  sdb (SSD)
+# * primary partitions, no LVM
+# * layout:
+#   - /  : ext3, RAID1, 60GB
+#   - swap: RAID1, 1GB
+#   - the rest of each respective disk (no RAID) formatted as xfs, unmounted
+
+d-ipartman-auto/method string  raid
+
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb
+d-igrub-installer/bootdev  string  /dev/sda /dev/sdb
+
+# this workarounds LP #1012629 / Debian #666974
+# it makes grub-installer to jump to step 2, where it uses bootdev
+d-igrub-installer/only_debian  boolean false
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   multiraid ::\
+   3   80003   raid\
+   $primary{ } method{ raid }  \
+   .   \
+   100010001000raid\
+   $primary{ } method{ raid }  \
+   .   \
+   6   500 12  xfs \
+   $primary{ } method{ format }\
+   format{ } use_filesystem{ } \
+   filesystem{ xfs }   \
+   . \
+   3   1   -1  raid\
+   $primary{ } method{ raid }  \
+   .
+
+# Parameters are:
+# raidtype devcount sparecount fstype mountpoint \

[MediaWiki-commits] [Gerrit] install-server: upgrade kernel on swift HP machines - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install-server: upgrade kernel on swift HP machines
..

install-server: upgrade kernel on swift HP machines

the raid controller needs a newer kernel which trusty doesn't ship by default
(the installer we use however does, so installation works)

Bug: T90922
Change-Id: Ica0aa7238b22a1883c49a30476343c77e0c7b0a1
---
M modules/install-server/files/autoinstall/scripts/late_command
1 file changed, 10 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/27/198227/1

diff --git a/modules/install-server/files/autoinstall/scripts/late_command 
b/modules/install-server/files/autoinstall/scripts/late_command
index af3e609..07b46a1 100644
--- a/modules/install-server/files/autoinstall/scripts/late_command
+++ b/modules/install-server/files/autoinstall/scripts/late_command
@@ -38,5 +38,14 @@
apt-install linux-image-3.19
mke2fs -F -F -t ext4 -T huge -m 0 -L sda3-varnish /dev/sda3
mke2fs -F -F -t ext4 -T huge -m 0 -L sdb3-varnish /dev/sdb3
-   ;; \
+   ;;
+   # upgrade kernel on HP swift machines, raid controller is not 
recognized by
+   # trusty' stock kernel
+   ms-be101[678])
+   mount -t sysfs none /target/sys
+   mount -t proc none /target/proc
+   chroot /target apt-get -y install linux-image-generic
+   umount /target/sys
+   umount /target/proc
+   ;;
 esac

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica0aa7238b22a1883c49a30476343c77e0c7b0a1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swift: fix typo in label_filesystem - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: fix typo in label_filesystem
..

swift: fix typo in label_filesystem

Change-Id: I7cf5892a39d4fa7f35accf2d8a76bc02d7ced710
---
M manifests/swift.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/26/198226/1

diff --git a/manifests/swift.pp b/manifests/swift.pp
index 7b2efbb..d77dbd1 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -469,6 +469,6 @@
 
 $label = swift-${dev_suffix}
 exec { /usr/sbin/xfs_admin -L ${label} ${device}:
-onlyif = /usr/bin/test $(/bin/mount | /bin/grep ${device} 
|/usr/bin/wc -l) -eq 0  /usr/b in/test $(/usr/sbin/grub-probe -t fs -d 
${device}) = 'xfs'  /usr/bin/test $(/usr/sbin/xfs_admin -l ${device} 
|/bin/grep swift | /usr/bin/wc -l) -eq 0
+onlyif = /usr/bin/test $(/bin/mount | /bin/grep ${device} 
|/usr/bin/wc -l) -eq 0  /usr/bin/test $(/usr/sbin/grub-probe -t fs -d 
${device}) = 'xfs'  /usr/bin/test $(/usr/sbin/xfs_admin -l ${device} 
|/bin/grep swift | /usr/bin/wc -l) -eq 0
 }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cf5892a39d4fa7f35accf2d8a76bc02d7ced710
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swift: update partman allocation for HP - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: update partman allocation for HP
..

swift: update partman allocation for HP

HP machines have bigger SSDs so adjust the size accordingly to match what's
existing for dell

Bug: T90922
Change-Id: I6cadd408af1762a5aa330ff6d29d91dad06675f8
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/22/198222/1

diff --git 
a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg 
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
index 65c03ed..d28499d 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
@@ -22,13 +22,13 @@
 # Define physical partitions
 d-ipartman-auto/expert_recipe  string  \
multiraid ::\
-   3   80003   raid\
+   6   80006   raid\
$primary{ } method{ raid }  \
.   \
100010001000raid\
$primary{ } method{ raid }  \
.   \
-   6   500 12  xfs \
+   10  500 12  xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs }   \

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6cadd408af1762a5aa330ff6d29d91dad06675f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swift: update partman allocation for HP - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift: update partman allocation for HP
..


swift: update partman allocation for HP

HP machines have bigger SSDs so adjust the size accordingly to match what's
existing for dell

Bug: T90922
Change-Id: I6cadd408af1762a5aa330ff6d29d91dad06675f8
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git 
a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg 
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
index 65c03ed..d28499d 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad-hp.cfg
@@ -22,13 +22,13 @@
 # Define physical partitions
 d-ipartman-auto/expert_recipe  string  \
multiraid ::\
-   3   80003   raid\
+   6   80006   raid\
$primary{ } method{ raid }  \
.   \
100010001000raid\
$primary{ } method{ raid }  \
.   \
-   6   500 12  xfs \
+   10  500 12  xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs }   \

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6cadd408af1762a5aa330ff6d29d91dad06675f8
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] swift: fix typo in label_filesystem - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift: fix typo in label_filesystem
..


swift: fix typo in label_filesystem

Change-Id: I7cf5892a39d4fa7f35accf2d8a76bc02d7ced710
---
M manifests/swift.pp
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/swift.pp b/manifests/swift.pp
index 7b2efbb..d77dbd1 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -469,6 +469,6 @@
 
 $label = swift-${dev_suffix}
 exec { /usr/sbin/xfs_admin -L ${label} ${device}:
-onlyif = /usr/bin/test $(/bin/mount | /bin/grep ${device} 
|/usr/bin/wc -l) -eq 0  /usr/b in/test $(/usr/sbin/grub-probe -t fs -d 
${device}) = 'xfs'  /usr/bin/test $(/usr/sbin/xfs_admin -l ${device} 
|/bin/grep swift | /usr/bin/wc -l) -eq 0
+onlyif = /usr/bin/test $(/bin/mount | /bin/grep ${device} 
|/usr/bin/wc -l) -eq 0  /usr/bin/test $(/usr/sbin/grub-probe -t fs -d 
${device}) = 'xfs'  /usr/bin/test $(/usr/sbin/xfs_admin -l ${device} 
|/bin/grep swift | /usr/bin/wc -l) -eq 0
 }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7cf5892a39d4fa7f35accf2d8a76bc02d7ced710
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] graphite: add error alerts - change (operations/puppet)

2015-03-19 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: graphite: add error alerts
..


graphite: add error alerts

provide alerts for error situations, e.g. queue dropping datapoints, too many
metric creations, file write errors

Bug: T92965
Change-Id: I0d3816e922bb749f0750d49299c56d0d2e34034c
---
M manifests/role/graphite.pp
A modules/graphite/manifests/monitoring/graphite.pp
2 files changed, 50 insertions(+), 0 deletions(-)

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



diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 4fce5df..315539f 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -228,6 +228,7 @@
 include ::eventlogging::monitoring::graphite
 include ::swift::monitoring::graphite
 include ::swift_new::monitoring::graphite
+include ::graphite::monitoring::graphite
 
 # Monitor production 5xx rates
 monitoring::graphite_threshold { 'reqstats_5xx':
diff --git a/modules/graphite/manifests/monitoring/graphite.pp 
b/modules/graphite/manifests/monitoring/graphite.pp
new file mode 100644
index 000..0d4da01
--- /dev/null
+++ b/modules/graphite/manifests/monitoring/graphite.pp
@@ -0,0 +1,49 @@
+# == Class: graphite::monitoring::graphite
+#
+# Monitor a graphite stack for important vitals, namely what it is interesting
+# if we are losing data and how much.
+# To that end, both carbon-relay (what accepts metrics from the outside) and
+# carbon-cache (what read/writes datapoints from/to disk) are monitored, e.g.
+# if there is any dropping of datapoints in their queues or errors otherwise.
+
+class graphite::monitoring::graphite {
+# is carbon-relay queue full? (i.e. dropping data)
+monitoring::graphite_threshold { 'carbon-relay_queue_full':
+description = 'carbon-relay queue full',
+metric  = 
'sumSeries(carbon.relays.graphite1001-*.destinations.*.fullQueueDrops)',
+from= '10minutes',
+warning = 200,
+critical= 1000,
+nagios_critical = false
+}
+
+# is carbon-cache able to write to disk (e.g. permissions)
+monitoring::graphite_threshold { 'carbon-cache_write_error':
+description = 'carbon-cache write error',
+metric  = 
'secondYAxis(sumSeries(carbon.agents.graphite1001-*.errors))',
+from= '10minutes',
+warning = 1,
+critical= 8,
+nagios_critical = false
+}
+
+# are carbon-cache queues overflowing their capacity?
+monitoring::graphite_threshold { 'carbon-cache_overflow':
+description = 'carbon-cache queues overflow',
+metric  = 
'secondYAxis(sumSeries(carbon.agents.graphite1001-*.cache.overflow))',
+from= '10minutes',
+warning = 1,
+critical= 8,
+nagios_critical = false
+}
+
+# are we creating too many metrics?
+monitoring::graphite_threshold { 'carbon-cache_many_creates':
+description = 'carbon-cache too many creates',
+metric  = 'sumSeries(carbon.agents.graphite1001-*.creates)',
+from= '1hour',
+warning = 500,
+critical= 1000,
+nagios_critical = false
+}
+}

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0d3816e922bb749f0750d49299c56d0d2e34034c
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Chasemp chas...@gmail.com
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] eqiad-prod: add ms-be101[678] - change (operations...swift-ring)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: eqiad-prod: add ms-be101[678]
..

eqiad-prod: add ms-be101[678]

add new HP machines to eqiad, since we are tight on space for objects the
initial weight is intentionally very low to see what effect it has on the rest
of the fleet. Next weights will likely be higher.

Bug: T1268
Change-Id: Ia5bee076a2110620f1c1c4a4221b8263c0553800
---
M eqiad-prod/account.builder
M eqiad-prod/account.dump
M eqiad-prod/account.ring.gz
M eqiad-prod/container.builder
M eqiad-prod/container.dump
M eqiad-prod/container.ring.gz
M eqiad-prod/object.builder
M eqiad-prod/object.dump
M eqiad-prod/object.ring.gz
9 files changed, 326 insertions(+), 284 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring 
refs/changes/56/198256/1


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia5bee076a2110620f1c1c4a4221b8263c0553800
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-ring
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Make deploy2graphite use mw-deployment-vars.sh - change (operations/puppet)

2015-03-20 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Make deploy2graphite use mw-deployment-vars.sh
..


Make deploy2graphite use mw-deployment-vars.sh

deploy2graphite was switched to use /etc/profile.d/mediawiki.sh in
Ibaa28d8, but that config file does not declare the $MW_STATSD_HOST and
$MW_STATSD_PORT variables needed by the script.
/usr/local/lib/mw-deployment-vars.sh is still provisioned by
::scap::scripts and includes the needed variables.

Bug: T1387
Change-Id: I58eeace9619ba1771e6b0cdc4bd748121ad59c2c
---
M modules/scap/files/deploy2graphite
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/scap/files/deploy2graphite 
b/modules/scap/files/deploy2graphite
index 7f6b259..4dead4a 100755
--- a/modules/scap/files/deploy2graphite
+++ b/modules/scap/files/deploy2graphite
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-. /etc/profile.d/mediawiki.sh
+. /usr/local/lib/mw-deployment-vars.sh
 
 usage() {
echo Usage: $0 deploy_type [deploy_duration_seconds]

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I58eeace9619ba1771e6b0cdc4bd748121ad59c2c
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Reedy re...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] gdash: fix carbon-relay dashboard - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: gdash: fix carbon-relay dashboard
..


gdash: fix carbon-relay dashboard

Change-Id: I7db75c882afe66e230e56df669346f4735ff7b6a
---
M files/gdash/dashboards/graphite/carbon_relay.graph
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/files/gdash/dashboards/graphite/carbon_relay.graph 
b/files/gdash/dashboards/graphite/carbon_relay.graph
index 159397d..047ad3b 100644
--- a/files/gdash/dashboards/graphite/carbon_relay.graph
+++ b/files/gdash/dashboards/graphite/carbon_relay.graph
@@ -2,8 +2,8 @@
 
 field :metrics_in,
:alias = metrics received,
-   :data  = sumSeries(carbon.relays.tungsten-*.metricsReceived)
+   :data  = 
sumSeries(carbon.relays.graphite1001-*.metricsReceived)
 
 field :queue_drops,
:alias = queue drops,
-   :data  = 
secondYAxis(sumSeries(carbon.relays.tungsten-*.destinations.*.fullQueueDrops))
+   :data  = 
secondYAxis(sumSeries(carbon.relays.graphite1001-*.destinations.*.fullQueueDrops))

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7db75c882afe66e230e56df669346f4735ff7b6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] graphite: add error alerts - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: add error alerts
..

graphite: add error alerts

provide alerts for error situations, e.g. queue dropping datapoints, too many
metric creations, file write errors

Bug: T92965
Change-Id: I0d3816e922bb749f0750d49299c56d0d2e34034c
---
M manifests/role/graphite.pp
A modules/graphite/manifests/monitoring/graphite.pp
2 files changed, 38 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/52/197352/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 4fce5df..315539f 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -228,6 +228,7 @@
 include ::eventlogging::monitoring::graphite
 include ::swift::monitoring::graphite
 include ::swift_new::monitoring::graphite
+include ::graphite::monitoring::graphite
 
 # Monitor production 5xx rates
 monitoring::graphite_threshold { 'reqstats_5xx':
diff --git a/modules/graphite/manifests/monitoring/graphite.pp 
b/modules/graphite/manifests/monitoring/graphite.pp
new file mode 100644
index 000..d4ef199
--- /dev/null
+++ b/modules/graphite/manifests/monitoring/graphite.pp
@@ -0,0 +1,37 @@
+class graphite::monitoring::graphite {
+monitoring::graphite_threshold { 'carbon-relay queue full':
+description = 'carbon-relay queue full',
+metric  = 
'sumSeries(carbon.relays.graphite1001-*.destinations.*.fullQueueDrops)',
+from= '10minutes',
+warning = 200,
+critical= 1000,
+nagios_critical = false
+}
+
+monitoring::graphite_threshold { 'carbon-cache write error':
+description = 'carbon-cache write error',
+metric  = 
'secondYAxis(sumSeries(carbon.agents.graphite1001-*.errors))',
+from= '10minutes',
+warning = 1,
+critical= 8,
+nagios_critical = false
+}
+
+monitoring::graphite_threshold { 'carbon-cache overflows':
+description = 'carbon-cache queues overflow',
+metric  = 
'secondYAxis(sumSeries(carbon.agents.graphite1001-*.cache.overflow))',
+from= '10minutes',
+warning = 1,
+critical= 8,
+nagios_critical = false
+}
+
+monitoring::graphite_threshold { 'carbon-cache creates':
+description = 'carbon-cache too many creates',
+metric  = 'sumSeries(carbon.agents.graphite1001-*.creates)',
+from= '1hour',
+warning = 200,
+critical= 1000,
+nagios_critical = false
+}
+}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d3816e922bb749f0750d49299c56d0d2e34034c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] gdash: fix carbon-relay dashboard - change (operations/puppet)

2015-03-17 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: gdash: fix carbon-relay dashboard
..

gdash: fix carbon-relay dashboard

Change-Id: I7db75c882afe66e230e56df669346f4735ff7b6a
---
M files/gdash/dashboards/graphite/carbon_relay.graph
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/51/197351/1

diff --git a/files/gdash/dashboards/graphite/carbon_relay.graph 
b/files/gdash/dashboards/graphite/carbon_relay.graph
index 159397d..047ad3b 100644
--- a/files/gdash/dashboards/graphite/carbon_relay.graph
+++ b/files/gdash/dashboards/graphite/carbon_relay.graph
@@ -2,8 +2,8 @@
 
 field :metrics_in,
:alias = metrics received,
-   :data  = sumSeries(carbon.relays.tungsten-*.metricsReceived)
+   :data  = 
sumSeries(carbon.relays.graphite1001-*.metricsReceived)
 
 field :queue_drops,
:alias = queue drops,
-   :data  = 
secondYAxis(sumSeries(carbon.relays.tungsten-*.destinations.*.fullQueueDrops))
+   :data  = 
secondYAxis(sumSeries(carbon.relays.graphite1001-*.destinations.*.fullQueueDrops))

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7db75c882afe66e230e56df669346f4735ff7b6a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add debian patches to upstream - change (operations...statsite)

2015-03-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: add debian patches to upstream
..


add debian patches to upstream

Bug: T90111
Change-Id: Ib2f6817ac714c7663adb2cca1b409dd38dc51cd3
---
A debian/patches/0001-add-missing-includes-from-ev.c.patch
A debian/patches/0002-dynamically-link-libev-if-available.patch
A debian/patches/0003-provide-libev-multiloop-support.patch
A debian/patches/series
4 files changed, 282 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/debian/patches/0001-add-missing-includes-from-ev.c.patch 
b/debian/patches/0001-add-missing-includes-from-ev.c.patch
new file mode 100644
index 000..232ec50
--- /dev/null
+++ b/debian/patches/0001-add-missing-includes-from-ev.c.patch
@@ -0,0 +1,25 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Wed, 25 Feb 2015 23:40:31 +
+Subject: add missing includes from ev.c
+
+if including only ev.h these headers are missing
+---
+ src/networking.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/networking.c b/src/networking.c
+index dabd2b8..20f720f 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -8,6 +8,11 @@
+ #include syslog.h
+ #include unistd.h
+ #include netdb.h
++#include string.h
++#include stdio.h
++#include stdlib.h
++#include errno.h
++#include assert.h
+ 
+ #include networking.h
+ #include conn_handler.h
diff --git a/debian/patches/0002-dynamically-link-libev-if-available.patch 
b/debian/patches/0002-dynamically-link-libev-if-available.patch
new file mode 100644
index 000..b0e0bee
--- /dev/null
+++ b/debian/patches/0002-dynamically-link-libev-if-available.patch
@@ -0,0 +1,57 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Wed, 25 Feb 2015 23:42:17 +
+Subject: dynamically link libev if available
+
+---
+ SConstruct   | 13 +++--
+ src/networking.c |  5 +
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 629880c..4bfeaac 100644
+--- a/SConstruct
 b/SConstruct
+@@ -6,8 +6,15 @@ murmur = envmurmur.Library('murmur', 
Glob(deps/murmurhash/*.c))
+ envinih = Environment(CPATH = ['deps/inih/'], CFLAGS=-O3)
+ inih = envinih.Library('inih', Glob(deps/inih/*.c))
+ 
+-env_statsite_with_err = Environment(CCFLAGS = '-g -std=c99 -D_GNU_SOURCE 
-Wall -Werror -Wstrict-aliasing=0 -O3 -pthread -Ideps/inih/ -Ideps/libev/ 
-Isrc/')
+-env_statsite_without_err = Environment(CCFLAGS = '-g -std=c99 -D_GNU_SOURCE 
-O3 -pthread -Ideps/inih/ -Ideps/libev/ -Isrc/')
++ccflags = '-g -std=c99 -D_GNU_SOURCE -O3 -pthread -Ideps/inih/ -Isrc/'
++
++conf_libev = Environment().Configure()
++libev = conf_libev.CheckLibWithHeader('ev', 'ev.h', 'c', autoadd=0)
++if not libev:
++   ccflags += ' -Ideps/libev/ -D_DEPS_LIBEV'
++
++env_statsite_with_err = Environment(CCFLAGS = ccflags + ' -Wall 
-Wstrict-aliasing=0 -Werror')
++env_statsite_without_err = Environment(CCFLAGS = ccflags)
+ 
+ objs = env_statsite_with_err.Object('src/hashmap', 'src/hashmap.c')   
+ \
+ env_statsite_with_err.Object('src/heap', 'src/heap.c')
+ \
+@@ -25,6 +32,8 @@ objs = env_statsite_with_err.Object('src/hashmap', 
'src/hashmap.c')   +
+ env_statsite_without_err.Object('src/conn_handler', 
'src/conn_handler.c')
+ 
+ statsite_libs = [m, pthread, murmur, inih]
++if libev:
++   statsite_libs.append(ev)
+ if platform.system() == 'Linux':
+statsite_libs.append(rt)
+ 
+diff --git a/src/networking.c b/src/networking.c
+index 20f720f..498d31d 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -32,7 +32,12 @@
+ #ifdef __MACH__
+ #define EV_USE_KQUEUE 1
+ #endif
++
++#ifdef _DEPS_LIBEV
+ #include ev.c
++#else
++#include ev.h
++#endif
+ 
+ /**
+  * Default listen backlog size for
diff --git a/debian/patches/0003-provide-libev-multiloop-support.patch 
b/debian/patches/0003-provide-libev-multiloop-support.patch
new file mode 100644
index 000..c3505d0
--- /dev/null
+++ b/debian/patches/0003-provide-libev-multiloop-support.patch
@@ -0,0 +1,197 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Thu, 26 Feb 2015 12:59:28 +
+Subject: provide libev multiloop support
+
+---
+ src/networking.c | 49 +
+ 1 file changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/src/networking.c b/src/networking.c
+index 498d31d..8625375 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -21,9 +21,7 @@
+ #define MAX_PORT_LEN 6
+ 
+ #define EV_STANDALONE 1
+-#define EV_API_STATIC 1
+ #define EV_COMPAT3 0
+-#define EV_MULTIPLICITY 0
+ #define EV_USE_MONOTONIC 1
+ #ifdef __linux__
+ #define EV_USE_CLOCK_SYSCALL 0
+@@ -34,8 +32,11 @@
+ #endif
+ 
+ #ifdef _DEPS_LIBEV
++#define EV_MULTIPLICITY 0
++#define EV_API_STATIC 1
+ #include ev.c
+ #else
++#define EV_MULTIPLICITY 1
+ #include ev.h
+ #endif
+ 
+@@ -108,10 +109,10 @@ struct

[MediaWiki-commits] [Gerrit] import debian directory - change (operations...statsite)

2015-03-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: import debian directory
..


import debian directory

Bug: T90111
Change-Id: I25aa4f2e456a8f05455e6c34c511a77c83b77541
---
A debian/README.source
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/install
A debian/postinst
A debian/rules
A debian/source/format
A debian/statsite.ini
A debian/statsite.init
A debian/statsite.service
A debian/statsite.upstart
14 files changed, 267 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..eb0c9f1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+statsite for Debian
+---
+
+bundled dependencies check and libev have been removed from deps/ and Debian's
+packages are used instead during build.
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Wed, 25 Feb 2015 10:30:54 +
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..cb0c3ee
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+statsite (0.7.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #778731)
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Wed, 25 Feb 2015 10:30:54 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..e30a997
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: statsite
+Section: utils
+Priority: optional
+Maintainer: Filippo Giunchedi fili...@wikimedia.org
+Build-Depends: debhelper (= 9), dh-systemd, scons, check, libev-dev
+Standards-Version: 3.9.5
+Homepage: https://github.com/armon/statsite
+#Vcs-Git: git://anonscm.debian.org/collab-maint/statsite.git
+#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/statsite.git;a=summary
+
+Package: statsite
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Recommends: python
+Description: metrics aggregation server
+ Statsite is designed to be both highly performant,
+ and very flexible. To achieve this, it implements the stats
+ collection and aggregation in pure C, using libev to be
+ extremely fast.
+ .
+ This allows it to handle hundreds of connections,
+ and millions of metrics.
+ .
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..da10586
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: statsite
+Source: https://github.com/armon/statsite
+
+Files: *
+Copyright: 2012 Armon Dadgar
+License: BSD-3-clause
+
+Files: deps/murmurhash/*
+Copyright: Austin Appleby
+License: Public Domain
+
+Files: deps/inih/*
+Copyright: 2009 Brush Technology
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2015 Filippo Giunchedi
+   2015 Wikimedia Foundation
+License: BSD-3-clause
+
+License: BSD-3-clause
+  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 organization 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 HOLDERS AND 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.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/install b/debian/install
new file mode 100644
index 000..402bbf2
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,3 @@
+statsite /usr/bin
+sinks /usr/lib/statsite/

[MediaWiki-commits] [Gerrit] import upstream 0.7.0 - change (operations...statsite)

2015-03-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: import upstream 0.7.0
..


import upstream 0.7.0

no check, no libev

Bug: T90111
Change-Id: Ib07035e8c4381093e64bb570051bdc96cef02012
---
A .gitignore
A .travis.yml
A CHANGELOG.md
A LICENSE
A Makefile
A README.md
A SConstruct
A Vagrantfile
A bench.py
A bench_bin.py
A deps/inih/LICENSE.txt
A deps/inih/README.txt
A deps/inih/ini.c
A deps/inih/ini.h
A deps/murmurhash/MurmurHash3.c
A deps/murmurhash/MurmurHash3.h
A integ/__init__.py
A integ/test_binary.py
A integ/test_binary_stream.py
A integ/test_extended_counters.py
A integ/test_integ.py
A integ/test_librato.py
A integ/test_stdin.py
A rpm/statsite.conf.example
A rpm/statsite.initscript
A rpm/statsite.spec
A sinks/__init__.py
A sinks/binary_sink.py
A sinks/gmetric.py
A sinks/graphite.py
A sinks/influxdb.py
A sinks/librato.py
A sinks/statsite_json_sink.rb
A src/cm_quantile.c
A src/cm_quantile.h
A src/config.c
A src/config.h
A src/conn_handler.c
A src/conn_handler.h
A src/counter.c
A src/counter.h
A src/hashmap.c
A src/hashmap.h
A src/heap.c
A src/heap.h
A src/hll.c
A src/hll.h
A src/hll_constants.c
A src/hll_constants.h
A src/metrics.c
A src/metrics.h
A src/networking.c
A src/networking.h
A src/radix.c
A src/radix.h
A src/set.c
A src/set.h
A src/statsite.c
A src/streaming.c
A src/streaming.h
A src/timer.c
A src/timer.h
A tests/runner.c
A tests/test_cm_quantile.c
A tests/test_config.c
A tests/test_counter.c
A tests/test_hashmap.c
A tests/test_heap.c
A tests/test_hll.c
A tests/test_metrics.c
A tests/test_radix.c
A tests/test_set.c
A tests/test_streaming.c
A tests/test_timer.c
74 files changed, 12,186 insertions(+), 0 deletions(-)

Approvals:
  Ori.livneh: Looks good to me, but someone else must approve
  Filippo Giunchedi: Verified; Looks good to me, approved
  Rush: Looks good to me, but someone else must approve




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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib07035e8c4381093e64bb570051bdc96cef02012
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/statsite
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] update cassandra submodule - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: update cassandra submodule
..

update cassandra submodule

Change-Id: I15964f034a5c727827f5e3d6bbef2f5422b3c86b
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/85/199585/1

diff --git a/modules/cassandra b/modules/cassandra
index 65fde18..fe345a7 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit 65fde188705cb1f3306777a93047723042386690
+Subproject commit fe345a76ed988c6dbf2d4f54baa4f17d03d5e6cc

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I15964f034a5c727827f5e3d6bbef2f5422b3c86b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] send additional metrics to graphite - change (operations...cassandra)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: send additional metrics to graphite
..


send additional metrics to graphite

There are a number of additional metrics available, beyond what is contained
in the sample configuration.  Some of these (column family-specific metrics
for example), will be particularly valuable.

Bug: T78514
Change-Id: I71c7b3c0c9a9d2b64a9386ec087b32d9bf6bca91
---
M templates/metrics.yaml.erb
1 file changed, 6 insertions(+), 0 deletions(-)

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



diff --git a/templates/metrics.yaml.erb b/templates/metrics.yaml.erb
index 8c4f323..ded831d 100644
--- a/templates/metrics.yaml.erb
+++ b/templates/metrics.yaml.erb
@@ -12,6 +12,12 @@
   patterns:
 - ^org.apache.cassandra.metrics.Cache.+
 - ^org.apache.cassandra.metrics.ClientRequest.+
+- ^org.apache.cassandra.metrics.ColumnFamily.+
+- ^org.apache.cassandra.metrics.Connection.+
+- ^org.apache.cassandra.metrics.CQL.+
+- ^org.apache.cassandra.metrics.DroppedMessage.+
+- ^org.apache.cassandra.metrics.FileCache.+
+- ^org.apache.cassandra.metrics.IndexColumnFamily.+
 - ^org.apache.cassandra.metrics.Storage.+
 - ^org.apache.cassandra.metrics.ThreadPools.+
 - ^org.apache.cassandra.metrics.Compaction.+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I71c7b3c0c9a9d2b64a9386ec087b32d9bf6bca91
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: Eevans eev...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] update cassandra submodule - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: update cassandra submodule
..


update cassandra submodule

Change-Id: I15964f034a5c727827f5e3d6bbef2f5422b3c86b
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/cassandra b/modules/cassandra
index 65fde18..fe345a7 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit 65fde188705cb1f3306777a93047723042386690
+Subproject commit fe345a76ed988c6dbf2d4f54baa4f17d03d5e6cc

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I15964f034a5c727827f5e3d6bbef2f5422b3c86b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] swift_new: lint and resource quoting - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: swift_new: lint and resource quoting
..


swift_new: lint and resource quoting

bug: T91908
Change-Id: Icd9b640f98cb4a71d85344ac0ef2586b5eac8904
---
M modules/swift_new/manifests/container_sync.pp
M modules/swift_new/manifests/init.pp
M modules/swift_new/manifests/monitoring/graphite.pp
M modules/swift_new/manifests/mount_filesystem.pp
M modules/swift_new/manifests/params.pp
M modules/swift_new/manifests/proxy.pp
M modules/swift_new/manifests/ring.pp
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/storage.pp
9 files changed, 36 insertions(+), 35 deletions(-)

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



diff --git a/modules/swift_new/manifests/container_sync.pp 
b/modules/swift_new/manifests/container_sync.pp
index f9622f6..e090099 100644
--- a/modules/swift_new/manifests/container_sync.pp
+++ b/modules/swift_new/manifests/container_sync.pp
@@ -1,6 +1,6 @@
 class swift_new::container_sync (
-  $replication_accounts = $::swift_new::params::replication_accounts,
-  $replication_keys = $::swift_new::params::replication_keys,
+$replication_accounts = $::swift_new::params::replication_accounts,
+$replication_keys = $::swift_new::params::replication_keys,
 ) {
 file { '/etc/swift/container-sync-realms.conf':
 ensure  = present,
diff --git a/modules/swift_new/manifests/init.pp 
b/modules/swift_new/manifests/init.pp
index 121dbe3..19ba756 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift_new/manifests/init.pp
@@ -39,7 +39,7 @@
 'python-swiftclient',
 'parted',
 ]:
-ensure = 'present',
+ensure = present,
 }
 
 require_package('python-statsd')
@@ -51,7 +51,7 @@
 }
 
 file { '/etc/swift':
-ensure  = 'directory',
+ensure  = directory,
 require = Package['swift'],
 recurse = true,
 }
@@ -63,7 +63,7 @@
 }
 
 file { '/var/cache/swift':
-ensure  = 'directory',
+ensure  = directory,
 require = Package['swift'],
 mode= '0755',
 }
diff --git a/modules/swift_new/manifests/monitoring/graphite.pp 
b/modules/swift_new/manifests/monitoring/graphite.pp
index 1c875c8..2b7460c 100644
--- a/modules/swift_new/manifests/monitoring/graphite.pp
+++ b/modules/swift_new/manifests/monitoring/graphite.pp
@@ -8,7 +8,7 @@
 warning = 95,
 critical= 90,
 under   = true,
-nagios_critical = false
+nagios_critical = false,
 }
 
 monitoring::graphite_threshold { 
swift_${swift_cluster_dispersion_container}:
@@ -18,6 +18,6 @@
 warning = 92,
 critical= 88,
 under   = true,
-nagios_critical = false
+nagios_critical = false,
 }
 }
diff --git a/modules/swift_new/manifests/mount_filesystem.pp 
b/modules/swift_new/manifests/mount_filesystem.pp
index 66235f0..c169e35 100644
--- a/modules/swift_new/manifests/mount_filesystem.pp
+++ b/modules/swift_new/manifests/mount_filesystem.pp
@@ -6,7 +6,7 @@
 $mount_point = ${mount_base}/${dev_suffix}
 
 file { mountpoint-${mount_point}:
-ensure = 'directory',
+ensure = directory,
 path   = $mount_point,
 owner  = 'swift',
 group  = 'swift',
@@ -19,7 +19,7 @@
 # We don't want puppet to keep the FS mounted, otherwise
 # it would conflict with swift-drive-auditor trying to keep FS
 # unmounted.
-ensure   = 'present',
+ensure   = present,
 device   = LABEL=swift-${dev_suffix},
 name = $mount_point,
 fstype   = 'xfs',
diff --git a/modules/swift_new/manifests/params.pp 
b/modules/swift_new/manifests/params.pp
index c41c6f7..e8f1ef5 100644
--- a/modules/swift_new/manifests/params.pp
+++ b/modules/swift_new/manifests/params.pp
@@ -1,10 +1,10 @@
 class swift_new::params (
-  $swift_cluster = undef,
-  $accounts = {},
-  $account_keys = {},
-  $replication_accounts = {},
-  $replication_keys = {},
-  $graphite_host = 'graphite-in.eqiad.wmnet',
+$swift_cluster= undef,
+$accounts = {},
+$account_keys = {},
+$replication_accounts = {},
+$replication_keys = {},
+$graphite_host= 'graphite-in.eqiad.wmnet',
 ) {
 # Noop class
 }
diff --git a/modules/swift_new/manifests/proxy.pp 
b/modules/swift_new/manifests/proxy.pp
index ff91efe..eee4136 100644
--- a/modules/swift_new/manifests/proxy.pp
+++ b/modules/swift_new/manifests/proxy.pp
@@ -18,7 +18,7 @@
 'swift-proxy',
 'python-swauth',
 ]:
-ensure = 'present',
+ensure = present,
 }
 
 file { '/etc/swift/proxy-server.conf':
diff --git a/modules/swift_new/manifests/ring.pp

[MediaWiki-commits] [Gerrit] graphite: enable locking writes - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: enable locking writes
..

graphite: enable locking writes

our graphite clustering plan involves using carbonate while carbon-cache is
running, this can potentially lead to corrupted whisper files if locking isn't
used, see also https://github.com/jssjr/carbonate/issues/19

Bug: T86316
Change-Id: I76b064acf3b7ccad17313a4f05c3b72b3b01b798
---
M manifests/role/graphite.pp
M modules/graphite/manifests/init.pp
2 files changed, 3 insertions(+), 0 deletions(-)


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

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 315539f..cc8fd96 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -161,6 +161,7 @@
 },
 
 storage_dir = $carbon_storage_dir,
+whisper_lock_writes = true,
 }
 
 class { '::graphite::web':
diff --git a/modules/graphite/manifests/init.pp 
b/modules/graphite/manifests/init.pp
index f60fbb1..ad00d1f 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -13,6 +13,7 @@
 $storage_schemas,
 $storage_aggregation = {},
 $storage_dir = '/var/lib/carbon',
+$whisper_lock_writes = false,
 ) {
 package { ['graphite-carbon', 'python-whisper']: }
 
@@ -30,6 +31,7 @@
 log_cache_hits   = false,
 log_cache_queue_sorts= false,
 log_listener_connections = false,
+whisper_lock_writes  = $whisper_lock_writes,
 user = undef,  # Don't suid; Upstart will do it 
for us.
 conf_dir = '/etc/carbon',
 log_dir  = '/var/log/carbon',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b064acf3b7ccad17313a4f05c3b72b3b01b798
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] scap: improve deploy2graphite - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: scap: improve deploy2graphite
..

scap: improve deploy2graphite

mostly cleaner/saner shell

Bug: T1387
Change-Id: Ice7e95f963b78386189ada37ba88838735fb82d3
---
M modules/scap/files/deploy2graphite
1 file changed, 33 insertions(+), 20 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/57/199857/1

diff --git a/modules/scap/files/deploy2graphite 
b/modules/scap/files/deploy2graphite
index 4dead4a..9895b76 100755
--- a/modules/scap/files/deploy2graphite
+++ b/modules/scap/files/deploy2graphite
@@ -1,28 +1,41 @@
-#! /bin/bash
+#!/bin/bash
+
+set -e
+set -u
 
 . /usr/local/lib/mw-deployment-vars.sh
 
+me=$(readlink -f $0)
+deploy_type=${1:-}
+deploy_duration=${2:-}
+dry_run=${DOLOGMSGNOLOG:+no}
+
 usage() {
-   echo Usage: $0 deploy_type [deploy_duration_seconds]
-   echo $0 will log an entry at graphite.wikimedia.org indicating that a
-   echo  deploy event of the type indicated has occurred.
-   echo  Expected deploy events include sync-common, sync-file, scap, 
etc.
-   echo  These messages can be suppressed by setting an environment 
variable $DOLOGMSGNOLOG.
-   echo 
-   echo   IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
-   echo 
-   exit
+echo Usage: $me deploy_type [deploy_duration_seconds]
+echo $me will log an entry at graphite.wikimedia.org indicating that a
+echo  deploy event of the type indicated has occurred.
+echo  Expected deploy events include sync-common, sync-file, scap, etc.
+echo  These messages can be suppressed by setting an environment variable 
\$DOLOGMSGNOLOG.
+echo 
+echo   IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
+echo 
+exit
 }
 
-[ ${1/-h} != $1 ]  usage
+statsd_send() {
+echo $1 | nc -w1 -q0 -u $MW_STATSD_HOST $MW_STATSD_PORT
+}
 
-if [ -z $DOLOGMSGNOLOG ]; then
-   if [ $1 ] ; then
-   utime=$(date +%s)
-   echo deploy.${1}:1|c | nc -w1 -q0 -u $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   echo deploy.all:1|c | nc -w1 -q0 -u $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   test -n $2  echo deploy.${1}.timing:${2}000|ms | nc -w1 
-q0 -u $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
-   else
-   usage
-   fi
+if [ $deploy_type = -h ] || [ $deploy_type =  ]; then
+usage
+fi
+
+if [ $dry_run != no ]; then
+exit 0
+fi
+
+statsd_send deploy.${deploy_type}:1|c || true
+statsd_send deploy.all:1|c || true
+if [ -n $deploy_duration ]; then
+statsd_send deploy.${deploy_type}.timing:${deploy_duration}000|ms || true
 fi

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ice7e95f963b78386189ada37ba88838735fb82d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Apertium: Install needed language pairs for CX - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Apertium: Install needed language pairs for CX
..


Apertium: Install needed language pairs for CX

Also install apertium-nob, apertium-nno.

Change-Id: I0413fac3d112c3d549924a4ad94603e12180bfb0
---
M modules/apertium/manifests/init.pp
1 file changed, 10 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/apertium/manifests/init.pp 
b/modules/apertium/manifests/init.pp
index 7e7245d..222fd6c 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -6,14 +6,23 @@
 class apertium(){
 package { [
 'apertium',
+'apertium-af-nl',
 'apertium-apy',
 'apertium-en-ca',
-'apertium-eo-en',
 'apertium-en-es',
+'apertium-eo-en',
 'apertium-es-ca',
 'apertium-es-pt',
+'apertium-hbs',
+'apertium-hbs-eng',
+'apertium-hbs-mkd',
+'apertium-hbs-slv',
 'apertium-id-ms',
+'apertium-mk-bg',
+'apertium-mkd',
+'apertium-nno',
 'apertium-nno-nob',
+'apertium-nob',
 'apertium-pt-ca',
 'apertium-sv-da',
 'apertium-lex-tools',

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I0413fac3d112c3d549924a4ad94603e12180bfb0
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Beta: Add missing 'af' and 'az' - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Beta: Add missing 'af' and 'az'
..


Beta: Add missing 'af' and 'az'

Also sort languages alphabetically.

Change-Id: I78e78b55e820d49618743d7b05312f0d1ab0a50b
---
M hieradata/labs/deployment-prep/common.yaml
1 file changed, 5 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 4ed1bb5..061250c 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -37,6 +37,7 @@
 cxserver::registry:
   source:
 - 'af'
+- 'az'
 - 'bg'
 - 'ca'
 - 'da'
@@ -44,8 +45,8 @@
 - 'en'
 - 'eo'
 - 'es'
-- 'hy'
 - 'fr'
+- 'hy'
 - 'id'
 - 'it'
 - 'kk'
@@ -72,14 +73,15 @@
 - 'xh'
 - 'zh'
   target:
+- 'af'
 - 'az'
 - 'bg'
 - 'ca'
 - 'da'
 - 'de'
-- 'fr'
 - 'eo'
 - 'es'
+- 'fr'
 - 'hy'
 - 'id'
 - 'it'
@@ -134,8 +136,8 @@
   'mk':
 - 'bg'
   'pt':
-- 'es'
 - 'ca'
+- 'es'
   'sh':
 - 'sl'
   'sl':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I78e78b55e820d49618743d7b05312f0d1ab0a50b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] zuul: update zuul-merger init info - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: zuul: update zuul-merger init info
..


zuul: update zuul-merger init info

The zuul-merger init script got copy pasted from the zuul one but I
forgot to update the init info in the top level comments.

Spotted by Filippo Giunchedi while reviewing the Zuul Debian packaging
work.

Change-Id: Ifd0fc0a40e57658c8e4b773f71a31d5512768ff7
---
M modules/zuul/files/zuul-merger.init
1 file changed, 2 insertions(+), 2 deletions(-)

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



diff --git a/modules/zuul/files/zuul-merger.init 
b/modules/zuul/files/zuul-merger.init
index f1e442f..f8470a5 100755
--- a/modules/zuul/files/zuul-merger.init
+++ b/modules/zuul/files/zuul-merger.init
@@ -1,11 +1,11 @@
 #! /bin/sh
 ### BEGIN INIT INFO
-# Provides:  zuul
+# Provides:  zuul-merger
 # Required-Start:$remote_fs $syslog
 # Required-Stop: $remote_fs $syslog
 # Default-Start: 2 3 4 5
 # Default-Stop:  0 1 6
-# Short-Description: Zuul
+# Short-Description: Zuul Merger
 # Description:   Trunk gating system
 ### END INIT INFO
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifd0fc0a40e57658c8e4b773f71a31d5512768ff7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] contint: migrate to require_package() - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: contint: migrate to require_package()
..


contint: migrate to require_package()

We have a few package definition conflicts in the contint module which
were previously handled with:

if ! defined ( Package['openjdk-6-jdk'] ) {
package { 'openjdk-6-jdk': ensure = present }
}

Switch to require_package instead ie:

require_package('openjdk-6-jdk')

Change-Id: Ib99ad3026efca924b5fabe4aa8a1333a683b63cf
---
M modules/contint/manifests/packages.pp
M modules/contint/manifests/publish-console.pp
2 files changed, 5 insertions(+), 17 deletions(-)

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



diff --git a/modules/contint/manifests/packages.pp 
b/modules/contint/manifests/packages.pp
index 5b3ed0b..7ff37a5 100644
--- a/modules/contint/manifests/packages.pp
+++ b/modules/contint/manifests/packages.pp
@@ -22,12 +22,8 @@
 # applications.
 # (openjdk is the default distribution for the java define.
 # The java define is found in modules/java/manifests/init.pp )
-if ! defined ( Package['openjdk-6-jdk'] ) {
-package { 'openjdk-6-jdk': ensure = present }
-}
-if ! defined ( Package['openjdk-7-jdk'] ) {
-package { 'openjdk-7-jdk': ensure = present }
-}
+require_package('openjdk-6-jdk')
+require_package('openjdk-7-jdk')
 
 package { 'maven2':
 ensure = present,
@@ -94,11 +90,7 @@
 # For Doxygen based documentations
 require_package('graphviz')
 
-if ! defined ( Package['python-requests'] ) {
-package { 'python-requests':
-ensure = present,
-}
-}
+require_package('python-requests')
 
 # Node.js evolves quickly so we want to update automatically.
 require_package('nodejs')
diff --git a/modules/contint/manifests/publish-console.pp 
b/modules/contint/manifests/publish-console.pp
index 1f76a96..92aea0e 100644
--- a/modules/contint/manifests/publish-console.pp
+++ b/modules/contint/manifests/publish-console.pp
@@ -3,11 +3,7 @@
 # https://integration.wikimedia.org/logs/
 class contint::publish-console {
 
-# publish-console.py dependencies
-if ! defined ( Package['python-requests'] ) {
-package { 'python-requests':
-ensure = present,
-}
-}
+# publish-console.py dependency
+require_package('python-requests')
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ib99ad3026efca924b5fabe4aa8a1333a683b63cf
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: ArielGlenn ar...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Mark Bergsma m...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Beta: CX: Add Gujarati as target language - change (operations/puppet)

2015-03-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Beta: CX: Add Gujarati as target language
..


Beta: CX: Add Gujarati as target language

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

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



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index 061250c..9a56dd2 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -82,6 +82,7 @@
 - 'eo'
 - 'es'
 - 'fr'
+- 'gu'
 - 'hy'
 - 'id'
 - 'it'

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8be295fb2960ba829e1a024028bac74963d01ae7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] scap: improve deploy2graphite - change (operations/puppet)

2015-03-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: scap: improve deploy2graphite
..


scap: improve deploy2graphite

mostly cleaner/saner shell

Bug: T1387
Change-Id: Ice7e95f963b78386189ada37ba88838735fb82d3
---
M modules/scap/files/deploy2graphite
1 file changed, 33 insertions(+), 20 deletions(-)

Approvals:
  BryanDavis: Looks good to me, but someone else must approve
  Filippo Giunchedi: Verified; Looks good to me, approved
  20after4: Looks good to me, but someone else must approve
  Dzahn: Looks good to me, but someone else must approve



diff --git a/modules/scap/files/deploy2graphite 
b/modules/scap/files/deploy2graphite
index 4dead4a..9895b76 100755
--- a/modules/scap/files/deploy2graphite
+++ b/modules/scap/files/deploy2graphite
@@ -1,28 +1,41 @@
-#! /bin/bash
+#!/bin/bash
+
+set -e
+set -u
 
 . /usr/local/lib/mw-deployment-vars.sh
 
+me=$(readlink -f $0)
+deploy_type=${1:-}
+deploy_duration=${2:-}
+dry_run=${DOLOGMSGNOLOG:+no}
+
 usage() {
-   echo Usage: $0 deploy_type [deploy_duration_seconds]
-   echo $0 will log an entry at graphite.wikimedia.org indicating that a
-   echo  deploy event of the type indicated has occurred.
-   echo  Expected deploy events include sync-common, sync-file, scap, 
etc.
-   echo  These messages can be suppressed by setting an environment 
variable $DOLOGMSGNOLOG.
-   echo 
-   echo   IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
-   echo 
-   exit
+echo Usage: $me deploy_type [deploy_duration_seconds]
+echo $me will log an entry at graphite.wikimedia.org indicating that a
+echo  deploy event of the type indicated has occurred.
+echo  Expected deploy events include sync-common, sync-file, scap, etc.
+echo  These messages can be suppressed by setting an environment variable 
\$DOLOGMSGNOLOG.
+echo 
+echo   IF YOU'RE RUNNING THIS BY HAND, PLEASE STOP.
+echo 
+exit
 }
 
-[ ${1/-h} != $1 ]  usage
+statsd_send() {
+echo $1 | nc -w1 -q0 -u $MW_STATSD_HOST $MW_STATSD_PORT
+}
 
-if [ -z $DOLOGMSGNOLOG ]; then
-   if [ $1 ] ; then
-   utime=$(date +%s)
-   echo deploy.${1}:1|c | nc -w1 -q0 -u $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   echo deploy.all:1|c | nc -w1 -q0 -u $MW_STATSD_HOST 
$MW_STATSD_PORT || /bin/true
-   test -n $2  echo deploy.${1}.timing:${2}000|ms | nc -w1 
-q0 -u $MW_STATSD_HOST $MW_STATSD_PORT || /bin/true
-   else
-   usage
-   fi
+if [ $deploy_type = -h ] || [ $deploy_type =  ]; then
+usage
+fi
+
+if [ $dry_run != no ]; then
+exit 0
+fi
+
+statsd_send deploy.${deploy_type}:1|c || true
+statsd_send deploy.all:1|c || true
+if [ -n $deploy_duration ]; then
+statsd_send deploy.${deploy_type}.timing:${deploy_duration}000|ms || true
 fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ice7e95f963b78386189ada37ba88838735fb82d3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Thcipriani tcipri...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] icinga: check mailman shunt queue too - change (operations/puppet)

2015-03-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: icinga: check mailman shunt queue too
..

icinga: check mailman shunt queue too

the shunt queue is used by mailman for messages that fail processing (e.g.
permission error)

Bug: T93783
Change-Id: Ic315132f631c086ee1aeb48a8f031690964afe5e
---
M files/icinga/check_mailman_queue
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/24/200524/1

diff --git a/files/icinga/check_mailman_queue b/files/icinga/check_mailman_queue
index 361393f..650a014 100755
--- a/files/icinga/check_mailman_queue
+++ b/files/icinga/check_mailman_queue
@@ -10,7 +10,7 @@
 # /files/icinga/check_mailman_queue queue limit
 
 mailman_base=/var/lib/mailman/qfiles
-FILES=$mailman_base/in $mailman_base/out $mailman_base/virgin
+FILES=$mailman_base/in $mailman_base/out $mailman_base/virgin 
$mailman_base/shunt
 
 queue_limit=$1
 critqueues=0

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic315132f631c086ee1aeb48a8f031690964afe5e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add dedicated runner for MessageIndexRebuildJob - change (operations/puppet)

2015-03-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Add dedicated runner for MessageIndexRebuildJob
..


Add dedicated runner for MessageIndexRebuildJob

Bug: T90704
Change-Id: Ie3480d0b6e54635ef167fa1082dd28ce2cddbe90
---
M hieradata/labs/deployment-prep/common.yaml
M hieradata/role/common/mediawiki/jobrunner.yaml
M modules/mediawiki/manifests/jobrunner.pp
M modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
4 files changed, 12 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/labs/deployment-prep/common.yaml 
b/hieradata/labs/deployment-prep/common.yaml
index ec2f49a..9c2b300 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -170,10 +170,11 @@
 - deployment-redis01.eqiad.wmflabs
 mediawiki::jobrunner::statsd_server: labmon1001.eqiad.wmnet
 mediawiki::jobrunner::runners_basic: 5
+mediawiki::jobrunner::runners_gwt: 1
 mediawiki::jobrunner::runners_parsoid: 5
 mediawiki::jobrunner::runners_restbase: 5
+mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 2
-mediawiki::jobrunner::runners_gwt: 1
 role::logging::mediawiki::log_directory: /data/project/logs
 role::mediawiki::webserver::pool: one-pool-to-rule-them-all
 mediawiki::users::web: www-data
diff --git a/hieradata/role/common/mediawiki/jobrunner.yaml 
b/hieradata/role/common/mediawiki/jobrunner.yaml
index 6f0aecd..6935485 100644
--- a/hieradata/role/common/mediawiki/jobrunner.yaml
+++ b/hieradata/role/common/mediawiki/jobrunner.yaml
@@ -2,8 +2,9 @@
 admin::groups:
   - deployment
 mediawiki::jobrunner::runners_basic: 14
+mediawiki::jobrunner::runners_gwt: 1
 mediawiki::jobrunner::runners_parsoid: 3
 mediawiki::jobrunner::runners_restbase: 3
+mediawiki::jobrunner::runners_translate: 1
 mediawiki::jobrunner::runners_upload: 7
-mediawiki::jobrunner::runners_gwt: 1
 mediawiki::users::web: www-data
diff --git a/modules/mediawiki/manifests/jobrunner.pp 
b/modules/mediawiki/manifests/jobrunner.pp
index 469d3b9..eefbae0 100644
--- a/modules/mediawiki/manifests/jobrunner.pp
+++ b/modules/mediawiki/manifests/jobrunner.pp
@@ -12,6 +12,7 @@
 $runners_parsoid   = 0,
 $runners_restbase  = 0,
 $runners_transcode = 0,
+$runners_translate = 0,
 $statsd_server = undef,
 $port  = 9005,
 ) {
diff --git a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb 
b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
index 25409fb..38927a9 100644
--- a/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
+++ b/modules/mediawiki/templates/jobrunner/jobrunner.conf.erb
@@ -9,6 +9,7 @@
 ],
 exclude: [
 AssembleUploadChunks,
+MessageIndexRebuildJob,
 ParsoidCacheUpdateJobOnDependencyChange,
 ParsoidCacheUpdateJobOnEdit,
 RestbaseUpdateJobOnEdit,
@@ -58,6 +59,12 @@
 webVideoTranscode
 ]
 },
+translate: {
+runners: %= @runners_translate %,
+include: [
+MessageIndexRebuildJob
+]
+},
 upload: {
 runners: %= @runners_upload %,
 include: [

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3480d0b6e54635ef167fa1082dd28ce2cddbe90
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Nikerabbit niklas.laxst...@gmail.com
Gerrit-Reviewer: Aaron Schulz asch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Nemo bis federicol...@tiscali.it
Gerrit-Reviewer: Rush r...@wikimedia.org
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: fix dsh group lookup - change (operations/puppet)

2015-03-31 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: mediawiki: fix dsh group lookup
..


mediawiki: fix dsh group lookup

Following I6ddd5df7e239969caa59eb88ada1f5cfa0fe195b we can't do an exact
match anymore.

Change-Id: I4224aa33797dd42d4fc4d41ef970f283039c260b
---
M modules/nagios_common/files/check_commands/check_dsh_groups
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/nagios_common/files/check_commands/check_dsh_groups 
b/modules/nagios_common/files/check_commands/check_dsh_groups
index cf6f494..0170088 100755
--- a/modules/nagios_common/files/check_commands/check_dsh_groups
+++ b/modules/nagios_common/files/check_commands/check_dsh_groups
@@ -15,7 +15,8 @@
echo dsh group $GROUP not found
exit 3
fi
-   if [ `grep $HOST $FILE` != $HOST ] ; then
+
+   if ! grep -q ^${HOST}\. ${FILE}; then
echo Host $HOST is not in $GROUP dsh group
exit 2
fi

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I4224aa33797dd42d4fc4d41ef970f283039c260b
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Remove Chris's access - change (operations/puppet)

2015-03-31 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Remove Chris's access
..


Remove Chris's access

Added him to the absent group and removed him from other groups

Bug: T94032
Change-Id: I18ef0d910e71e7b443d77ffa89a2dc1b97e74f2f
---
M modules/admin/data/data.yaml
1 file changed, 4 insertions(+), 4 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 7e5afd0..b13a392 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -1,7 +1,7 @@
 groups:
   absent:
 description: meta group for absented users
-members: [bsitu , csalvia, edenhill, jgonera, mah, mwalker, nimishg, 
rainman, ssmith, swalling]
+members: [bsitu , cmcmahon, csalvia, edenhill, jgonera, mah, mwalker, 
nimishg, rainman, ssmith, swalling]
   wikidev:
 gid: 500
 description: container group for primary user groups.
@@ -41,7 +41,7 @@
 gid: 705
 description: replaces 'mortals' for software deployment
 members: [aaron, dr0ptp4kt, werdna, anomie, aude, awight, awjrichards, 
bd808, jdouglas,
-  brion, cmcmahon, cscott, csteipp, demon, ebernhardson, esanders, gilles,
+  brion, cscott, csteipp, demon, ebernhardson, esanders, gilles,
   gjg, gwicke, halfak, hashar, hoo, kaldari, kartik, khorn, krinkle, 
manybubbles,
   maxsem, mattflaschen, marktraceur, milimetric, mlitn, andyrussg,
   nikerabbit, reedy, rmoen, robla, spage, ssastry, tomasz, yurik,
@@ -124,7 +124,7 @@
   contint-admins:
 gid: 719
 description: users with some sudo permissions on jenkins hosts
-members: [bd808, cmcmahon, cscott, dduvall, demon, krinkle, reedy, 
marktraceur, twentyafterfour, zfilipin, thcipriani, legoktm]
+members: [bd808, cscott, dduvall, demon, krinkle, reedy, marktraceur, 
twentyafterfour, zfilipin, thcipriani, legoktm]
 privileges: ['ALL = (jenkins) NOPASSWD: ALL',
 'ALL = (jenkins-slave) NOPASSWD: ALL',
 'ALL = (gerritslave) NOPASSWD: ALL',
@@ -547,7 +547,7 @@
 catrope@catrope-Lenovo-IdeaPad-U300s]
 uid: 546
   cmcmahon:
-ensure: present
+ensure: absent
 gid: 500
 name: cmcmahon
 realname: Chris McMahon

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I18ef0d910e71e7b443d77ffa89a2dc1b97e74f2f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Greg Grossmeier g...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Don't generate monthly Xenon graphs - change (operations/puppet)

2015-03-31 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Don't generate monthly Xenon graphs
..


Don't generate monthly Xenon graphs

They don't reveal anything that the weekly graphs don't.

Change-Id: Iad9ca5c1d48577d075d7567c7f7dc453fc66f82c
---
M modules/xenon/manifests/init.pp
1 file changed, 0 insertions(+), 1 deletion(-)

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



diff --git a/modules/xenon/manifests/init.pp b/modules/xenon/manifests/init.pp
index 87d3e7d..98e5f45 100644
--- a/modules/xenon/manifests/init.pp
+++ b/modules/xenon/manifests/init.pp
@@ -44,7 +44,6 @@
 { period = 'hourly',  format = '%Y-%m-%d_%H', retain = 24 },
 { period = 'daily',   format = '%Y-%m-%d',retain = 30 },
 { period = 'weekly',  format = '%Y-%W',   retain = 52 },
-{ period = 'monthly', format = '%Y-%m',   retain = 12 },
 ],
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad9ca5c1d48577d075d7567c7f7dc453fc66f82c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] CX: Enable ContentTranslation for bg, fr, mk, sh, sl pairs - change (operations/puppet)

2015-03-31 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: CX: Enable ContentTranslation for bg, fr, mk, sh, sl pairs
..


CX: Enable ContentTranslation for bg, fr, mk, sh, sl pairs

* Bulgarian (bg)
* French (fr)
* Macedonian (mk)
* Serbo-Croatian (sh)
* Slovenian (sl)

Also enable MT as requested.

Bug: T89936 T91836
Change-Id: Ic4bc6de19f5a5c9858ba2e201efd351628b8d0ee
---
M hieradata/common/cxserver.yaml
1 file changed, 20 insertions(+), 0 deletions(-)

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



diff --git a/hieradata/common/cxserver.yaml b/hieradata/common/cxserver.yaml
index 0c02e87..00c6ab9 100644
--- a/hieradata/common/cxserver.yaml
+++ b/hieradata/common/cxserver.yaml
@@ -1,16 +1,19 @@
 registry:
   source:
+- 'bg'
 - 'ca'
 - 'da'
 - 'en'
 - 'eo'
 - 'es'
 - 'de'
+- 'fr'
 - 'id'
 - 'kn'
 - 'ky'
 - 'kz'
 - 'min'
+- 'mk'
 - 'ms'
 - 'nn'
 - 'no'
@@ -18,28 +21,37 @@
 - 'pl'
 - 'pt'
 - 'ru'
+- 'sh'
+- 'sl'
 - 'sv'
 - 'tr'
 - 'uk'
 - 'uz'
   target:
+- 'bg'
 - 'ca'
 - 'da'
 - 'eo'
 - 'es'
 - 'id'
+- 'fr'
 - 'kn'
 - 'ky'
 - 'min'
+- 'mk'
 - 'ms'
 - 'nn'
 - 'no'
 - 'pa'
 - 'pt'
+- 'sh'
+- 'sl'
 - 'uk'
 - 'uz'
   mt:
 Apertium:
+  'bg':
+- 'mk'
   'ca':
 - 'es'
 - 'pt'
@@ -47,11 +59,15 @@
 - 'ca'
 - 'eo'
 - 'es'
+- 'sh'
   'es':
 - 'ca'
 - 'pt'
   'id':
 - 'ms'
+  'mk':
+- 'bg'
+- 'sh'
   'ms':
 - 'id'
   'nn':
@@ -61,6 +77,10 @@
   'pt':
 - 'es'
 - 'ca'
+  'sh':
+- 'sl'
+  'sl':
+- 'sh'
   dictionary:
 JsonDict:
   'ca':

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic4bc6de19f5a5c9858ba2e201efd351628b8d0ee
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] wikimania_scholarships: don't manage open/close dates - change (operations/puppet)

2015-04-01 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: wikimania_scholarships: don't manage open/close dates
..

wikimania_scholarships: don't manage open/close dates

open/close dates are now controlled in the database

Bug: T92358
Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
---
M manifests/role/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
M modules/wikimania_scholarships/templates/env.erb
3 files changed, 0 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/201143/1

diff --git a/manifests/role/wikimania_scholarships.pp 
b/manifests/role/wikimania_scholarships.pp
index 4139a68..7a55526 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -5,10 +5,6 @@
 class role::wikimania_scholarships {
 
 class { '::wikimania_scholarships':
-# Opening date for 2014 application cycle
-open_date= '2014-01-06T00:00:00Z',
-# Closing date for 2014 application cycle
-close_date   = '2014-02-17T23:59:59Z',
 hostname = 'scholarships.wikimedia.org',
 deploy_dir   = '/srv/deployment/scholarships/scholarships',
 cache_dir= '/var/cache/scholarships',
diff --git a/modules/wikimania_scholarships/manifests/init.pp 
b/modules/wikimania_scholarships/manifests/init.pp
index df231f0..183cdd9 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -4,8 +4,6 @@
 # application.
 #
 # == Parameters:
-# - $open_date: date/time that applications will first be accepted
-# - $close_date: date/time after which applications will no longer be accepted
 # - $hostname: hostname for apache vhost
 # - $deploy_dir: directory application is deployed to
 # - $cache_dir: directory for caching twig templates
@@ -18,13 +16,9 @@
 # == Sample usage:
 #
 #   class { 'wikimania_scholarships':
-#   open_date = '2014-01-01T00:00:00Z',
-#   close_date = '2014-02-28T23:59:59Z'
 #   }
 #
 class wikimania_scholarships(
-$open_date= 'UNSET',
-$close_date   = 'UNSET',
 $hostname = 'scholarships.wikimedia.org',
 $deploy_dir   = '/srv/deployment/scholarships/scholarships',
 $cache_dir= '/var/cache/scholarships',
@@ -43,14 +37,6 @@
 $mysql_user = $passwords::mysql::wikimania_scholarships::app_user
 $mysql_pass = $passwords::mysql::wikimania_scholarships::app_password
 $log_file   = udp://${udp2log_dest}/scholarships
-
-# Check arguments
-if $open_date == 'UNSET' {
-fail('$open_date must be a date parsable by PHP\'s strtotime()')
-}
-if $close_date == 'UNSET' {
-fail('$close_date must be a date parsable by PHP\'s strtotime()')
-}
 
 system::role { 'wikimania_scholarships':
 description = 'Wikimania Scholarships server'
diff --git a/modules/wikimania_scholarships/templates/env.erb 
b/modules/wikimania_scholarships/templates/env.erb
index 2784acc..24c31cc 100644
--- a/modules/wikimania_scholarships/templates/env.erb
+++ b/modules/wikimania_scholarships/templates/env.erb
@@ -20,11 +20,3 @@
 
 ; Directory for apache to write twig template cache files
 CACHE_DIR=%= @cache_dir %
-
-; Date/time that applications will first be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_OPEN=%= @open_date %
-
-; Date/time after which applications will no longer be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_CLOSE=%= @close_date %

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] install-server: partman for dm-cache - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: install-server: partman for dm-cache
..

install-server: partman for dm-cache

this partman recipe provides LVM over two hardware raid (ssd and hdd) to be
used with dm-cache for hybrid caching, see also
https://phabricator.wikimedia.org/T88992

Bug: T88994
Change-Id: If14f2dc0fd84347d362e7a958593d34b68b3cb5c
---
M modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
1 file changed, 45 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/34/200134/1

diff --git 
a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg 
b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
index 83b1d74..8e896b9 100644
--- a/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
+++ b/modules/install-server/files/autoinstall/partman/graphite-dmcache.cfg
@@ -1,25 +1,30 @@
-# Automatic software RAID 10 with LVM partitioning
-# test dm-cache T88992
-#
+# use LVM and dm-cache to speed up read/write to spinning HDDs
+
+# expected hardware:
 # * /dev/sda: db-class hw-raid10 spinning disks 1.7TB
 # * /dev/sdb: hw-raid raid1 SSD 256GB
 
 # * layout:
 #   - /boot: ext4 on ssd, no lvm
-#   - two VG: data (hdd+ssd) and system (ssd)
+#   - two VGs: vg-data (PV: sda+sdb) and vg-sys (PV: sdb)
 #   - swap: vg-sys 1GB
-#   - /: vg-sys 20GB
+#   - /: vg-sys 30GB
 
 d-ipartman-auto/method string  lvm
 d-ipartman-md/device_remove_md boolean true
 d-ipartman-lvm/device_remove_lvm   boolean true
 
-d-ipartman-auto/disk   string  /dev/sda /dev/sdb
+# order is important, if not specified partitions get created on the first disk
+d-ipartman-auto/disk   string  /dev/sdb /dev/sda
+
+d-ipartman-auto/choose_recipe  lvm
 
 # Define physical partitions
+# regular partitions and partitions used in VGs first
+# then LVs
 d-ipartman-auto/expert_recipe  string  \
-   multiraid ::\
-   40 300 300 ext3 \
+   lvm ::  \
+   100 300 100 ext4\
$primary{ } \
$bootable{ }\
method{ format }\
@@ -29,12 +34,32 @@
mountpoint{ /boot } \
device{ /dev/sdb }  \
.   \
-   1000 8000 1000 linux-swap   \
+   4 4 4 ext4  \
+   $defaultignore{ }   \
+   $primary{ } \
+   method{ lvm }   \
+   device{ /dev/sdb }  \
+   vg_name{ vg-sys }   \
+   .   \
+   10 30 10 ext4   \
+   $primary{ } \
+   $defaultignore{ }   \
+   method{ keep }  \
+   device{ /dev/sdb }  \
+   .   \
+   50 300 -1 ext4  \
+   $defaultignore{ }   \
+   $primary{ } \
+   method{ lvm }   \
+   device{ /dev/sda }  \
+   vg_name{ vg-data }  \
+   .   \
+   1000 1000 1000 linux-swap   \
method{ swap }  \
$lvmok{ }   \
format{ }   \
-   device{ /dev/sdb }  \
-   vg_name{ vg-sys }   \
+   in_vg{ vg-sys } \
+   lv_name{ swap } \
.   \
3 3 3 ext4  \
$lvmok{ }   \
@@ -43,20 +68,19 @@
use_filesystem{ }   \
filesystem{ ext4 }  \
mountpoint{ / } \
-   device{ /dev/sdb }  \
-   vg_name{ vg-sys }   \
-   10 3 -1 ext4\
-   method{ keep }  \
-   device{ /dev/sdb }  \
-   50 3 -1 ext4\
+   in_vg{ vg-sys } \
+   lv_name{ root } \
+   .   \
+   50 50 -1 ext4   \
$lvmok{ }   \
method{ format }\

[MediaWiki-commits] [Gerrit] VarnishStatusCollector for diamond. - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: VarnishStatusCollector for diamond.
..


VarnishStatusCollector for diamond.

This is needed to collect specific request stats for T88705

Bug: T88705
Change-Id: I1b4448653d1cfe6420f23b87df792256e4d762be
---
M manifests/role/beta.pp
A modules/diamond/files/collector/varnishstatus.py
2 files changed, 101 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/role/beta.pp b/manifests/role/beta.pp
index ec07dbc..ad994b6 100644
--- a/manifests/role/beta.pp
+++ b/manifests/role/beta.pp
@@ -47,3 +47,16 @@
 logstash_port = 5229,
 }
 }
+
+# = Class: role::beta::availability_collector
+# collect availability metrics for the beta / staging clusters
+class role::beta::availability_collector {
+include ::diamond
+diamond::collector { 'VarnishStatus':
+source  = 'puppet:///modules/diamond/collector/varnishstatus.py',
+settings = {
+  path_prefix = $::instanceproject,
+  path = 'availability',
+}
+}
+}
diff --git a/modules/diamond/files/collector/varnishstatus.py 
b/modules/diamond/files/collector/varnishstatus.py
new file mode 100644
index 000..b949b3f
--- /dev/null
+++ b/modules/diamond/files/collector/varnishstatus.py
@@ -0,0 +1,88 @@
+
+Collect request status code metrics from varnish (by using varnishtop)
+Used to collect beta / staging cluster availability metrics
+
+ Dependencies
+
+ * subprocess
+
+
+from diamond.collector import Collector
+import subprocess
+
+
+class VarnishStatusCollector(Collector):
+
+def get_default_config(self):
+
+Returns the default collector settings
+
+config = super(VarnishStatusCollector, self).get_default_config()
+config.update({
+'path': 'availability',
+'bin':  '/usr/bin/varnishtop',
+})
+return config
+
+def collect(self):
+
+Publishes stats to the configured path.
+e.g. /deployment-prep/hostname/availability/#
+with one # for each http status code
+
+group_by_type = {'2xx': 0, '3xx': 0, '4xx': 0, '5xx': 0}
+total = 0
+lines = self.poll()
+# Publish Metric
+for line in lines:
+parts = line.split()
+if (len(parts) == 3):
+count = int(float(parts[0]))
+total += count
+code = parts[2]
+type = code[:1] + 'xx'
+group_by_type[type] = group_by_type.setdefault(type, 0) + count
+self.publish_gauge(code, count)
+
+for k, v in group_by_type.iteritems():
+if v  0:
+self.publish_gauge(k, v)
+
+success_count = group_by_type['2xx'] + group_by_type['3xx']
+
+# calculate the percentage of successful out of the total request count
+if success_count  0:
+self.publish_gauge('ok', success_count)
+ratio = float(success_count) / float(total)
+self.publish_gauge('availability', 100 * ratio)
+
+def poll(self):
+
+This runs `varnishtop -c -i TxStatus -1`
+which returns output like the following:
+
+ 5.00 TxStatus 200
+  1050.00 TxStatus 302
+65.00 TxStatus 404
+40.00 TxStatus 503
+29.00 TxStatus 204
+19.00 TxStatus 401
+18.00 TxStatus 301
+ 3.00 TxStatus 304
+
+The 1st column is a request status counter, 2nd is irrelevant
+3rd is the http status code
+
+This method returns the output from the command,
+split into 1 element per line.
+
+
+try:
+command = [self.config['bin'], -c, -i, TxStatus, -1]
+output = subprocess.check_output(command)
+
+except Exception as e:
+self.log.error(Error: %s, e)
+output = 
+
+return output.splitlines()

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I1b4448653d1cfe6420f23b87df792256e4d762be
Gerrit-PatchSet: 19
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: 20after4 mmod...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] zuul: provide sane defaults in init scripts - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: zuul: provide sane defaults in init scripts
..


zuul: provide sane defaults in init scripts

Filippo Giunchedi pointed we should not exit when a default file is
missing but instead provide sane default.

Add to the init script sane defaults to be overriden via the default
file:

 START_DAEMON=0
 DAEMON_ARGS=0

Our default files (in puppet templates) do have START_DAEMON=1 so no
impact for us.

Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
---
M modules/zuul/files/zuul-merger.init
M modules/zuul/files/zuul.init
2 files changed, 4 insertions(+), 10 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/zuul/files/zuul-merger.init 
b/modules/zuul/files/zuul-merger.init
index f8470a5..db5b98a 100755
--- a/modules/zuul/files/zuul-merger.init
+++ b/modules/zuul/files/zuul-merger.init
@@ -23,7 +23,8 @@
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -35,10 +36,6 @@
 # Read configuration variable file if it is present
 if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
-   log_daemon_msg $DESC: /etc/default/$NAME not found: exiting
-   log_end_msg 1
-   exit 0
 fi
 
 if ! [ ${START_DAEMON} = 1 ] ; then
diff --git a/modules/zuul/files/zuul.init b/modules/zuul/files/zuul.init
index 20ec8ad..2beb988 100755
--- a/modules/zuul/files/zuul.init
+++ b/modules/zuul/files/zuul.init
@@ -23,7 +23,8 @@
 # Exit if the package is not installed
 [ -x $DAEMON ] || exit 0
 
-START_DAEMON=1
+START_DAEMON=0
+DAEMON_ARGS=''
 
 # Load the VERBOSE setting and other rcS variables
 . /lib/init/vars.sh
@@ -35,10 +36,6 @@
 # Read configuration variable file if it is present
 if [ -r /etc/default/$NAME ] ; then
. /etc/default/$NAME
-else
-   log_daemon_msg $DESC: /etc/default/$NAME not found: exiting
-   log_end_msg 1
-   exit 0
 fi
 
 if ! [ ${START_DAEMON} = 1 ] ; then

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2fa45c3d0e46d1346d1906a48bd174b458a5b0c1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Hashar has...@free.fr
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] swift: don't show diff for builder files - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: don't show diff for builder files
..

swift: don't show diff for builder files

puppet will bail trying to log non-utf8 byte sequences in the diff

Bug: T93614
Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
---
M manifests/swift.pp
M modules/swift_new/manifests/ring.pp
2 files changed, 14 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/46/200146/1

diff --git a/manifests/swift.pp b/manifests/swift.pp
index dd817f2..53d7e54 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -64,8 +64,9 @@
 }
 
 file { '/etc/swift/account.builder':
-ensure = 'present',
-source = puppet:///volatile/swift/${cluster_name}/account.builder,
+ensure= 'present',
+source= 
puppet:///volatile/swift/${cluster_name}/account.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/account.ring.gz':
@@ -76,6 +77,7 @@
 file { '/etc/swift/container.builder':
 ensure = 'present',
 source = puppet:///volatile/swift/${cluster_name}/container.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/container.ring.gz':
@@ -86,6 +88,7 @@
 file { '/etc/swift/object.builder':
 ensure = 'present',
 source = puppet:///volatile/swift/${cluster_name}/object.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/object.ring.gz':
diff --git a/modules/swift_new/manifests/ring.pp 
b/modules/swift_new/manifests/ring.pp
index c56e129..ea461a7 100644
--- a/modules/swift_new/manifests/ring.pp
+++ b/modules/swift_new/manifests/ring.pp
@@ -3,8 +3,9 @@
 $swift_cluster = $swift_new::params::swift_cluster,
 ) {
 file { '/etc/swift/account.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/account.builder,
+ensure= present,
+source= 
puppet:///volatile/swift/${swift_cluster}/account.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/account.ring.gz':
@@ -13,8 +14,9 @@
 }
 
 file { '/etc/swift/container.builder':
-ensure = present,
-source = 
puppet:///volatile/swift/${swift_cluster}/container.builder,
+ensure= present,
+source= 
puppet:///volatile/swift/${swift_cluster}/container.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/container.ring.gz':
@@ -23,8 +25,9 @@
 }
 
 file { '/etc/swift/object.builder':
-ensure = present,
-source = puppet:///volatile/swift/${swift_cluster}/object.builder,
+ensure= present,
+source= 
puppet:///volatile/swift/${swift_cluster}/object.builder,
+show_diff = false,
 }
 
 file { '/etc/swift/object.ring.gz':

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaa0eb84052854612c4cd8a4768fce4718580d3c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] geoip: disable show_diff - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: geoip: disable show_diff
..

geoip: disable show_diff

potentially the same issue we've experienced with puppet failing when the diff
contains invalid utf8 byte sequences

Bug: T93614
Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
---
M modules/geoip/manifests/data/puppet.pp
1 file changed, 8 insertions(+), 7 deletions(-)


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

diff --git a/modules/geoip/manifests/data/puppet.pp 
b/modules/geoip/manifests/data/puppet.pp
index aaacc0c..159d9e1 100644
--- a/modules/geoip/manifests/data/puppet.pp
+++ b/modules/geoip/manifests/data/puppet.pp
@@ -12,12 +12,13 @@
 {
   # recursively copy the $data_directory from $source.
   file { $data_directory:
-ensure  = directory,
-owner   = 'root',
-group   = 'root',
-mode= '0644',
-source  = $source,
-recurse = true,
-backup  = false,
+ensure= directory,
+owner = 'root',
+group = 'root',
+mode  = '0644',
+source= $source,
+recurse   = true,
+backup= false,
+show_diff = false,
   }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2de2d484b8c4540aa5ea5704e2c254591bd58054
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] cassandra: add ferm rules using hiera data - change (operations/puppet)

2015-04-01 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add ferm rules using hiera data 
..


cassandra: add ferm rules using hiera data 

Adding ferm rules for the cassandra ports to allow connections
only from (other) restbase servers.

Gets the list of cassandra host names from hiera, then uses @resolve in ferm
to perform a DNS lookup and convert them to IPs for use in the srange.

Bug:T92680
Change-Id: I7d077c92641f356d51f59c5749427e53ab1ef453
---
M manifests/role/cassandra.pp
1 file changed, 14 insertions(+), 10 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved
  Eevans: Looks good to me, but someone else must approve
  Alexandros Kosiaris: Looks good to me, but someone else must approve
  jenkins-bot: Verified
  Dzahn: Looks good to me, but someone else must approve



diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 9246595..aa4094e 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -22,22 +22,26 @@
 check_command = 'check_tcp!9042',
 }
 
-ferm::service { 'cassandra-cql-native-transport':
-proto  = 'tcp',
-port   = '9042',
-srange = '$ALL_NETWORKS',
-}
+$cassandra_hosts = hiera('cassandra::seeds')
+$cassandra_hosts_ferm = join($cassandra_hosts, ' ')
 
-ferm::service { 'cassandra-internode-comms':
+# Cassandra intra-node messaging
+ferm::service { 'cassandra-intra-node':
 proto  = 'tcp',
 port   = '7000',
-srange = '$ALL_NETWORKS',
+srange = @resolve(($cassandra_hosts_ferm)),
 }
-
-ferm::service { 'cassandra-jmx-monitoring':
+# Cassandra JMX/RMI
+ferm::service { 'cassandra-jmx-rmi':
 proto  = 'tcp',
 port   = '7199',
-srange = '$ALL_NETWORKS',
+srange = @resolve(($cassandra_hosts_ferm)),
+}
+# Cassandra CQL query interface
+ferm::service { 'cassandra-cql':
+proto  = 'tcp',
+port   = '9042',
+srange = @resolve(($cassandra_hosts_ferm)),
 }
 
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7d077c92641f356d51f59c5749427e53ab1ef453
Gerrit-PatchSet: 11
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Eevans eev...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Matanya mata...@foss.co.il
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] create shell for lpintscher - change (operations/puppet)

2015-04-01 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: create shell for lpintscher
..


create shell for lpintscher

Create a shell for Lydia Pintscher using labs
username and uid. Add to analytics-privatedata-users
and bastion.

Bug: T94390
Change-Id: Ic60cd627ded522e91225a1be06fceb0fc40edb5d
---
M modules/admin/data/data.yaml
1 file changed, 9 insertions(+), 3 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; 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 b13a392..de0614d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -61,7 +61,7 @@
   haithams, mhurd, dbrant, mglaser, kleduc, bsitzmann, deskana,
   jzerebecki, declerambaul, ellery, dduvall, nettrom, mforns, jkatz,
   bmansurov, west1, jhernandez, smalyshev, ananthrk, tbayer, zfilipin,
-  joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz]
+  joal, thcipriani, daisy, ashwinpp, mvolz, jhobs, tomasz, lpintscher]
   cassandra-test-roots:
 gid: 708
 description: users with root on cassandra hosts
@@ -221,7 +221,7 @@
   kleduc, nuria, haithams, otto, deskana,
   bsitzmann, dbrant, declerambaul, ellery, nettrom, leila,
   ezachte, mforns, reedy, west1, phuedx, ananthrk, awight,
-  joal, jamesur, akosiaris, jhobs]
+  joal, jamesur, akosiaris, jhobs, lpintscher]
   analytics-admins:
 gid: 732
 description: Admin access to analytics cluster.
@@ -1370,4 +1370,10 @@
 realname: Jeff Hobson
 ssh_keys: [ssh-rsa 
B3NzaC1yc2EDAQABAAABAQC1sw+mDWAPUMff1DaTRNVYAxhReV1bRLMEp32689l9dFHcyP+pjLuzJ5IeLQaHi5cd7iEWiQBQYvTtcwqOkar2ozapUbckT+HTDz6sSZqQcOhqc8ZpCm2BdMtXm+oR3bwjFodPhA3qvb/N7EwmoLUxQzmm2LK6/wlb34s3iOnmRF3nl4IN2FqvJlUBPRegJNycO3ntzpV5MN6cVATPkX88Sh05KtjMuNXb0W0gntn8hp1h5YazfDfHWavnAldncwNGG9xIBgF8ENb9lqPo7fcmBqZVZsrQAWuY09SqBfPrKeaP7uaXKIkIEG9sGZUPCUdFefsaw7WjDfZ0vwkwPzFX
 jhob...@wikimedia.org]
 uid: 10542
-
+  lpintscher:
+ensure: present
+gid: 500
+name: lpintscher
+realname: Lydia Pintscher
+ssh_keys: [ssh-rsa 
B3NzaC1yc2EBIwAAAQEA38VRVZ7vOG5Ltv8PdPWShwHb934pIWNav2cRc4qRiaU71YT5Rc9QGQV3t0Cs3fYJ+eh8O2Xr1K6t+2KKJLuDJE84MXq9G9ptGCis9vDb/JimZuaL3Jol16rB5wbzekoCNZyysIHQ4t+gNKnjUA3OXjeAoJy9m76tUvh+cp31LN5DPNJ29QuVO4aTP4IgAl/BYf+j6GBOpkTd4RicUnS9lGGckAcfETk4AYyYqMf4sw5RSyBQESV8Bb0MtTcNNHTSErSFhxT67ijfC1FA5eKTY5MgvHjItNI16lM+Z3SoASlyIIPz4cyQVnM7TswsuF6oYyE1JV4Rlywv6WvWWMm4/w==
 lydia@hel]
+uid: 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic60cd627ded522e91225a1be06fceb0fc40edb5d
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Ataherivand abraham.taheriv...@wikimedia.de
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Halfak ahalfa...@wikimedia.org
Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] ferm: install libnet-dns-perl - change (operations/puppet)

2015-04-01 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: ferm: install libnet-dns-perl
..

ferm: install libnet-dns-perl

When using @resolve ferm function libnet-dns-perl is required (and Recommended
by ferm package too). Admittedly we don't use the function that much so it
might be a bit heavy-handed, but the resulting surprise without the package
installed is even worse: puppet will fail to reload ferm and then never try
again unless the rules change.

Bug: T92680
Change-Id: I22f4d60cbbcbf1ce0eadc3118fd0c22143d9fc6f
---
M modules/ferm/manifests/init.pp
1 file changed, 2 insertions(+), 1 deletion(-)


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

diff --git a/modules/ferm/manifests/init.pp b/modules/ferm/manifests/init.pp
index 75b4450..fe8979f 100644
--- a/modules/ferm/manifests/init.pp
+++ b/modules/ferm/manifests/init.pp
@@ -1,5 +1,6 @@
 class ferm {
-package { 'ferm':
+# @resolve requires libnet-dns-perl
+package { ['ferm', 'libnet-dns-perl']:
 ensure = present,
 }
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I22f4d60cbbcbf1ce0eadc3118fd0c22143d9fc6f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] wikimania_scholarships: don't manage open/close dates - change (operations/puppet)

2015-04-01 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: wikimania_scholarships: don't manage open/close dates
..


wikimania_scholarships: don't manage open/close dates

open/close dates are now controlled in the database

Bug: T92358
Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
---
M manifests/role/wikimania_scholarships.pp
M modules/wikimania_scholarships/manifests/init.pp
M modules/wikimania_scholarships/templates/env.erb
3 files changed, 0 insertions(+), 26 deletions(-)

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



diff --git a/manifests/role/wikimania_scholarships.pp 
b/manifests/role/wikimania_scholarships.pp
index 4139a68..7a55526 100644
--- a/manifests/role/wikimania_scholarships.pp
+++ b/manifests/role/wikimania_scholarships.pp
@@ -5,10 +5,6 @@
 class role::wikimania_scholarships {
 
 class { '::wikimania_scholarships':
-# Opening date for 2014 application cycle
-open_date= '2014-01-06T00:00:00Z',
-# Closing date for 2014 application cycle
-close_date   = '2014-02-17T23:59:59Z',
 hostname = 'scholarships.wikimedia.org',
 deploy_dir   = '/srv/deployment/scholarships/scholarships',
 cache_dir= '/var/cache/scholarships',
diff --git a/modules/wikimania_scholarships/manifests/init.pp 
b/modules/wikimania_scholarships/manifests/init.pp
index df231f0..183cdd9 100644
--- a/modules/wikimania_scholarships/manifests/init.pp
+++ b/modules/wikimania_scholarships/manifests/init.pp
@@ -4,8 +4,6 @@
 # application.
 #
 # == Parameters:
-# - $open_date: date/time that applications will first be accepted
-# - $close_date: date/time after which applications will no longer be accepted
 # - $hostname: hostname for apache vhost
 # - $deploy_dir: directory application is deployed to
 # - $cache_dir: directory for caching twig templates
@@ -18,13 +16,9 @@
 # == Sample usage:
 #
 #   class { 'wikimania_scholarships':
-#   open_date = '2014-01-01T00:00:00Z',
-#   close_date = '2014-02-28T23:59:59Z'
 #   }
 #
 class wikimania_scholarships(
-$open_date= 'UNSET',
-$close_date   = 'UNSET',
 $hostname = 'scholarships.wikimedia.org',
 $deploy_dir   = '/srv/deployment/scholarships/scholarships',
 $cache_dir= '/var/cache/scholarships',
@@ -43,14 +37,6 @@
 $mysql_user = $passwords::mysql::wikimania_scholarships::app_user
 $mysql_pass = $passwords::mysql::wikimania_scholarships::app_password
 $log_file   = udp://${udp2log_dest}/scholarships
-
-# Check arguments
-if $open_date == 'UNSET' {
-fail('$open_date must be a date parsable by PHP\'s strtotime()')
-}
-if $close_date == 'UNSET' {
-fail('$close_date must be a date parsable by PHP\'s strtotime()')
-}
 
 system::role { 'wikimania_scholarships':
 description = 'Wikimania Scholarships server'
diff --git a/modules/wikimania_scholarships/templates/env.erb 
b/modules/wikimania_scholarships/templates/env.erb
index 2784acc..24c31cc 100644
--- a/modules/wikimania_scholarships/templates/env.erb
+++ b/modules/wikimania_scholarships/templates/env.erb
@@ -20,11 +20,3 @@
 
 ; Directory for apache to write twig template cache files
 CACHE_DIR=%= @cache_dir %
-
-; Date/time that applications will first be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_OPEN=%= @open_date %
-
-; Date/time after which applications will no longer be accepted
-; Value should be compatible with PHP's strtotime() function
-APPLICATION_CLOSE=%= @close_date %

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I38cc9f819990400f076e733b1f6a2e3fa8dc1c0a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: BryanDavis bda...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: JanZerebecki jan.wikime...@zerebecki.de
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] Update cassandra submodule - change (operations/puppet)

2015-02-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Update cassandra submodule
..


Update cassandra submodule

Follow-up to https://gerrit.wikimedia.org/r/#/c/193060/

Change-Id: Iec70ebf75b921323ddd646819d3fa16a3209de1a
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/cassandra b/modules/cassandra
index fa41d07..151c2a1 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit fa41d070e62d31b403492572b4cb5645eac75f87
+Subproject commit 151c2a1087e5e6e88a53ffd1db5d8982178320a6

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec70ebf75b921323ddd646819d3fa16a3209de1a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ori.livneh o...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] admin: set filippo TERM - change (operations/puppet)

2015-02-23 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: admin: set filippo TERM
..


admin: set filippo TERM

rxvt terminfo is not usually installed and shipping its binary terminfo in here
isn't appealing, so default to screen's

Change-Id: I8292ee87bc1becdd3fb1a7f2cc7d422f86308211
---
M modules/admin/files/home/filippo/.bashrc
1 file changed, 15 insertions(+), 6 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/admin/files/home/filippo/.bashrc 
b/modules/admin/files/home/filippo/.bashrc
index 0a37ad5..d5632ad 100644
--- a/modules/admin/files/home/filippo/.bashrc
+++ b/modules/admin/files/home/filippo/.bashrc
@@ -13,10 +13,19 @@
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ]  eval $(SHELL=/bin/sh lesspipe)
 
-if [ -n $PS1 ]; then
-  RESET=$(tput sgr0)
-  BRIGHT=$(tput bold)
-  RED=$(tput setaf 1)
-  WHITE=$(tput setaf 7)
-  export 
PS1='\[$BRIGHT\]\[$RED\]\h\[$RESET\]:\w\[$BRIGHT\]\[$WHITE\]\$\[$RESET\] '
+# set options for interactive-only shells below
+if [ -z $PS1 ]; then
+  return
 fi
+
+case $TERM in
+  rxvt-unicode-256color)
+export TERM=screen-256color
+  ;;
+esac
+
+RESET=$(tput sgr0)
+BRIGHT=$(tput bold)
+RED=$(tput setaf 1)
+WHITE=$(tput setaf 7)
+export 
PS1='\[$BRIGHT\]\[$RED\]\h\[$RESET\]:\w\[$BRIGHT\]\[$WHITE\]\$\[$RESET\] '

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I8292ee87bc1becdd3fb1a7f2cc7d422f86308211
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] graphite: extend aggregation for statsite extended counters - change (operations/puppet)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: extend aggregation for statsite extended counters
..

graphite: extend aggregation for statsite extended counters

statsite has an option to push additional metrics for counters, however they
are named .upper and .lower

Bug: T90111
Change-Id: I519020cfd5def8c6a6d15622934094f322465c12
---
M manifests/role/graphite.pp
1 file changed, 11 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/92/192792/1

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 7496ee6..144d025 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -56,6 +56,17 @@
 xFilesFactor  = 0.1,
 aggregationMethod = 'max',
 },
+# statsite extended counters
+'lower' = {
+pattern   = '\.lower$',
+xFilesFactor  = 0.1,
+aggregationMethod = 'min',
+},
+'upper' = {
+pattern   = '\.upper$',
+xFilesFactor  = 0.1,
+aggregationMethod = 'max',
+},
 },
 
 # All metric data goes through a single carbon-relay instance, which

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I519020cfd5def8c6a6d15622934094f322465c12
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] graphite: do not aggregate counters by sum - change (operations/puppet)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: graphite: do not aggregate counters by sum
..

graphite: do not aggregate counters by sum

we were instructing whisper to aggregate txstatsd counters by sum, which
doesn't match people's expectations. Counters are reset at each flush interval
so are rates by all intended purposes, thus aggregating by sum doesn't make
sense, we should aggregate by average instead (default).
Note this doesn't affect existing whisper files, only newly created files.
Existing files will need to be changes with whisper-resize.

Bug: T90111
Change-Id: I1377a79bfb25690f57775070988e346e54923d42
---
M manifests/role/graphite.pp
1 file changed, 0 insertions(+), 5 deletions(-)


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

diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 706a567..7496ee6 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -56,11 +56,6 @@
 xFilesFactor  = 0.1,
 aggregationMethod = 'max',
 },
-'sum' = {
-pattern   = '\.count$',
-xFilesFactor  = 0,
-aggregationMethod = 'sum',
-},
 },
 
 # All metric data goes through a single carbon-relay instance, which

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1377a79bfb25690f57775070988e346e54923d42
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Reduce the pressure on CMS GC to avoid stop-the-world - change (operations...cassandra)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Reduce the pressure on CMS GC to avoid stop-the-world
..


Reduce the pressure on CMS GC to avoid stop-the-world

Increase the JVM tenuring threshold  lower CMSInitiatingOccupancyFraction.

During heavy read load the promotion rate from the young generation is too
high for incremental CMS, which causes CMS to switch to slow stop-the world
collections that take multiple seconds. This is slow enough for other nodes to
consider the node dead.

This patch increases the number of young space collections an object needs to
survive before being promoted. This increases the cost
in young space collections slightly in exchange for a lower promotion rate

Additionally, the lower CMSInitiatingOccupancyFraction setting causes CMS to
start collections earlier. This gives incremental collection a better shot at
collecting sufficient garbage to avoid having to resort to a stop-the-world
collection.

Change-Id: I26c946e05e651ccd68c767ffba51d2ff9598d87b
---
M templates/cassandra-env.sh.erb
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/templates/cassandra-env.sh.erb b/templates/cassandra-env.sh.erb
index 2fd9aa4..5a778b8 100644
--- a/templates/cassandra-env.sh.erb
+++ b/templates/cassandra-env.sh.erb
@@ -218,8 +218,8 @@
 JVM_OPTS=$JVM_OPTS -XX:+UseConcMarkSweepGC
 JVM_OPTS=$JVM_OPTS -XX:+CMSParallelRemarkEnabled
 JVM_OPTS=$JVM_OPTS -XX:SurvivorRatio=8
-JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=1
-JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=75
+JVM_OPTS=$JVM_OPTS -XX:MaxTenuringThreshold=10
+JVM_OPTS=$JVM_OPTS -XX:CMSInitiatingOccupancyFraction=45
 JVM_OPTS=$JVM_OPTS -XX:+UseCMSInitiatingOccupancyOnly
 JVM_OPTS=$JVM_OPTS -XX:+UseTLAB
 JVM_OPTS=$JVM_OPTS -XX:CompileCommandFile=$CASSANDRA_CONF/hotspot_compiler

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I26c946e05e651ccd68c767ffba51d2ff9598d87b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org
Gerrit-Reviewer: Smalyshev smalys...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Add a daily incremental repair job - change (operations...cassandra)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Add a daily incremental repair job
..


Add a daily incremental repair job

Cassandra 2.1 adds a new incremental repair mode, which should make daily
repairs fairly fast. Lets see if the impact with -par is okay. If I understand
the docs right it sounds like it would be a win over repairing each node
sequentially, especially in combination with incremental repairs.

See the docs for background:
http://www.datastax.com/documentation/cassandra/2.1/cassandra/operations/ops_repair_nodes_c.html

Change-Id: Ifc5d3826229ca6aa7cfd9bd3a680e97c9abc05e4
---
M manifests/init.pp
1 file changed, 10 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/manifests/init.pp b/manifests/init.pp
index 683fdcb..06d29ef 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -346,6 +346,16 @@
 ensure = 'absent',
 }
 
+# Cron for daily incremental repairs
+# 
http://www.datastax.com/documentation/cassandra/2.1/cassandra/operations/ops_repair_nodes_c.html
+cron { 'daily incremental repairs':
+# Only keep last day's repair output for simplicity.
+command = /usr/bin/nodetool repair -par -inc  
/var/log/cassandra/repair.log 21,
+user= 'cassandra',
+hour= '04',
+minute  = '45',
+}
+
 service { 'cassandra':
 ensure = 'running',
 enable = true,

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc5d3826229ca6aa7cfd9bd3a680e97c9abc05e4
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org
Gerrit-Reviewer: Rush r...@wikimedia.org
Gerrit-Reviewer: Springle sprin...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Update the cassandra submodule - change (operations/puppet)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Update the cassandra submodule
..


Update the cassandra submodule

Follow-up to https://gerrit.wikimedia.org/r/#/c/192760/.

Change-Id: Idb4b86d3d616197ea4a1f73d980a895e6325dff6
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/cassandra b/modules/cassandra
index f12df0e..fa41d07 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit f12df0ee3b3c72093586f49650c76627c2982d2c
+Subproject commit fa41d070e62d31b403492572b4cb5645eac75f87

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Idb4b86d3d616197ea4a1f73d980a895e6325dff6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] cassandra: update submodule - change (operations/puppet)

2015-02-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: update submodule
..

cassandra: update submodule

Change-Id: I14da91e16d838f76f9a00674d8270ba3cad0617a
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/192849/1

diff --git a/modules/cassandra b/modules/cassandra
index f12df0e..fa41d07 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit f12df0ee3b3c72093586f49650c76627c2982d2c
+Subproject commit fa41d070e62d31b403492572b4cb5645eac75f87

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I14da91e16d838f76f9a00674d8270ba3cad0617a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] admin: set filippo TERM - change (operations/puppet)

2015-02-23 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: admin: set filippo TERM
..

admin: set filippo TERM

rxvt terminfo is not usually installed and shipping its binary terminfo in here
isn't appealing, so default to screen's

Change-Id: I8292ee87bc1becdd3fb1a7f2cc7d422f86308211
---
M modules/admin/files/home/filippo/.bashrc
1 file changed, 15 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/87/192287/1

diff --git a/modules/admin/files/home/filippo/.bashrc 
b/modules/admin/files/home/filippo/.bashrc
index 0a37ad5..d5632ad 100644
--- a/modules/admin/files/home/filippo/.bashrc
+++ b/modules/admin/files/home/filippo/.bashrc
@@ -13,10 +13,19 @@
 # make less more friendly for non-text input files, see lesspipe(1)
 [ -x /usr/bin/lesspipe ]  eval $(SHELL=/bin/sh lesspipe)
 
-if [ -n $PS1 ]; then
-  RESET=$(tput sgr0)
-  BRIGHT=$(tput bold)
-  RED=$(tput setaf 1)
-  WHITE=$(tput setaf 7)
-  export 
PS1='\[$BRIGHT\]\[$RED\]\h\[$RESET\]:\w\[$BRIGHT\]\[$WHITE\]\$\[$RESET\] '
+# set options for interactive-only shells below
+if [ -z $PS1 ]; then
+  return
 fi
+
+case $TERM in
+  rxvt-unicode-256color)
+export TERM=screen-256color
+  ;;
+esac
+
+RESET=$(tput sgr0)
+BRIGHT=$(tput bold)
+RED=$(tput setaf 1)
+WHITE=$(tput setaf 7)
+export 
PS1='\[$BRIGHT\]\[$RED\]\h\[$RESET\]:\w\[$BRIGHT\]\[$WHITE\]\$\[$RESET\] '

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8292ee87bc1becdd3fb1a7f2cc7d422f86308211
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] cassandra: update submodule - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: update submodule
..


cassandra: update submodule

Change-Id: Iec27befdc6f00ca226e30e847bf68148357523c3
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/cassandra b/modules/cassandra
index c165985..cfd68f0 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit c165985067a97b022346227256a8618f6073e2ef
+Subproject commit cfd68f03757868034a0a77f03d182c0a7fb459c5

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Iec27befdc6f00ca226e30e847bf68148357523c3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] cassandra: update submodule - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: update submodule
..

cassandra: update submodule

Change-Id: Ibca91da21c934b032d8cd0c8ebd88cc002ad3f49
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)


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

diff --git a/modules/cassandra b/modules/cassandra
index cfd68f0..f12df0e 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit cfd68f03757868034a0a77f03d182c0a7fb459c5
+Subproject commit f12df0ee3b3c72093586f49650c76627c2982d2c

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca91da21c934b032d8cd0c8ebd88cc002ad3f49
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] deployment: true vs 'true' - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: deployment: true vs 'true'
..

deployment: true vs 'true'

only one true way to do things

Change-Id: I19b4dffdc863b2c8f6a754700d4199e974165e52
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/43/192543/1

diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index b9610a0..6f1e383 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -115,7 +115,7 @@
 'checkout_submodules' = true,
 },
 'dropwizard/metrics' = {
-'gitfat_enabled' = 'true',
+'gitfat_enabled' = true,
 'upstream'   = 
'https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics',
 },
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19b4dffdc863b2c8f6a754700d4199e974165e52
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] cassandra: add cassandra::metrics class and deps - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: cassandra: add cassandra::metrics class and deps
..


cassandra: add cassandra::metrics class and deps

see also related commits in cassandra submodule

Bug: T78514
Change-Id: I6600609237a4e5635409fb2a944a7572691bcc69
---
A hieradata/role/common/cassandra.yaml
M manifests/role/cassandra.pp
M manifests/role/deployment.pp
3 files changed, 6 insertions(+), 0 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/hieradata/role/common/cassandra.yaml 
b/hieradata/role/common/cassandra.yaml
new file mode 100644
index 000..8634e9c
--- /dev/null
+++ b/hieradata/role/common/cassandra.yaml
@@ -0,0 +1 @@
+cassandra::metrics::graphite_host: 'graphite-in.eqiad.wmnet'
diff --git a/manifests/role/cassandra.pp b/manifests/role/cassandra.pp
index 5537b2c..758c504 100644
--- a/manifests/role/cassandra.pp
+++ b/manifests/role/cassandra.pp
@@ -3,6 +3,7 @@
 class role::cassandra {
 # Parameters to be set by Hiera
 class { '::cassandra': }
+class { '::cassandra::metrics': }
 
 system::role { 'role::cassandra':
 description = 'Cassandra server',
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 4cfc0f6..b9610a0 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -114,6 +114,10 @@
 'upstream'= 
'https://gerrit.wikimedia.org/r/mediawiki/services/cxserver/deploy',
 'checkout_submodules' = true,
 },
+'dropwizard/metrics' = {
+'gitfat_enabled' = 'true',
+'upstream'   = 
'https://gerrit.wikimedia.org/r/operations/software/dropwizard-metrics',
+},
 }
 }
 

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I6600609237a4e5635409fb2a944a7572691bcc69
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] cassandra: fix metrics-graphite.jar path - change (operations...cassandra)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: cassandra: fix metrics-graphite.jar path
..

cassandra: fix metrics-graphite.jar path

Change-Id: I8a0caa0ccad089305cf44902030249f345e89e01
---
M manifests/metrics.pp
1 file changed, 1 insertion(+), 1 deletion(-)


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

diff --git a/manifests/metrics.pp b/manifests/metrics.pp
index f67f701..28b03a8 100644
--- a/manifests/metrics.pp
+++ b/manifests/metrics.pp
@@ -31,7 +31,7 @@
 provider = 'trebuchet',
 }
 
-file { '/usr/share/cassandra/metrics-graphite.jar':
+file { '/usr/share/cassandra/lib/metrics-graphite.jar':
 ensure = 'link',
 target = 
'/srv/deployment/dropwizard/metrics/lib/metrics-graphite-2.2.0.jar',
 require = Package['dropwizard/metrics'],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I8a0caa0ccad089305cf44902030249f345e89e01
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] trebuchet: install git-fat on debian too - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: trebuchet: install git-fat on debian too
..


trebuchet: install git-fat on debian too

Change-Id: I9a216969a9d02ec37edd1a0a2e0750247180d2d3
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/modules/trebuchet/manifests/packages.pp 
b/modules/trebuchet/manifests/packages.pp
index 41d9373..8447ade 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -5,7 +5,7 @@
 class trebuchet::packages {
 include ::redis::client::python
 
-if os_version('ubuntu  lucid') {
+if os_version('ubuntu  lucid') or os_version('debian = jessie') {
 package { 'git-fat':
 ensure = present,
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a216969a9d02ec37edd1a0a2e0750247180d2d3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Yuvipanda yuvipa...@gmail.com
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] trebuchet: install git-fat on debian too - change (operations/puppet)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: trebuchet: install git-fat on debian too
..

trebuchet: install git-fat on debian too

Change-Id: I9a216969a9d02ec37edd1a0a2e0750247180d2d3
---
M modules/trebuchet/manifests/packages.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/49/192549/1

diff --git a/modules/trebuchet/manifests/packages.pp 
b/modules/trebuchet/manifests/packages.pp
index 41d9373..2477956 100644
--- a/modules/trebuchet/manifests/packages.pp
+++ b/modules/trebuchet/manifests/packages.pp
@@ -5,7 +5,7 @@
 class trebuchet::packages {
 include ::redis::client::python
 
-if os_version('ubuntu  lucid') {
+if os_version('ubuntu  lucid') || os_version('debian = jessie') {
 package { 'git-fat':
 ensure = present,
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9a216969a9d02ec37edd1a0a2e0750247180d2d3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Depend on rsync - change (operations...git-fat)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: Depend on rsync
..


Depend on rsync

Change-Id: I04c2c72b435e213686f2892e163e5112731ddb80
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/debian/changelog b/debian/changelog
index f23f461..23c5c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-fat (0.1.1-2) precise-wikimedia; urgency=medium
+
+  * Depend on rsync
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Tue, 24 Feb 2015 14:29:19 +
+
 git-fat (0.1.1-1) precise-wikimedia; urgency=low
 
   * Now supporting arbitrary rsync options
diff --git a/debian/control b/debian/control
index b143e35..a3b2dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
 
 Package: git-fat
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, git-core
+Depends: ${misc:Depends}, ${python:Depends}, git-core, rsync
 X-Python-Version: = 2.6
 Provides: ${python:Provides}
 Description: Manage large files with git, without checking the files into git.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I04c2c72b435e213686f2892e163e5112731ddb80
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/git-fat
Gerrit-Branch: debian
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Ottomata o...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] Depend on rsync - change (operations...git-fat)

2015-02-24 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: Depend on rsync
..

Depend on rsync

Change-Id: I04c2c72b435e213686f2892e163e5112731ddb80
---
M debian/changelog
M debian/control
2 files changed, 7 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/git-fat 
refs/changes/48/192548/1

diff --git a/debian/changelog b/debian/changelog
index f23f461..23c5c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-fat (0.1.1-2) precise-wikimedia; urgency=medium
+
+  * Depend on rsync
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Tue, 24 Feb 2015 14:29:19 +
+
 git-fat (0.1.1-1) precise-wikimedia; urgency=low
 
   * Now supporting arbitrary rsync options
diff --git a/debian/control b/debian/control
index b143e35..a3b2dcd 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@
 
 Package: git-fat
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, git-core
+Depends: ${misc:Depends}, ${python:Depends}, git-core, rsync
 X-Python-Version: = 2.6
 Provides: ${python:Provides}
 Description: Manage large files with git, without checking the files into git.

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04c2c72b435e213686f2892e163e5112731ddb80
Gerrit-PatchSet: 1
Gerrit-Project: operations/debs/git-fat
Gerrit-Branch: debian
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] add debian patches to upstream - change (operations...statsite)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: add debian patches to upstream
..

add debian patches to upstream

Bug: T90111
Change-Id: Ib2f6817ac714c7663adb2cca1b409dd38dc51cd3
---
A debian/patches/0001-add-missing-includes-from-ev.c.patch
A debian/patches/0002-dynamically-link-libev-if-available.patch
A debian/patches/0003-provide-libev-multiloop-support.patch
A debian/patches/series
4 files changed, 282 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/statsite 
refs/changes/97/193097/2

diff --git a/debian/patches/0001-add-missing-includes-from-ev.c.patch 
b/debian/patches/0001-add-missing-includes-from-ev.c.patch
new file mode 100644
index 000..232ec50
--- /dev/null
+++ b/debian/patches/0001-add-missing-includes-from-ev.c.patch
@@ -0,0 +1,25 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Wed, 25 Feb 2015 23:40:31 +
+Subject: add missing includes from ev.c
+
+if including only ev.h these headers are missing
+---
+ src/networking.c | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/networking.c b/src/networking.c
+index dabd2b8..20f720f 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -8,6 +8,11 @@
+ #include syslog.h
+ #include unistd.h
+ #include netdb.h
++#include string.h
++#include stdio.h
++#include stdlib.h
++#include errno.h
++#include assert.h
+ 
+ #include networking.h
+ #include conn_handler.h
diff --git a/debian/patches/0002-dynamically-link-libev-if-available.patch 
b/debian/patches/0002-dynamically-link-libev-if-available.patch
new file mode 100644
index 000..b0e0bee
--- /dev/null
+++ b/debian/patches/0002-dynamically-link-libev-if-available.patch
@@ -0,0 +1,57 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Wed, 25 Feb 2015 23:42:17 +
+Subject: dynamically link libev if available
+
+---
+ SConstruct   | 13 +++--
+ src/networking.c |  5 +
+ 2 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 629880c..4bfeaac 100644
+--- a/SConstruct
 b/SConstruct
+@@ -6,8 +6,15 @@ murmur = envmurmur.Library('murmur', 
Glob(deps/murmurhash/*.c))
+ envinih = Environment(CPATH = ['deps/inih/'], CFLAGS=-O3)
+ inih = envinih.Library('inih', Glob(deps/inih/*.c))
+ 
+-env_statsite_with_err = Environment(CCFLAGS = '-g -std=c99 -D_GNU_SOURCE 
-Wall -Werror -Wstrict-aliasing=0 -O3 -pthread -Ideps/inih/ -Ideps/libev/ 
-Isrc/')
+-env_statsite_without_err = Environment(CCFLAGS = '-g -std=c99 -D_GNU_SOURCE 
-O3 -pthread -Ideps/inih/ -Ideps/libev/ -Isrc/')
++ccflags = '-g -std=c99 -D_GNU_SOURCE -O3 -pthread -Ideps/inih/ -Isrc/'
++
++conf_libev = Environment().Configure()
++libev = conf_libev.CheckLibWithHeader('ev', 'ev.h', 'c', autoadd=0)
++if not libev:
++   ccflags += ' -Ideps/libev/ -D_DEPS_LIBEV'
++
++env_statsite_with_err = Environment(CCFLAGS = ccflags + ' -Wall 
-Wstrict-aliasing=0 -Werror')
++env_statsite_without_err = Environment(CCFLAGS = ccflags)
+ 
+ objs = env_statsite_with_err.Object('src/hashmap', 'src/hashmap.c')   
+ \
+ env_statsite_with_err.Object('src/heap', 'src/heap.c')
+ \
+@@ -25,6 +32,8 @@ objs = env_statsite_with_err.Object('src/hashmap', 
'src/hashmap.c')   +
+ env_statsite_without_err.Object('src/conn_handler', 
'src/conn_handler.c')
+ 
+ statsite_libs = [m, pthread, murmur, inih]
++if libev:
++   statsite_libs.append(ev)
+ if platform.system() == 'Linux':
+statsite_libs.append(rt)
+ 
+diff --git a/src/networking.c b/src/networking.c
+index 20f720f..498d31d 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -32,7 +32,12 @@
+ #ifdef __MACH__
+ #define EV_USE_KQUEUE 1
+ #endif
++
++#ifdef _DEPS_LIBEV
+ #include ev.c
++#else
++#include ev.h
++#endif
+ 
+ /**
+  * Default listen backlog size for
diff --git a/debian/patches/0003-provide-libev-multiloop-support.patch 
b/debian/patches/0003-provide-libev-multiloop-support.patch
new file mode 100644
index 000..c3505d0
--- /dev/null
+++ b/debian/patches/0003-provide-libev-multiloop-support.patch
@@ -0,0 +1,197 @@
+From: Filippo Giunchedi fgiunch...@wikimedia.org
+Date: Thu, 26 Feb 2015 12:59:28 +
+Subject: provide libev multiloop support
+
+---
+ src/networking.c | 49 +
+ 1 file changed, 25 insertions(+), 24 deletions(-)
+
+diff --git a/src/networking.c b/src/networking.c
+index 498d31d..8625375 100644
+--- a/src/networking.c
 b/src/networking.c
+@@ -21,9 +21,7 @@
+ #define MAX_PORT_LEN 6
+ 
+ #define EV_STANDALONE 1
+-#define EV_API_STATIC 1
+ #define EV_COMPAT3 0
+-#define EV_MULTIPLICITY 0
+ #define EV_USE_MONOTONIC 1
+ #ifdef __linux__
+ #define EV_USE_CLOCK_SYSCALL 0
+@@ -34,8 +32,11 @@
+ #endif
+ 
+ #ifdef _DEPS_LIBEV
++#define EV_MULTIPLICITY 0
++#define EV_API_STATIC 1
+ #include ev.c
+ #else
++#define EV_MULTIPLICITY 1
+

[MediaWiki-commits] [Gerrit] txstatsd: collect udp stats - change (operations/puppet)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: txstatsd: collect udp stats
..


txstatsd: collect udp stats

this will help in understanding how many metrics are being dropped

Bug: T90111
Change-Id: Ic13b0c7d22c1450022a2219256234a19ea827bfd
---
M manifests/role/txstatsd.pp
1 file changed, 1 insertion(+), 0 deletions(-)

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



diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index f485c3b..05b29c8 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -19,4 +19,5 @@
 },
 },
 }
+diamond::collector { 'UDPCollector': }
 }

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

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic13b0c7d22c1450022a2219256234a19ea827bfd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] txstatsd: collect udp stats - change (operations/puppet)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: txstatsd: collect udp stats
..

txstatsd: collect udp stats

this will help in understanding how many metrics are being dropped

Bug: T90111
Change-Id: Ic13b0c7d22c1450022a2219256234a19ea827bfd
---
M manifests/role/txstatsd.pp
1 file changed, 1 insertion(+), 0 deletions(-)


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

diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index f485c3b..05b29c8 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -19,4 +19,5 @@
 },
 },
 }
+diamond::collector { 'UDPCollector': }
 }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic13b0c7d22c1450022a2219256234a19ea827bfd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] import upstream 0.7.0 - change (operations...statsite)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: import upstream 0.7.0
..

import upstream 0.7.0

no check, no libev

Bug: T90111
Change-Id: Ib07035e8c4381093e64bb570051bdc96cef02012
---
A .gitignore
A .travis.yml
A CHANGELOG.md
A LICENSE
A Makefile
A README.md
A SConstruct
A Vagrantfile
A bench.py
A bench_bin.py
A deps/inih/LICENSE.txt
A deps/inih/README.txt
A deps/inih/ini.c
A deps/inih/ini.h
A deps/murmurhash/MurmurHash3.c
A deps/murmurhash/MurmurHash3.h
A integ/__init__.py
A integ/test_binary.py
A integ/test_binary_stream.py
A integ/test_extended_counters.py
A integ/test_integ.py
A integ/test_librato.py
A integ/test_stdin.py
A rpm/statsite.conf.example
A rpm/statsite.initscript
A rpm/statsite.spec
A sinks/__init__.py
A sinks/binary_sink.py
A sinks/gmetric.py
A sinks/graphite.py
A sinks/influxdb.py
A sinks/librato.py
A sinks/statsite_json_sink.rb
A src/cm_quantile.c
A src/cm_quantile.h
A src/config.c
A src/config.h
A src/conn_handler.c
A src/conn_handler.h
A src/counter.c
A src/counter.h
A src/hashmap.c
A src/hashmap.h
A src/heap.c
A src/heap.h
A src/hll.c
A src/hll.h
A src/hll_constants.c
A src/hll_constants.h
A src/metrics.c
A src/metrics.h
A src/networking.c
A src/networking.h
A src/radix.c
A src/radix.h
A src/set.c
A src/set.h
A src/statsite.c
A src/streaming.c
A src/streaming.h
A src/timer.c
A src/timer.h
A tests/runner.c
A tests/test_cm_quantile.c
A tests/test_config.c
A tests/test_counter.c
A tests/test_hashmap.c
A tests/test_heap.c
A tests/test_hll.c
A tests/test_metrics.c
A tests/test_radix.c
A tests/test_set.c
A tests/test_streaming.c
A tests/test_timer.c
74 files changed, 12,186 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/statsite 
refs/changes/95/193095/2


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib07035e8c4381093e64bb570051bdc96cef02012
Gerrit-PatchSet: 2
Gerrit-Project: operations/debs/statsite
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] import debian directory - change (operations...statsite)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: import debian directory
..

import debian directory

Bug: T90111
Change-Id: I25aa4f2e456a8f05455e6c34c511a77c83b77541
---
A debian/README.source
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/install
A debian/postinst
A debian/rules
A debian/source/format
A debian/statsite.ini
A debian/statsite.init
A debian/statsite.service
A debian/statsite.upstart
14 files changed, 267 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/debs/statsite 
refs/changes/96/193096/2

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 000..eb0c9f1
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,8 @@
+statsite for Debian
+---
+
+bundled dependencies check and libev have been removed from deps/ and Debian's
+packages are used instead during build.
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Wed, 25 Feb 2015 10:30:54 +
+
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..cb0c3ee
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+statsite (0.7.0-1) unstable; urgency=low
+
+  * Initial release (Closes: #778731)
+
+ -- Filippo Giunchedi fili...@wikimedia.org  Wed, 25 Feb 2015 10:30:54 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..e30a997
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,23 @@
+Source: statsite
+Section: utils
+Priority: optional
+Maintainer: Filippo Giunchedi fili...@wikimedia.org
+Build-Depends: debhelper (= 9), dh-systemd, scons, check, libev-dev
+Standards-Version: 3.9.5
+Homepage: https://github.com/armon/statsite
+#Vcs-Git: git://anonscm.debian.org/collab-maint/statsite.git
+#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/statsite.git;a=summary
+
+Package: statsite
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
+Recommends: python
+Description: metrics aggregation server
+ Statsite is designed to be both highly performant,
+ and very flexible. To achieve this, it implements the stats
+ collection and aggregation in pure C, using libev to be
+ extremely fast.
+ .
+ This allows it to handle hundreds of connections,
+ and millions of metrics.
+ .
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..da10586
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,44 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: statsite
+Source: https://github.com/armon/statsite
+
+Files: *
+Copyright: 2012 Armon Dadgar
+License: BSD-3-clause
+
+Files: deps/murmurhash/*
+Copyright: Austin Appleby
+License: Public Domain
+
+Files: deps/inih/*
+Copyright: 2009 Brush Technology
+License: BSD-3-clause
+
+Files: debian/*
+Copyright: 2015 Filippo Giunchedi
+   2015 Wikimedia Foundation
+License: BSD-3-clause
+
+License: BSD-3-clause
+  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 organization 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 HOLDERS AND 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.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/install b/debian/install
new file mode 100644
index 000..402bbf2
--- /dev/null
+++ b/debian/install
@@ -0,0

[MediaWiki-commits] [Gerrit] es-tool: support IPv6 addresses in (un)ban-node - change (operations/puppet)

2015-02-26 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: es-tool: support IPv6 addresses in (un)ban-node
..


es-tool: support IPv6 addresses in (un)ban-node

Change-Id: I46664fbcefab6726137e6814e3722840db359745
---
M modules/elasticsearch/files/es-tool
1 file changed, 14 insertions(+), 10 deletions(-)

Approvals:
  Filippo Giunchedi: Verified; Looks good to me, approved



diff --git a/modules/elasticsearch/files/es-tool 
b/modules/elasticsearch/files/es-tool
index e5e27cd..c585fd9 100755
--- a/modules/elasticsearch/files/es-tool
+++ b/modules/elasticsearch/files/es-tool
@@ -68,17 +68,25 @@
 return []
 
 
+def get_node_type(node):
+try:
+ipaddr.IPv4Address(node)
+return _ip
+except ipaddr.AddressValueError:
+try:
+ipaddr.IPv6Address(node)
+return _ip
+except ipaddr.AddressValueError:
+return _host
+
+
 # Add new command functions here
 def es_ban_node():
 if args.node == :
 print No node provided
 return os.EX_UNAVAILABLE
 
-try:
-ipaddr.IPv4Address(args.node)
-node_type = _ip
-except ipaddr.AddressValueError:
-node_type = _host
+node_type = get_node_type(args.node)
 
 banned = get_banned_nodes(node_type)
 if args.node in banned:
@@ -192,11 +200,7 @@
 print No node provided
 return os.EX_UNAVAILABLE
 
-try:
-ipaddr.IPv4Address(args.node)
-node_type = _ip
-except ipaddr.AddressValueError:
-node_type = _host
+node_type = get_node_type(args.node)
 
 banned = get_banned_nodes(node_type)
 if args.node not in banned:

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I46664fbcefab6726137e6814e3722840db359745
Gerrit-PatchSet: 5
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] update cassandra submodule - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: update cassandra submodule
..

update cassandra submodule

Change-Id: I561b3e01630c969b1549b8b9e784f49701ade99f
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/67/200167/1

diff --git a/modules/cassandra b/modules/cassandra
index fe345a7..c1ae27b 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit fe345a76ed988c6dbf2d4f54baa4f17d03d5e6cc
+Subproject commit c1ae27bd0308200357f7e83f167427a2ebd43352

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I561b3e01630c969b1549b8b9e784f49701ade99f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] trim list of Cassandra metrics - change (operations...cassandra)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: trim list of Cassandra metrics
..


trim list of Cassandra metrics

There is insufficient storage for all of the recently added Cassandra
metrics.  This filters out all of those matching
org.apache.cassandra.metrics.ColumnFamily.system.+ to provide more
headroom.

Bug: T78514
Change-Id: If7527fdcf7465a6561ba799c57bd1d837580531c
---
M templates/metrics.yaml.erb
1 file changed, 1 insertion(+), 1 deletion(-)

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



diff --git a/templates/metrics.yaml.erb b/templates/metrics.yaml.erb
index ded831d..71745e1 100644
--- a/templates/metrics.yaml.erb
+++ b/templates/metrics.yaml.erb
@@ -12,7 +12,7 @@
   patterns:
 - ^org.apache.cassandra.metrics.Cache.+
 - ^org.apache.cassandra.metrics.ClientRequest.+
-- ^org.apache.cassandra.metrics.ColumnFamily.+
+- ^org.apache.cassandra.metrics.ColumnFamily.(?!system).+
 - ^org.apache.cassandra.metrics.Connection.+
 - ^org.apache.cassandra.metrics.CQL.+
 - ^org.apache.cassandra.metrics.DroppedMessage.+

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

Gerrit-MessageType: merged
Gerrit-Change-Id: If7527fdcf7465a6561ba799c57bd1d837580531c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: Eevans eev...@wikimedia.org
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Faidon Liambotis fai...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: Mobrovac mobro...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] update cassandra submodule - change (operations/puppet)

2015-03-27 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: update cassandra submodule
..


update cassandra submodule

Change-Id: I561b3e01630c969b1549b8b9e784f49701ade99f
---
M modules/cassandra
1 file changed, 0 insertions(+), 0 deletions(-)

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



diff --git a/modules/cassandra b/modules/cassandra
index fe345a7..c1ae27b 16
--- a/modules/cassandra
+++ b/modules/cassandra
-Subproject commit fe345a76ed988c6dbf2d4f54baa4f17d03d5e6cc
+Subproject commit c1ae27bd0308200357f7e83f167427a2ebd43352

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I561b3e01630c969b1549b8b9e784f49701ade99f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] statsite: new module - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: statsite: new module
..

statsite: new module

statsite provides a txstatsd replacement, the module allows for multiple
instances to be provisioned with statsite::instance and controlled using the
'*ctl pattern'.

Bug: T90111
Change-Id: I265f5307f73f69c242832d148e14595bfccfdba9
---
A modules/statsite/files/init/init.conf
A modules/statsite/files/init/instance.conf
A modules/statsite/files/statsitectl
A modules/statsite/manifests/init.pp
A modules/statsite/manifests/instance.pp
A modules/statsite/templates/statsite.ini.erb
6 files changed, 172 insertions(+), 0 deletions(-)


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

diff --git a/modules/statsite/files/init/init.conf 
b/modules/statsite/files/init/init.conf
new file mode 100644
index 000..2e15fd0
--- /dev/null
+++ b/modules/statsite/files/init/init.conf
@@ -0,0 +1,15 @@
+description Start statsite instances
+author Filippo Giunchedi fili...@wikimedia.org
+
+start on runlevel [2345] or statsite.start
+
+task
+
+script
+  for config in /etc/statsite/*.ini; do
+[ -e $config ] || break
+name=$(basename $config .ini)
+start statsite/instance NAME=$name CONFIG=$config ||
+  status statsite/instance NAME=$name
+  done
+end script
diff --git a/modules/statsite/files/init/instance.conf 
b/modules/statsite/files/init/instance.conf
new file mode 100644
index 000..06186a1
--- /dev/null
+++ b/modules/statsite/files/init/instance.conf
@@ -0,0 +1,13 @@
+description C statsd daemon
+
+setuid statsite
+
+instance $NAME
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+respawn limit 10 5
+
+exec /usr/bin/statsite -f $CONFIG
diff --git a/modules/statsite/files/statsitectl 
b/modules/statsite/files/statsitectl
new file mode 100755
index 000..50e6fe4
--- /dev/null
+++ b/modules/statsite/files/statsitectl
@@ -0,0 +1,42 @@
+#!/bin/bash
+# statsitectl -- Manage statsite jobs
+# Usage: statsitectl {status|check|start|stop|restart}
+#
+command=$1
+shift
+case $command in
+status)
+status=0
+for config in /etc/statsite/*.ini; do
+  instance=$(basename $config .ini)
+  status statsite/instance NAME=$instance || status=$?
+done
+exit $status
+;;
+check)
+$0 status /dev/null 21 || {
+echo CRITICAL: Not all configured statsite instances are running.
+exit 2
+}
+echo OK: All defined statsite jobs are runnning.
+exit 0
+;;
+start)
+initctl start statsite/init
+;;
+stop)
+for config in /etc/statsite/*.ini; do
+  instance=$(basename $config .ini)
+  initctl stop statsite/instance NAME=$instance
+done
+;;
+restart)
+for config in /etc/statsite/*.ini; do
+  instance=$(basename $config .ini)
+  initctl restart statsite/instance NAME=$instance
+done
+;;
+*)
+echo 2 Usage: ${0##*/} {status|check|start|stop|restart}
+;;
+esac
diff --git a/modules/statsite/manifests/init.pp 
b/modules/statsite/manifests/init.pp
new file mode 100644
index 000..d96bb3a
--- /dev/null
+++ b/modules/statsite/manifests/init.pp
@@ -0,0 +1,55 @@
+# == Class: statsite
+#
+# Configure statsite https://github.com/armon/statsite
+# To add individual instances, use statsite::instance
+#
+# === Parameters
+#
+# [*port*]
+#   Port to listen for messages on over UDP.
+#
+# [*graphite_host*]
+#   Send metrics to graphite on this host
+#
+# [*graphite_port*]
+#   Send metrics to graphite on this port
+#
+# [*input_counter*]
+#   Use this metric to report self-statistics
+#
+# [*extended_counters*]
+#   Export additional metrics for counters
+
+class statsite {
+package { 'statsite':
+ensure = present,
+}
+
+file { '/sbin/statsitectl':
+source = 'puppet:///modules/statsite/statsitectl',
+mode   = '0755',
+}
+
+file { '/etc/init/statsite':
+source  = 'puppet:///modules/statsite/init',
+recurse = true,
+purge   = true,
+force   = true,
+}
+
+# prevent the system-wide statsite from starting
+file { '/etc/init/statsite.override':
+content = 'manual',
+before  = Package['statsite'],
+}
+
+service { 'statsite':
+ensure   = 'running',
+provider = 'base',
+restart  = '/sbin/statsitectl restart',
+start= '/sbin/statsitectl start',
+status   = '/sbin/statsitectl status',
+stop = '/sbin/statsitectl stop',
+require  = Package['statsite'],
+}
+}
diff --git a/modules/statsite/manifests/instance.pp 
b/modules/statsite/manifests/instance.pp
new file mode 100644
index 000..d63e652
--- /dev/null
+++ b/modules/statsite/manifests/instance.pp
@@ -0,0

[MediaWiki-commits] [Gerrit] statsdlb: replace txstatsd with statsite - change (operations/puppet)

2015-03-25 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: statsdlb: replace txstatsd with statsite
..

statsdlb: replace txstatsd with statsite

Start with three instances, should be easy to add more if needed.

Bug: T90111
Change-Id: Ibf9b820b2dd221b6a61064bb7b4e48ae8609feca
---
M manifests/role/statsdlb.pp
1 file changed, 18 insertions(+), 57 deletions(-)


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

diff --git a/manifests/role/statsdlb.pp b/manifests/role/statsdlb.pp
index 158433c..91d5765 100644
--- a/manifests/role/statsdlb.pp
+++ b/manifests/role/statsdlb.pp
@@ -1,8 +1,8 @@
 # == Class: role::statsdlb
 #
 # Provisions a statsdlb instance that listens for StatsD metrics on
-# on UDP port 8125 and forwards to backends on UDP ports 8126-8133,
-# as well as the set of txstatsd backends that listen on these ports.
+# on UDP port 8125 and forwards to backends on UDP ports 8126-8128,
+# as well as the set of statsite backends that listen on these ports.
 #
 class role::statsdlb {
 
@@ -10,7 +10,7 @@
 
 class { '::statsdlb':
 server_port   = 8125,
-backend_ports = range(8126, 8139),
+backend_ports = range(8126, 8128),
 }
 
 nrpe::monitor_service { 'statsdlb':
@@ -18,67 +18,28 @@
 nrpe_command  = '/usr/lib/nagios/plugins/check_procs -c 1: -C 
statsdlb',
 }
 
+class { '::statsite': }
 
-# txstatsd back-ends
-
-package { 'python-txstatsd': }
-
-file { '/etc/txstatsd':
-ensure  = directory,
-owner   = 'root',
-group   = 'root',
-mode= '0555',
-recurse = true,
-purge   = true,
-force   = true,
-source  = 'puppet:///files/txstatsd/backends',
+# statsite backends
+statsite::instance { '8126':
+port  = 8126,
+input_counter = statsd.$::hostname-8126.received,
 }
 
-file { '/etc/init/txstatsd':
-ensure  = directory,
-owner   = 'root',
-group   = 'root',
-mode= '0555',
-recurse = true,
-purge   = true,
-force   = true,
-source  = 'puppet:///files/txstatsd/init',
+statsite::instance { '8127':
+port  = 8127,
+input_counter = statsd.$::hostname-8127.received,
 }
 
-group { 'txstatsd':
-ensure = present,
+statsite::instance { '8128':
+port  = 8128,
+input_counter = statsd.$::hostname-8127.received,
 }
 
-user { 'txstatsd':
-ensure = present,
-gid= 'txstatsd',
-shell  = '/bin/false',
-home   = '/nonexistent',
-system = true,
-managehome = false,
-}
-
-file { '/usr/local/sbin/txstatsdctl':
-source = 'puppet:///files/txstatsd/txstatsdctl',
-owner  = 'root',
-group  = 'root',
-mode   = '0755',
-before = Service['txstatsd'],
-}
-
-service { 'txstatsd':
-ensure   = 'running',
-provider = 'base',
-restart  = '/usr/local/sbin/txstatsdctl restart',
-start= '/usr/local/sbin/txstatsdctl start',
-status   = '/usr/local/sbin/txstatsdctl status',
-stop = '/usr/local/sbin/txstatsdctl stop',
-}
-
-nrpe::monitor_service { 'txstatsd_backends':
-description  = 'txstatsd backend instances',
-nrpe_command = '/usr/local/sbin/txstatsdctl check',
-require  = Service['txstatsd'],
+nrpe::monitor_service { 'statsite_backends':
+description  = 'statsite backend instances',
+nrpe_command = '/sbin/statsitectl check',
+require  = Service['statsite'],
 }
 
 diamond::collector { 'UDPCollector': }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9b820b2dd221b6a61064bb7b4e48ae8609feca
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] provision graphite[12]001 - change (operations/puppet)

2015-01-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: provision graphite[12]001
..

provision graphite[12]001

Bug: T85909
Change-Id: I56f0b166310d804bf6cfac9a8cf2fda1aaef4724
---
M manifests/site.pp
1 file changed, 17 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/64/187664/1

diff --git a/manifests/site.pp b/manifests/site.pp
index ad79b3a..a2e2aac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2474,6 +2474,23 @@
 include role::performance
 }
 
+# Primary graphite machines, replacing tungsten
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
+node 'graphite2001.codfw.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
 # graphite test machine, currently with SSD caching + spinning disks
 node 'graphite1002.eqiad.wmnet' {
 include admin

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I56f0b166310d804bf6cfac9a8cf2fda1aaef4724
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] introduce graphite raid10-lvm configuration - change (operations/puppet)

2015-01-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: introduce graphite raid10-lvm configuration
..

introduce graphite raid10-lvm configuration

Bug: T85909
Change-Id: I68d13a75e443123e9d4d0ada7f9f6b20dd39fa3e
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
2 files changed, 54 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/63/187663/1

diff --git a/modules/install-server/files/autoinstall/netboot.cfg 
b/modules/install-server/files/autoinstall/netboot.cfg
index b2e4929..6848f14 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -61,7 +61,7 @@
cp1008) echo partman/raid1-varnish.cfg ;; \
d-i-test) echo partman/flat.cfg ;; \

antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
 echo partman/lvm.cfg ;; \
-   graphite[12]00*) echo partman/lvm.cfg ;; \
+   graphite[12]001) echo partman/raid10-lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/flat.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.cfg ;; \
eeden) echo partman/raid1-1partition.cfg ;; \
diff --git a/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg 
b/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
new file mode 100644
index 000..f6b81ae
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
@@ -0,0 +1,53 @@
+# Automatic software RAID 10 with LVM partitioning
+#
+# * two disks, sd[abcd]
+# * layout:
+#   - /:   ext3, RAID10, 50GB
+#   - swap:   RAID10, 1GB, on LVM
+#   - free space for the rest under RAID10/LVM
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   multiraid ::\
+   500080005   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10001000-1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   100010001000linux-swap  \
+   $defaultignore{ }   \
+   $lvmok{ } lv_name{ swap }   \
+   method{ swap }  \
+   format{ }   \
+   .
+
+# Parameters are:
+# raidtype devcount sparecount fstype mountpoint \
+#  devices sparedevices
+d-ipartman-auto-raid/recipestring  \
+   10  4   0   ext3/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   10  4   0   lvm -   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-ipartman-md/confirm_nooverwrite  boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite boolean true

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68d13a75e443123e9d4d0ada7f9f6b20dd39fa3e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

[MediaWiki-commits] [Gerrit] introduce graphite raid10-lvm configuration - change (operations/puppet)

2015-01-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: introduce graphite raid10-lvm configuration
..


introduce graphite raid10-lvm configuration

Bug: T85909
Change-Id: I68d13a75e443123e9d4d0ada7f9f6b20dd39fa3e
---
M modules/install-server/files/autoinstall/netboot.cfg
A modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
2 files changed, 54 insertions(+), 1 deletion(-)

Approvals:
  Filippo Giunchedi: Verified; 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 b2e4929..6848f14 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -61,7 +61,7 @@
cp1008) echo partman/raid1-varnish.cfg ;; \
d-i-test) echo partman/flat.cfg ;; \

antimony|arsenic|caesium|erbium|gadolinium|heze|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
 echo partman/lvm.cfg ;; \
-   graphite[12]00*) echo partman/lvm.cfg ;; \
+   graphite[12]001) echo partman/raid10-lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/flat.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.cfg ;; \
eeden) echo partman/raid1-1partition.cfg ;; \
diff --git a/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg 
b/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
new file mode 100644
index 000..00c2209
--- /dev/null
+++ b/modules/install-server/files/autoinstall/partman/raid10-lvm.cfg
@@ -0,0 +1,53 @@
+# Automatic software RAID 10 with LVM partitioning
+#
+# * four disks, sd[abcd]
+# * layout:
+#   - /:   ext3, RAID10, 50GB
+#   - swap:   RAID10, 1GB, on LVM
+#   - free space for the rest under RAID10/LVM
+
+d-ipartman-auto/method string  raid
+d-ipartman-md/device_remove_md boolean true
+d-ipartman-lvm/device_remove_lvm   boolean true
+
+d-ipartman-auto/disk   string  /dev/sda /dev/sdb /dev/sdc /dev/sdd
+
+# Define physical partitions
+d-ipartman-auto/expert_recipe  string  \
+   multiraid ::\
+   500080005   raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   10001000-1  raid\
+   $primary{ } method{ raid }  \
+   $lvmignore{ }   \
+   .   \
+   100010001000linux-swap  \
+   $defaultignore{ }   \
+   $lvmok{ } lv_name{ swap }   \
+   method{ swap }  \
+   format{ }   \
+   .
+
+# Parameters are:
+# raidtype devcount sparecount fstype mountpoint \
+#  devices sparedevices
+d-ipartman-auto-raid/recipestring  \
+   10  4   0   ext3/   \
+   /dev/sda1#/dev/sdb1#/dev/sdc1#/dev/sdd1 \
+   .   \
+   10  4   0   lvm -   \
+   /dev/sda2#/dev/sdb2#/dev/sdc2#/dev/sdd2 \
+   .
+
+d-ipartman-md/confirm  boolean true
+d-ipartman-md/confirm_nooverwrite  boolean true
+d-ipartman/confirm_write_new_label boolean true
+d-ipartman/choose_partitionselect  finish
+d-ipartman/confirm boolean true
+d-ipartman/confirm_nooverwrite boolean true
+
+d-ipartman-auto-lvm/guided_sizestring  80%
+d-ipartman-lvm/confirm boolean true
+d-ipartman-lvm/confirm_nooverwrite boolean true

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I68d13a75e443123e9d4d0ada7f9f6b20dd39fa3e
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] provision graphite[12]001 - change (operations/puppet)

2015-01-30 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has submitted this change and it was merged.

Change subject: provision graphite[12]001
..


provision graphite[12]001

Bug: T85909
Change-Id: I56f0b166310d804bf6cfac9a8cf2fda1aaef4724
---
M manifests/site.pp
1 file changed, 17 insertions(+), 0 deletions(-)

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



diff --git a/manifests/site.pp b/manifests/site.pp
index ad79b3a..a2e2aac 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2474,6 +2474,23 @@
 include role::performance
 }
 
+# Primary graphite machines, replacing tungsten
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
+node 'graphite2001.codfw.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
 # graphite test machine, currently with SSD caching + spinning disks
 node 'graphite1002.eqiad.wmnet' {
 include admin

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I56f0b166310d804bf6cfac9a8cf2fda1aaef4724
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

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

[MediaWiki-commits] [Gerrit] swift: increase rsync server max_connections - change (operations/puppet)

2015-03-23 Thread Filippo Giunchedi (Code Review)

Filippo Giunchedi has uploaded a new change for review.

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

Change subject: swift: increase rsync server max_connections
..

swift: increase rsync server max_connections

there are more machines in the fleet now, when changing weights it is likely
that max_connections is being hit

Bug: T1268
Change-Id: Icd1defe5fe6619e1c002422502ff6dafdc62d27e
---
M manifests/swift.pp
1 file changed, 1 insertion(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/97/198697/1

diff --git a/manifests/swift.pp b/manifests/swift.pp
index d77dbd1..dd817f2 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -256,7 +256,7 @@
 'object':
 uid = 'swift',
 gid = 'swift',
-max_connections = '10',
+max_connections = '13',
 path= '/srv/swift-storage/',
 read_only   = 'no',
 lock_file   = '/var/lock/object.lock',

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Icd1defe5fe6619e1c002422502ff6dafdc62d27e
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org

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

< 2 3 4 5 6 7 8 9 10 11 >

601 - 700 of 3587 matches

Mail list logo