[MediaWiki-commits] [Gerrit] txstatsd: gather runtime self metrics under statsd - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174675
Change subject: txstatsd: gather runtime self metrics under statsd
..
txstatsd: gather runtime self metrics under statsd
this gets rid of top-level txstatsd metrics and put them under common statsd/
one this is rolled out we can backfill previous data with whisper-fill
from https://github.com/jssjr/carbonate
Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
---
M manifests/role/swift.pp
M manifests/role/txstatsd.pp
2 files changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/75/174675/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 80e0193..39522ba 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -121,6 +121,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -142,6 +143,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -256,6 +258,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -275,6 +278,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -424,6 +428,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -465,6 +470,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index 4bfcc40..f485c3b 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -15,6 +15,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
--
To view, visit https://gerrit.wikimedia.org/r/174675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
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] merge job timing stats together - change (integration/zuul)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174691
Change subject: merge job timing stats together
..
merge job timing stats together
having per-status job timings yields too many metrics, particularly because
statsd will emit derived metrics for timings (percentiles, min/max, etc)
Change-Id: I7cfc876e134d51fbc6f969bfec5b87f21cb26517
---
M zuul/scheduler.py
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/zuul
refs/changes/91/174691/1
diff --git a/zuul/scheduler.py b/zuul/scheduler.py
index 2cd4d46..08c11bd 100644
--- a/zuul/scheduler.py
+++ b/zuul/scheduler.py
@@ -502,12 +502,12 @@
try:
if statsd and build.pipeline:
jobname = build.job.name.replace('.', '_')
-key = 'zuul.pipeline.%s.job.%s.%s' % (build.pipeline.name,
- jobname, build.result)
+key = 'zuul.pipeline.%s.job.%s' % (build.pipeline.name,
+ jobname)
if build.result in ['SUCCESS', 'FAILURE'] and build.start_time:
dt = int((build.end_time - build.start_time) * 1000)
statsd.timing(key, dt)
-statsd.incr(key)
+statsd.incr(key + '.' + build.result)
key = 'zuul.pipeline.%s.all_jobs' % build.pipeline.name
statsd.incr(key)
except:
--
To view, visit https://gerrit.wikimedia.org/r/174691
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7cfc876e134d51fbc6f969bfec5b87f21cb26517
Gerrit-PatchSet: 1
Gerrit-Project: integration/zuul
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] syslog: deprecate /home/wikipedia/syslog - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: syslog: deprecate /home/wikipedia/syslog
..
syslog: deprecate /home/wikipedia/syslog
on lithium it is already a symlink to /srv/syslog
Change-Id: Id0b34433ad9d5da2ba40d0fed5b8dd7160f21185
---
M manifests/misc/logging.pp
M manifests/role/syslog.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
Alexandros Kosiaris: Looks good to me, approved
diff --git a/manifests/misc/logging.pp b/manifests/misc/logging.pp
index aeb6fc7..6a3a9436 100644
--- a/manifests/misc/logging.pp
+++ b/manifests/misc/logging.pp
@@ -11,7 +11,7 @@
# $basepath - Path where to write logs to, without trailing slash.
# Default: '/home/wikipedia/syslog'
#
-class misc::syslog-server($config='nfs', $basepath='/home/wikipedia/syslog') {
+class misc::syslog-server($config='nfs', $basepath='/srv/syslog') {
system::role { 'misc::syslog-server': description = central syslog
server (${config}) }
diff --git a/manifests/role/syslog.pp b/manifests/role/syslog.pp
index a55163e..3fc7987 100644
--- a/manifests/role/syslog.pp
+++ b/manifests/role/syslog.pp
@@ -9,7 +9,7 @@
class { 'misc::syslog-server':
config = 'nfs',
-basepath = '/home/wikipedia/syslog',
+basepath = '/srv/syslog',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/174673
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id0b34433ad9d5da2ba40d0fed5b8dd7160f21185
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: Hashar has...@free.fr
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] install-server: add swift cache partition - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174932
Change subject: install-server: add swift cache partition
..
install-server: add swift cache partition
Shrink root and partitions holding container databases, a fourth partition will
be raid1 and used to provide ssd block caching via bcache.
Root shrinks from 50GB to 30GB, our current utilization is ~27% (i.e. 15G).
Container database partition changes from 90G min to 60G min (120G max),
rationale being that some machines have 256G SSD and some 150G SSD, yet the
same weight in swift. This should accomodate growth on larger SSD while
allowing decent caching on small SSD. Container partition utilization is on
average ~20G (was ~16G beginning of June) so it isn't expected to grow fast
(we'll likely run out of storage space first anyway).
Another option would be to raid1 the two SSDs and switch to lvm to host root,
swap and the cache. That however seems overkill, the bits we really care about
are the partitions holding container databases (sdn3/sdm3) and those will need
to live off raid/lvm anyway.
Note that if caching turns out later to be ineffective, we can drop the fourth
partition in place and grow sdn3/sdm3 back.
Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/32/174932/1
diff --git a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
index 6597b9d..f63ebd9 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -22,16 +22,19 @@
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 6 80006 raid\
+ 3 80003 raid\
$primary{ } method{ raid } \
. \
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 -1 xfs \
+ 6 500 12 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ . \
+ 3 1 -1 raid\
+ $primary{ } method{ raid } \
.
# Parameters are:
@@ -43,6 +46,9 @@
. \
1 2 0 swap- \
/dev/sdm2#/dev/sdn2 \
+ . \
+ 1 2 0 none- \
+ /dev/sdm4#/dev/sdn4 \
.
d-ipartman-md/confirm boolean true
--
To view, visit https://gerrit.wikimedia.org/r/174932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
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] txstatsd: gather runtime self metrics under statsd - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: txstatsd: gather runtime self metrics under statsd
..
txstatsd: gather runtime self metrics under statsd
this gets rid of top-level txstatsd metrics and put them under common statsd/
(at the moment swift machines are pushing their stats to top-level)
once this is rolled out we can backfill previous data with whisper-fill
from https://github.com/jssjr/carbonate
Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
---
M manifests/role/swift.pp
M manifests/role/txstatsd.pp
2 files changed, 7 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 80e0193..39522ba 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -121,6 +121,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -142,6 +143,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -256,6 +258,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -275,6 +278,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -424,6 +428,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
@@ -465,6 +470,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
diff --git a/manifests/role/txstatsd.pp b/manifests/role/txstatsd.pp
index 4bfcc40..f485c3b 100644
--- a/manifests/role/txstatsd.pp
+++ b/manifests/role/txstatsd.pp
@@ -15,6 +15,7 @@
'prefix' = '',
'max-queue-size' = 1000 * 1000,
'max-datapoints-per-message' = 10 * 1000,
+'instance-name' = statsd.${::hostname},
},
},
}
--
To view, visit https://gerrit.wikimedia.org/r/174675
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie05a49bcfb7e9fbc1e2b493bbfe301e84dc35fe2
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
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: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw: provision ms-be 2013/2014/2015 - change (operations/dns)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175416
Change subject: codfw: provision ms-be 2013/2014/2015
..
codfw: provision ms-be 2013/2014/2015
RT #8804
Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/16/175416/1
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8c973a5..08eb2d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2409,6 +2409,7 @@
27 1H IN PTR es2005.codfw.wmnet.
28 1H IN PTR es2006.codfw.wmnet.
29 1H IN PTR es2007.codfw.wmnet.
+30 1H IN PTR ms-be2013.codfw.wmnet.
$ORIGIN 1.192.{{ zonename }}.
1 1H IN PTR lvs2001.codfw.wmnet.
@@ -2458,6 +2459,7 @@
29 1H IN PTR es2008.codfw.wmnet.
30 1H IN PTR es2009.codfw.wmnet.
31 1H IN PTR es2010.codfw.wmnet.
+32 1H IN PTR ms-be2014.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
@@ -2496,6 +2498,7 @@
15 1H IN PTR ms-be2010.codfw.wmnet.
16 1H IN PTR ms-be2011.codfw.wmnet.
17 1H IN PTR ms-be2012.codfw.wmnet.
+18 1H IN PTR ms-be2015.codfw.wmnet.
$ORIGIN 33.192.{{ zonename }}.
1 1H IN PTR vl2019-eth2.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index da25518..b1c09f2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2082,6 +2082,9 @@
ms-be2010 1H IN A10.192.32.15
ms-be2011 1H IN A10.192.32.16
ms-be2012 1H IN A10.192.32.17
+ms-be2013 1H IN A10.192.0.30
+ms-be2014 1H IN A10.192.16.32
+ms-be2015 1H IN A10.192.32.18
ms-fe2001 1H IN A10.192.0.23
ms-fe2002 1H IN A10.192.0.24
ms-fe2003 1H IN A10.192.16.25
--
To view, visit https://gerrit.wikimedia.org/r/175416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
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] codfw: provision ms-be 2013/2014/2015 - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: codfw: provision ms-be 2013/2014/2015
..
codfw: provision ms-be 2013/2014/2015
RT #8804
Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 6 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
RobH: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 8c973a5..08eb2d1 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2409,6 +2409,7 @@
27 1H IN PTR es2005.codfw.wmnet.
28 1H IN PTR es2006.codfw.wmnet.
29 1H IN PTR es2007.codfw.wmnet.
+30 1H IN PTR ms-be2013.codfw.wmnet.
$ORIGIN 1.192.{{ zonename }}.
1 1H IN PTR lvs2001.codfw.wmnet.
@@ -2458,6 +2459,7 @@
29 1H IN PTR es2008.codfw.wmnet.
30 1H IN PTR es2009.codfw.wmnet.
31 1H IN PTR es2010.codfw.wmnet.
+32 1H IN PTR ms-be2014.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
@@ -2496,6 +2498,7 @@
15 1H IN PTR ms-be2010.codfw.wmnet.
16 1H IN PTR ms-be2011.codfw.wmnet.
17 1H IN PTR ms-be2012.codfw.wmnet.
+18 1H IN PTR ms-be2015.codfw.wmnet.
$ORIGIN 33.192.{{ zonename }}.
1 1H IN PTR vl2019-eth2.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index da25518..b1c09f2 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2082,6 +2082,9 @@
ms-be2010 1H IN A10.192.32.15
ms-be2011 1H IN A10.192.32.16
ms-be2012 1H IN A10.192.32.17
+ms-be2013 1H IN A10.192.0.30
+ms-be2014 1H IN A10.192.16.32
+ms-be2015 1H IN A10.192.32.18
ms-fe2001 1H IN A10.192.0.23
ms-fe2002 1H IN A10.192.0.24
ms-fe2003 1H IN A10.192.16.25
--
To view, visit https://gerrit.wikimedia.org/r/175416
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1039b9c06327ae2370fe6b2669e3d024684c6faf
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: RobH 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] install-server add ms-be 2013/14/15 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175437
Change subject: install-server add ms-be 2013/14/15
..
install-server add ms-be 2013/14/15
Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 15 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/37/175437/1
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 30f6662..9783e68 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2096,6 +2096,21 @@
fixed-address ms-be2012.codfw.wmnet;
}
+host ms-be2013 {
+ hardware ethernet 54:9F:35:08:4A:18;
+ fixed-address ms-be2013.codfw.wmnet;
+}
+
+host ms-be2014 {
+ hardware ethernet 54:9F:35:08:38:10;
+ fixed-address ms-be2014.codfw.wmnet;
+}
+
+host ms-be2015 {
+ hardware ethernet 54:9F:35:08:40:F0;
+ fixed-address ms-be2015.codfw.wmnet;
+}
+
host ms-be3001 {
hardware ethernet 24:B6:FD:F6:13:AC;
fixed-address ms-be3001.esams.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/175437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
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 add ms-be 2013/2014/2015 - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: install-server add ms-be 2013/2014/2015
..
install-server add ms-be 2013/2014/2015
RT #8804
Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 15 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 30f6662..9783e68 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -2096,6 +2096,21 @@
fixed-address ms-be2012.codfw.wmnet;
}
+host ms-be2013 {
+ hardware ethernet 54:9F:35:08:4A:18;
+ fixed-address ms-be2013.codfw.wmnet;
+}
+
+host ms-be2014 {
+ hardware ethernet 54:9F:35:08:38:10;
+ fixed-address ms-be2014.codfw.wmnet;
+}
+
+host ms-be2015 {
+ hardware ethernet 54:9F:35:08:40:F0;
+ fixed-address ms-be2015.codfw.wmnet;
+}
+
host ms-be3001 {
hardware ethernet 24:B6:FD:F6:13:AC;
fixed-address ms-be3001.esams.wmnet;
--
To view, visit https://gerrit.wikimedia.org/r/175437
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I11f974055dba5746956c2e5fe23e69711813a9ee
Gerrit-PatchSet: 4
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] install-server: add swift cache partition - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: install-server: add swift cache partition
..
install-server: add swift cache partition
Shrink root and partitions holding container databases, a fourth partition will
be raid1 and used to provide ssd block caching via bcache.
Root shrinks from 50GB to 30GB, our current utilization is ~27% (i.e. 15G).
Container database partition changes from 90G min to 60G min (120G max),
rationale being that some machines have 256G SSD and some 150G SSD, yet the
same weight in swift. This should accomodate growth on larger SSD while
allowing decent caching on small SSD. Container partition utilization is on
average ~20G (was ~16G beginning of June) so it isn't expected to grow fast
(we'll likely run out of storage space first anyway).
Another option would be to raid1 the two SSDs and switch to lvm to host root,
swap and the cache. That however seems overkill, the bits we really care about
are the partitions holding container databases (sdn3/sdm3) and those will need
to live off raid/lvm anyway.
Note that if caching turns out later to be ineffective, we can drop the fourth
partition in place and grow sdn3/sdm3 back.
Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
---
M modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
1 file changed, 8 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
Faidon Liambotis: Looks good to me, but someone else must approve
diff --git a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
index 6597b9d..f63ebd9 100644
--- a/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
+++ b/modules/install-server/files/autoinstall/partman/ms-be-eqiad.cfg
@@ -22,16 +22,19 @@
# Define physical partitions
d-ipartman-auto/expert_recipe string \
multiraid ::\
- 6 80006 raid\
+ 3 80003 raid\
$primary{ } method{ raid } \
. \
100010001000raid\
$primary{ } method{ raid } \
. \
- 100 500 -1 xfs \
+ 6 500 12 xfs \
$primary{ } method{ format }\
format{ } use_filesystem{ } \
filesystem{ xfs } \
+ . \
+ 3 1 -1 raid\
+ $primary{ } method{ raid } \
.
# Parameters are:
@@ -43,6 +46,9 @@
. \
1 2 0 swap- \
/dev/sdm2#/dev/sdn2 \
+ . \
+ 1 2 0 none- \
+ /dev/sdm4#/dev/sdn4 \
.
d-ipartman-md/confirm boolean true
--
To view, visit https://gerrit.wikimedia.org/r/174932
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifc4ff408611868c405d64e605b040072494f7de6
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: Faidon Liambotis fai...@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] first generate the rings, then the dumps - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/175731 Change subject: first generate the rings, then the dumps .. first generate the rings, then the dumps otherwise the dumps won't reflect reality Change-Id: If8f8baf5dc8f57ffab2ec64bfaf0dbda0908c280 --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/31/175731/1 diff --git a/Makefile b/Makefile index 8fab645..c819363 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ RING_FILES=$(foreach builder,$(BUILDER_FILES),$(subst .builder,.ring.gz,$(builder))) DUMP_FILES=$(foreach builder,$(BUILDER_FILES),$(subst .builder,.dump,$(builder))) -rebuild: $(DUMP_FILES) $(RING_FILES) +rebuild: $(RING_FILES) $(DUMP_FILES) %.dump: %.builder swift-ring-builder $^ $@ -- To view, visit https://gerrit.wikimedia.org/r/175731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If8f8baf5dc8f57ffab2ec64bfaf0dbda0908c280 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] codfw-prod: add ms-be2014 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/175730 Change subject: codfw-prod: add ms-be2014 .. codfw-prod: add ms-be2014 test with bcache, the first six disks have bcache enabled (sda-sdf) Change-Id: Iff61bc94173073948719637ebcb275b53dafe0dd --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 214 insertions(+), 198 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/30/175730/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 99d1e59..ec7f7fe 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 59c6231..bd57758 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,28 +1,30 @@ -codfw-prod/account.builder, build version 26 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 24 devices, 0.00 balance +codfw-prod/account.builder, build version 29 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 81920.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 81920.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 81920.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 81920.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 81920.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 81920.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 81920.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 81920.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 81920.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 81920.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 81920.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 81920.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 81920.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 81920.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 81920.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 81920.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 81920.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 81920.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 81920.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 81920.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 81920.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 81920.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 81920.00 + 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 77700.00 + 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 77700.00 + 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 77700.00 + 3 1 210.192.16.21 6002
[MediaWiki-commits] [Gerrit] first generate the rings, then the dumps - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: first generate the rings, then the dumps .. first generate the rings, then the dumps otherwise the dumps won't reflect reality Change-Id: If8f8baf5dc8f57ffab2ec64bfaf0dbda0908c280 --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/Makefile b/Makefile index 8fab645..c819363 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ RING_FILES=$(foreach builder,$(BUILDER_FILES),$(subst .builder,.ring.gz,$(builder))) DUMP_FILES=$(foreach builder,$(BUILDER_FILES),$(subst .builder,.dump,$(builder))) -rebuild: $(DUMP_FILES) $(RING_FILES) +rebuild: $(RING_FILES) $(DUMP_FILES) %.dump: %.builder swift-ring-builder $^ $@ -- To view, visit https://gerrit.wikimedia.org/r/175731 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If8f8baf5dc8f57ffab2ec64bfaf0dbda0908c280 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-ring Gerrit-Branch: master 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] codfw-prod: add ms-be2014 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: add ms-be2014 .. codfw-prod: add ms-be2014 test with bcache, the first six disks have bcache enabled (sda-sdf) Change-Id: Iff61bc94173073948719637ebcb275b53dafe0dd --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 214 insertions(+), 198 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 99d1e59..ec7f7fe 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 59c6231..bd57758 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,28 +1,30 @@ -codfw-prod/account.builder, build version 26 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 24 devices, 0.00 balance +codfw-prod/account.builder, build version 29 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 81920.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 81920.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 81920.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 81920.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 81920.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 81920.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 81920.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 81920.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 81920.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 81920.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 81920.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 81920.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 81920.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 81920.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 81920.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 81920.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 81920.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 81920.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 81920.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 81920.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 81920.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 81920.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 81920.00 + 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 77700.00 + 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 77700.00 + 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 77700.00 + 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 77700.00
[MediaWiki-commits] [Gerrit] add privacy disclaimer - change (labs/private)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/175969 Change subject: add privacy disclaimer .. add privacy disclaimer Change-Id: I44efbae205fdc7a9a9babf55e75ac9953b9e9d40 --- A THIS_REPOSITORY_IS_NOT_PRIVATE 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/labs/private refs/changes/69/175969/1 diff --git a/THIS_REPOSITORY_IS_NOT_PRIVATE b/THIS_REPOSITORY_IS_NOT_PRIVATE new file mode 12 index 000..100b938 --- /dev/null +++ b/THIS_REPOSITORY_IS_NOT_PRIVATE @@ -0,0 +1 @@ +README \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/175969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I44efbae205fdc7a9a9babf55e75ac9953b9e9d40 Gerrit-PatchSet: 1 Gerrit-Project: labs/private 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] jheapdump: gdb-based heap dump for JVM - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/170996
Change subject: jheapdump: gdb-based heap dump for JVM
..
jheapdump: gdb-based heap dump for JVM
Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515
---
A modules/elasticsearch/files/jheapdump
M modules/elasticsearch/manifests/init.pp
2 files changed, 80 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/96/170996/1
diff --git a/modules/elasticsearch/files/jheapdump
b/modules/elasticsearch/files/jheapdump
new file mode 100644
index 000..acbfeae
--- /dev/null
+++ b/modules/elasticsearch/files/jheapdump
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Copyright 2014 Filippo Giunchedi fgiunch...@wikimedia.org
+# Copyright 2014 Wikimedia Foundation
+
+set -e
+set -u
+
+pid=${1:-}
+path=${2:-}
+
+function usage_exit() {
+ echo usage: $0 PID BASE_NAME
+ echo capture a core from PID into BASE_NAME.core.PID
+ echo and extract java heap dump into BASE_NAME.hprof.PID
+ exit 1
+}
+
+if [ -z $pid -o -z $path ]; then
+ usage_exit
+fi
+
+jmap=${JMAP:-$(command -vp jmap)}
+gcore=${GCORE:-$(command -vp gcore)}
+java=${JAVA:-$(command -vp java)}
+
+if [ -z $jmap -o -z $gcore -o -z $java ]; then
+ echo jmap or gcore or java not found
+ usage_exit
+fi
+
+if [ -d $path ]; then
+ echo BASE_NAME can't be a directory
+ usage_exit
+fi
+
+core_path=${path}.core.${pid}
+heap_path=${path}.hprof.${pid}
+jmap_options=-dump:format=b,file=${heap_path}
+# remove trailing .${pid}
+gcore_options=-o ${core_path%*.${pid}}
+
+# XXX check disk space
+if [ ! -e $core_path ]; then
+ echo dumping core from ${pid} into ${core_path}
+ echo WARNING: this file can get very big!
+ echo make sure there is enough disk space available
+ sudo ${gcore} ${gcore_options} ${pid}
+fi
+
+if [ ! -e $heap_path ]; then
+ echo writing heap profile to ${heap_path}
+ sudo ${jmap} ${jmap_options} ${java} ${core_path}
+fi
+
+echo done.
+
+echo NOTE: the core file at ${core_path}, if unused remove with:
+echo sudo rm ${core_path}
diff --git a/modules/elasticsearch/manifests/init.pp
b/modules/elasticsearch/manifests/init.pp
index 0e05ea9..a7499cf 100644
--- a/modules/elasticsearch/manifests/init.pp
+++ b/modules/elasticsearch/manifests/init.pp
@@ -122,6 +122,13 @@
mode= '0444',
source = 'puppet:///modules/elasticsearch/logrotate',
}
+file { '/usr/local/bin/jheapdump':
+ensure = file,
+owner = root,
+group = root,
+mode= '0555',
+source = 'puppet:///modules/elasticsearch/jheapdump',
+}
# Note that we don't notify the Elasticsearch service of changes to its
# config files because you need to be somewhat careful when restarting it.
# So, for now at least, we'll be restarting it manually.
--
To view, visit https://gerrit.wikimedia.org/r/170996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515
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 graphite-related CNAMEs - change (operations/dns)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/171525 Change subject: add graphite-related CNAMEs .. add graphite-related CNAMEs rationale being: carbon-relay while being technically correct isn't what one would think about when thinking about graphite (I think). The -in is to distinguish the fact that this endpoint should be used to send datapoints to graphite (as opposed to using the api or the web interface). Change-Id: Id3bc2b4c9fb46742c0d86e22b404f889627f4c92 --- M templates/wmnet 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/25/171525/1 diff --git a/templates/wmnet b/templates/wmnet index 985b425..5ffb377 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -28,6 +28,8 @@ webproxy1H IN CNAMEcarbon.wikimedia.org. zuul1H IN CNAMEgallium.wikimedia.org. carbon-relay1H IN CNAMEtungsten.eqiad.wmnet. +graphite1H IN CNAMEtungsten.eqiad.wmnet. +graphite-in 1H IN CNAMEtungsten.eqiad.wmnet. config-master 1H IN CNAMEpalladium.eqiad.wmnet. statsd 1H IN CNAMEtungsten.eqiad.wmnet. eventlogging1H IN CNAMEvanadium.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/171525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id3bc2b4c9fb46742c0d86e22b404f889627f4c92 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] swift: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171547
Change subject: swift: report statsd data to localhost
..
swift: report statsd data to localhost
swift statsd traffic seems to account for = 50% of the statsd traffic, thus
driving txstatsd cpu usage very high on tungsten. A more reasonable solution is
to have statsd locally and let txstatsd push it to tungsten.
NOTE: this works only because the swift metrics are per-machine, and thus don't
need to get aggregated across machines in a central statsd
Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c
---
M hieradata/codfw.yaml
M manifests/role/swift.pp
M modules/swift_new/manifests/params.pp
3 files changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/47/171547/1
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 72807ef..3468965 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -29,9 +29,9 @@
#search_backup: key
swift_new::hash_path_suffix: 'de4227064232ed08'
-swift_new::storage::statsd_host: 'statsd.eqiad.wmnet'
+swift_new::storage::statsd_host: 'localhost'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
-swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
+swift_new::proxy::statsd_host: 'localhost'
swift_new::proxy::backend_url_format: 'sitelang'
swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
swift_new::proxy::dispersion_account: 'dispersion'
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index e136030..75a2efe 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -358,6 +358,14 @@
memcached_port = '11211',
}
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = ${::swift_new::params::graphite_host},
+},
+},
+}
+
monitor_service { 'swift-http-frontend':
description = 'Swift HTTP frontend',
check_command =
check_http_url!${swift_check_http_host}!/monitoring/frontend,
@@ -385,6 +393,14 @@
include ::swift_new::container_sync
include ::swift_new::storage::monitoring
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = ${::swift_new::params::graphite_host},
+},
+},
+}
+
$all_drives = hiera('swift_storage_drives')
swift_new::init_device { $all_drives:
diff --git a/modules/swift_new/manifests/params.pp
b/modules/swift_new/manifests/params.pp
index a946632..c41c6f7 100644
--- a/modules/swift_new/manifests/params.pp
+++ b/modules/swift_new/manifests/params.pp
@@ -4,6 +4,7 @@
$account_keys = {},
$replication_accounts = {},
$replication_keys = {},
+ $graphite_host = 'graphite-in.eqiad.wmnet',
) {
# Noop class
}
--
To view, visit https://gerrit.wikimedia.org/r/171547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c
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] txstatsd: add graphite-carbon dependency - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/171557
Change subject: txstatsd: add graphite-carbon dependency
..
txstatsd: add graphite-carbon dependency
Change-Id: I2071e061fd61bb74ed4fef2458045c7ea44e0827
---
M modules/txstatsd/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/171557/1
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 09943f0..3917a5b 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-package { [ 'python-txstatsd', 'python-twisted-web' ]: }
+package { [ 'python-txstatsd', 'python-twisted-web', 'graphite-carbon' ]: }
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/171557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2071e061fd61bb74ed4fef2458045c7ea44e0827
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] jenkins: use openjdk-7-jre-headless - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: jenkins: use openjdk-7-jre-headless
..
jenkins: use openjdk-7-jre-headless
Set java to version 7 by using Debian 'alternatives' system. That would
make Jenkins start using it.
It is not needed on Jenkins slaves since the Java version to use is
configured in Jenkins.
For jobs, the list of JDK to use is configured in the global Jenkins
configuration and does not depends on Debian alternatives system.
Impact:
- have to restart Jenkins on gallium.wikimedia.org and ensure it works
fine after.
Change-Id: I7cb798611b2880bf75037397cb3889cde880ad10
---
M modules/jenkins/manifests/init.pp
M modules/jenkins/manifests/slave/requisites.pp
2 files changed, 12 insertions(+), 4 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/jenkins/manifests/init.pp
b/modules/jenkins/manifests/init.pp
index 58d8cef..c55fd9e 100644
--- a/modules/jenkins/manifests/init.pp
+++ b/modules/jenkins/manifests/init.pp
@@ -2,11 +2,20 @@
require jenkins::user
require jenkins::group
+# We want to run Jenkins under Java 7.
+ensure_packages(['openjdk-7-jre-headless'])
+
+alternatives::select { 'java':
+path= '/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java',
+require = Package['openjdk-7-jre-headless'],
+}
+
# Upgrades are usually done manually by upload the Jenkins
# package at apt.wikimedia.org then restarting jenkins and
# double checking everything went fine.
package { 'jenkins':
-ensure = present,
+ensure = present,
+require = Package['openjdk-7-jre-headless'],
}
# Graphiz on Jenkins master for the 'job dependency graph' plugin
@@ -82,6 +91,7 @@
group = 'root',
mode = '0444',
source = 'puppet:///modules/jenkins/etc_default_jenkins',
+require = Package['openjdk-7-jre-headless'],
}
}
diff --git a/modules/jenkins/manifests/slave/requisites.pp
b/modules/jenkins/manifests/slave/requisites.pp
index 8e85be8..1137410 100644
--- a/modules/jenkins/manifests/slave/requisites.pp
+++ b/modules/jenkins/manifests/slave/requisites.pp
@@ -4,8 +4,6 @@
#
class jenkins::slave::requisites() {
-package { 'openjdk-7-jre-headless':
-ensure = present,
-}
+ensure_packages(['openjdk-7-jre-headless'])
}
--
To view, visit https://gerrit.wikimedia.org/r/153764
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7cb798611b2880bf75037397cb3889cde880ad10
Gerrit-PatchSet: 3
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: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] add graphite-related CNAMEs - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged. Change subject: add graphite-related CNAMEs .. add graphite-related CNAMEs rationale being: carbon-relay while being technically correct isn't what one would think about when thinking about graphite (I think). The -in is to distinguish the fact that this endpoint should be used to send datapoints to graphite (as opposed to using the api or the web interface). Change-Id: Id3bc2b4c9fb46742c0d86e22b404f889627f4c92 --- M templates/wmnet 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Alexandros Kosiaris: Looks good to me, approved diff --git a/templates/wmnet b/templates/wmnet index 985b425..5ffb377 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -28,6 +28,8 @@ webproxy1H IN CNAMEcarbon.wikimedia.org. zuul1H IN CNAMEgallium.wikimedia.org. carbon-relay1H IN CNAMEtungsten.eqiad.wmnet. +graphite1H IN CNAMEtungsten.eqiad.wmnet. +graphite-in 1H IN CNAMEtungsten.eqiad.wmnet. config-master 1H IN CNAMEpalladium.eqiad.wmnet. statsd 1H IN CNAMEtungsten.eqiad.wmnet. eventlogging1H IN CNAMEvanadium.eqiad.wmnet. -- To view, visit https://gerrit.wikimedia.org/r/171525 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id3bc2b4c9fb46742c0d86e22b404f889627f4c92 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: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] txstatsd: add graphite-carbon dependency - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: txstatsd: add graphite-carbon dependency
..
txstatsd: add graphite-carbon dependency
Change-Id: I2071e061fd61bb74ed4fef2458045c7ea44e0827
---
M modules/txstatsd/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 09943f0..3917a5b 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-package { [ 'python-txstatsd', 'python-twisted-web' ]: }
+package { [ 'python-txstatsd', 'python-twisted-web', 'graphite-carbon' ]: }
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/171557
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2071e061fd61bb74ed4fef2458045c7ea44e0827
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] carbon-c-relay: add debian packaging - change (operations...carbon-c-relay)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172228
Change subject: carbon-c-relay: add debian packaging
..
carbon-c-relay: add debian packaging
Enhanced C implementation of Carbon relay, aggregator and rewriter.
Initially, the idea is to be able to mirror carbon traffic to another host for
testing purposes. Going forward it can be used to provide HA, testing and so
on.
Change-Id: I1a48a09b485dfa6010f46bae24b24d43683172f6
---
A debian/carbon-c-relay.conf
A debian/carbon-c-relay.dirs
A debian/carbon-c-relay.docs
A debian/carbon-c-relay.install
A debian/carbon-c-relay.lintian-overrides
A debian/carbon-c-relay.service
A debian/carbon-c-relay.upstart
A debian/changelog
A debian/clean
A debian/compat
A debian/control
A debian/copyright
A debian/postinst
A debian/rules
A debian/source/format
15 files changed, 119 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/debs/carbon-c-relay
refs/changes/28/172228/1
diff --git a/debian/carbon-c-relay.conf b/debian/carbon-c-relay.conf
new file mode 100644
index 000..f470578
--- /dev/null
+++ b/debian/carbon-c-relay.conf
@@ -0,0 +1,16 @@
+# example configuration scenarios.
+# Refer to /usr/share/doc/carbon-c-relay/README.md.gz for additional examples!
+
+## mirror all incoming metrics towards two destinations
+#cluster send-through
+# forward
+#host1:2003
+#host2:2003
+# ;
+#
+#match * send to send-through;
+
+## send all incoming metrics to the first responsive host
+#cluster send-to-any-one
+# any_of host1:2003 host2:2003;
+#match * send to send-to-any-one;
diff --git a/debian/carbon-c-relay.dirs b/debian/carbon-c-relay.dirs
new file mode 100644
index 000..6bac063
--- /dev/null
+++ b/debian/carbon-c-relay.dirs
@@ -0,0 +1 @@
+/var/lib/carbon-c-relay
diff --git a/debian/carbon-c-relay.docs b/debian/carbon-c-relay.docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/carbon-c-relay.docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/carbon-c-relay.install b/debian/carbon-c-relay.install
new file mode 100644
index 000..45bfc65
--- /dev/null
+++ b/debian/carbon-c-relay.install
@@ -0,0 +1,2 @@
+carbon-c-relay usr/bin
+debian/carbon-c-relay.conf /etc
diff --git a/debian/carbon-c-relay.lintian-overrides
b/debian/carbon-c-relay.lintian-overrides
new file mode 100644
index 000..90311ac
--- /dev/null
+++ b/debian/carbon-c-relay.lintian-overrides
@@ -0,0 +1,4 @@
+# the package is shipping only upstart and systemd scripts, however the init
+# script is mentioned in postinst
+carbon-c-relay: init.d-script-not-included-in-package etc/init.d/carbon-c-relay
+carbon-c-relay: init.d-script-not-marked-as-conffile etc/init.d/carbon-c-relay
diff --git a/debian/carbon-c-relay.service b/debian/carbon-c-relay.service
new file mode 100644
index 000..96c557e
--- /dev/null
+++ b/debian/carbon-c-relay.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=carbon relay C implementation
+
+[Service]
+User=carbon-c-relay
+ExecStart=/usr/bin/carbon-c-relay -f /etc/carbon-c-relay.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/debian/carbon-c-relay.upstart b/debian/carbon-c-relay.upstart
new file mode 100644
index 000..cbe9254
--- /dev/null
+++ b/debian/carbon-c-relay.upstart
@@ -0,0 +1,10 @@
+description carbon relay C implementation
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on [!12345]
+
+limit nofile 32768 32768
+
+setuid carbon-c-relay
+
+exec /usr/bin/carbon-c-relay -f /etc/carbon-c-relay.conf
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..37ef623
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+carbon-c-relay (0.36-1) UNRELEASED; urgency=medium
+
+ * Initial release.
+
+ -- Filippo Giunchedi fili...@wikimedia.org Fri, 07 Nov 2014 15:48:03 +
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 000..c58b7be
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1 @@
+carbon-c-relay
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..b23f25d
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,20 @@
+Source: carbon-c-relay
+Section: net
+Priority: optional
+Maintainer: Filippo Giunchedi fili...@wikimedia.org
+Build-Depends: debhelper (= 9), dh-systemd, libssl-dev, pkg-config
+Standards-Version: 3.9.6
+X-Python-Version: = 2.7
+
+Package: carbon-c-relay
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Carbon-like graphite line mode relay
+ This project aims to be a replacement of graphite's original carbon-relay
+ component.
+ .
+ This project provides a multithreaded relay which can address multiple targets
+ and clusters for each and every metric based on pattern matches.
+ Consistent-hash routing compatible with the original
[MediaWiki-commits] [Gerrit] txstats/graphite: fix package conflict, use require_package - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172261
Change subject: txstats/graphite: fix package conflict, use require_package
..
txstats/graphite: fix package conflict, use require_package
Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
---
M modules/graphite/manifests/init.pp
M modules/txstatsd/manifests/init.pp
2 files changed, 2 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/61/172261/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 2353804..ea69ff8 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,8 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-package { 'graphite-carbon': }
-package { 'python-whisper': }
+require_package(['graphite-carbon', 'python-whisper'])
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 3917a5b..9d080e9 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-package { [ 'python-txstatsd', 'python-twisted-web', 'graphite-carbon' ]: }
+require_package(['python-txstatsd', 'python-twisted-web',
'graphite-carbon'])
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
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] txstats/graphite: fix package conflict, use require_package - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: txstats/graphite: fix package conflict, use require_package
..
txstats/graphite: fix package conflict, use require_package
Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 3 insertions(+), 5 deletions(-)
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/init.pp
b/modules/graphite/manifests/init.pp
index 2353804..ea69ff8 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,8 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-package { 'graphite-carbon': }
-package { 'python-whisper': }
+require_package(['graphite-carbon', 'python-whisper'])
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index f94e8b3..8d286ea 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,8 +45,7 @@
) {
include ::graphite
-package { [ 'memcached', 'python-memcache' ]: }
-package { 'graphite-web': }
+require_package(['memcached', 'python-memcache', 'graphite-web'])
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 3917a5b..9d080e9 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-package { [ 'python-txstatsd', 'python-twisted-web', 'graphite-carbon' ]: }
+require_package(['python-txstatsd', 'python-twisted-web',
'graphite-carbon'])
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172261
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7dd5ad5d7437ee36ad056aa72a8f05153524cd2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@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] work around puppet function arity issues - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172266
Change subject: work around puppet function arity issues
..
work around puppet function arity issues
passing an explicit array to a function will change the function arity, thus
making require_package fail:
Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
undefined method `tr' for [graphite-carbon, python-whisper]:Array at
/etc/puppet/modules/graphite/manifests/init.pp:17 on node tungsten.eqiad.wmnet
Warning: Not using cache on failed catalog
Error: Could not retrieve catalog; skipping run
Change-Id: I89ca6edae9764f36303860a980ae15d56fc77c55
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 6 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/66/172266/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index ea69ff8..c794be3 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,8 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package(['graphite-carbon', 'python-whisper'])
+$deps = ['graphite-carbon', 'python-whisper']
+require_package($deps)
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index 8d286ea..cff5f7d 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,7 +45,8 @@
) {
include ::graphite
-require_package(['memcached', 'python-memcache', 'graphite-web'])
+$deps = ['memcached', 'python-memcache', 'graphite-web']
+require_package($deps)
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 9d080e9..59e88c1 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,8 @@
# }
#
class txstatsd($settings) {
-require_package(['python-txstatsd', 'python-twisted-web',
'graphite-carbon'])
+$deps = ['python-txstatsd', 'python-twisted-web', 'graphite-carbon']
+require_package($deps)
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I89ca6edae9764f36303860a980ae15d56fc77c55
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] work around puppet function arity issues - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: work around puppet function arity issues
..
work around puppet function arity issues
passing an explicit array to a function will change the function arity, thus
making require_package fail:
Error: Could not retrieve catalog from remote server: Error 400 on SERVER:
undefined method `tr' for [graphite-carbon, python-whisper]:Array at
/etc/puppet/modules/graphite/manifests/init.pp:17 on node tungsten.eqiad.wmnet
Warning: Not using cache on failed catalog
Error: Could not retrieve catalog; skipping run
Change-Id: I89ca6edae9764f36303860a980ae15d56fc77c55
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index ea69ff8..c794be3 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,8 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package(['graphite-carbon', 'python-whisper'])
+$deps = ['graphite-carbon', 'python-whisper']
+require_package($deps)
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index 8d286ea..cff5f7d 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,7 +45,8 @@
) {
include ::graphite
-require_package(['memcached', 'python-memcache', 'graphite-web'])
+$deps = ['memcached', 'python-memcache', 'graphite-web']
+require_package($deps)
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 9d080e9..59e88c1 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,8 @@
# }
#
class txstatsd($settings) {
-require_package(['python-txstatsd', 'python-twisted-web',
'graphite-carbon'])
+$deps = ['python-txstatsd', 'python-twisted-web', 'graphite-carbon']
+require_package($deps)
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I89ca6edae9764f36303860a980ae15d56fc77c55
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] fix require_package documentation and txstatsd/graphite usage - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172270
Change subject: fix require_package documentation and txstatsd/graphite usage
..
fix require_package documentation and txstatsd/graphite usage
Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
4 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/172270/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index c794be3..6502af7 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,8 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-$deps = ['graphite-carbon', 'python-whisper']
-require_package($deps)
+require_package('graphite-carbon', 'python-whisper')
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index cff5f7d..1572609 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,8 +45,7 @@
) {
include ::graphite
-$deps = ['memcached', 'python-memcache', 'graphite-web']
-require_package($deps)
+require_package('memcached', 'python-memcache', 'graphite-web')
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 59e88c1..5df52c0 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,8 +23,7 @@
# }
#
class txstatsd($settings) {
-$deps = ['python-txstatsd', 'python-twisted-web', 'graphite-carbon']
-require_package($deps)
+require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 91d69cd..6ff2578 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -13,10 +13,6 @@
# # Multiple packages as arguments
# require_package('redis-server', 'python-redis')
#
-# # Multiple packages as array
-# $deps = [ 'redis-server', 'python-redis' ]
-# require_package($deps)
-#
module Puppet::Parser::Functions
newfunction(:require_package, :arity = -2) do |args|
args.each do |package_name|
--
To view, visit https://gerrit.wikimedia.org/r/172270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c
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] fix require_package documentation and txstatsd/graphite usage - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: fix require_package documentation and txstatsd/graphite usage
..
fix require_package documentation and txstatsd/graphite usage
Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
M modules/wmflib/lib/puppet/parser/functions/require_package.rb
4 files changed, 3 insertions(+), 10 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index c794be3..6502af7 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,8 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-$deps = ['graphite-carbon', 'python-whisper']
-require_package($deps)
+require_package('graphite-carbon', 'python-whisper')
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index cff5f7d..1572609 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,8 +45,7 @@
) {
include ::graphite
-$deps = ['memcached', 'python-memcache', 'graphite-web']
-require_package($deps)
+require_package('memcached', 'python-memcache', 'graphite-web')
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 59e88c1..5df52c0 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,8 +23,7 @@
# }
#
class txstatsd($settings) {
-$deps = ['python-txstatsd', 'python-twisted-web', 'graphite-carbon']
-require_package($deps)
+require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
diff --git a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
index 91d69cd..6ff2578 100644
--- a/modules/wmflib/lib/puppet/parser/functions/require_package.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/require_package.rb
@@ -13,10 +13,6 @@
# # Multiple packages as arguments
# require_package('redis-server', 'python-redis')
#
-# # Multiple packages as array
-# $deps = [ 'redis-server', 'python-redis' ]
-# require_package($deps)
-#
module Puppet::Parser::Functions
newfunction(:require_package, :arity = -2) do |args|
args.each do |package_name|
--
To view, visit https://gerrit.wikimedia.org/r/172270
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icb2ff1e3b66d9b0a447b07cc313c9e5dc09d857c
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] elasticsearch: disable noisy check_elasticsearch - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172527
Change subject: elasticsearch: disable noisy check_elasticsearch
..
elasticsearch: disable noisy check_elasticsearch
this check is based on ES cluster status != green, which is too sensitive e.g.
when moving shards around the cluster goes red.
its replacement checks the percentage of shards that are moving and alerts
according to a threshold, which has proven much less noisy
Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f
---
M modules/elasticsearch/manifests/nagios/check.pp
1 file changed, 0 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/172527/1
diff --git a/modules/elasticsearch/manifests/nagios/check.pp
b/modules/elasticsearch/manifests/nagios/check.pp
index 3d63f9d..f16769f 100644
--- a/modules/elasticsearch/manifests/nagios/check.pp
+++ b/modules/elasticsearch/manifests/nagios/check.pp
@@ -4,11 +4,6 @@
# the elasticsearch::nagios::plugin class.
#
class elasticsearch::nagios::check {
-monitor_service { 'elasticsearch':
-check_command = 'check_elasticsearch',
-description = 'ElasticSearch health check',
-}
-
monitor_service { 'elasticsearch shards':
check_command = 'check_elasticsearch_shards',
description = 'ElasticSearch health check for shards',
--
To view, visit https://gerrit.wikimedia.org/r/172527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f
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] jheapdump: gdb-based heap dump for JVM - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: jheapdump: gdb-based heap dump for JVM
..
jheapdump: gdb-based heap dump for JVM
create a java::tools class to include this tool since it might get used
elsewhere beside elasticsearch module
Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515
---
M modules/elasticsearch/manifests/packages.pp
A modules/java/files/jheapdump
A modules/java/manifests/tools.pp
3 files changed, 96 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Manybubbles: Looks good to me, but someone else must approve
diff --git a/modules/elasticsearch/manifests/packages.pp
b/modules/elasticsearch/manifests/packages.pp
index 4886476..98b0dab 100644
--- a/modules/elasticsearch/manifests/packages.pp
+++ b/modules/elasticsearch/manifests/packages.pp
@@ -3,6 +3,8 @@
# Provisions Elasticsearch package and dependencies.
#
class elasticsearch::packages {
+include ::java::tools
+
if ! defined ( Package['openjdk-7-jdk'] ) {
package { 'openjdk-7-jdk':
ensure = 'present',
diff --git a/modules/java/files/jheapdump b/modules/java/files/jheapdump
new file mode 100644
index 000..acbfeae
--- /dev/null
+++ b/modules/java/files/jheapdump
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Copyright 2014 Filippo Giunchedi fgiunch...@wikimedia.org
+# Copyright 2014 Wikimedia Foundation
+
+set -e
+set -u
+
+pid=${1:-}
+path=${2:-}
+
+function usage_exit() {
+ echo usage: $0 PID BASE_NAME
+ echo capture a core from PID into BASE_NAME.core.PID
+ echo and extract java heap dump into BASE_NAME.hprof.PID
+ exit 1
+}
+
+if [ -z $pid -o -z $path ]; then
+ usage_exit
+fi
+
+jmap=${JMAP:-$(command -vp jmap)}
+gcore=${GCORE:-$(command -vp gcore)}
+java=${JAVA:-$(command -vp java)}
+
+if [ -z $jmap -o -z $gcore -o -z $java ]; then
+ echo jmap or gcore or java not found
+ usage_exit
+fi
+
+if [ -d $path ]; then
+ echo BASE_NAME can't be a directory
+ usage_exit
+fi
+
+core_path=${path}.core.${pid}
+heap_path=${path}.hprof.${pid}
+jmap_options=-dump:format=b,file=${heap_path}
+# remove trailing .${pid}
+gcore_options=-o ${core_path%*.${pid}}
+
+# XXX check disk space
+if [ ! -e $core_path ]; then
+ echo dumping core from ${pid} into ${core_path}
+ echo WARNING: this file can get very big!
+ echo make sure there is enough disk space available
+ sudo ${gcore} ${gcore_options} ${pid}
+fi
+
+if [ ! -e $heap_path ]; then
+ echo writing heap profile to ${heap_path}
+ sudo ${jmap} ${jmap_options} ${java} ${core_path}
+fi
+
+echo done.
+
+echo NOTE: the core file at ${core_path}, if unused remove with:
+echo sudo rm ${core_path}
diff --git a/modules/java/manifests/tools.pp b/modules/java/manifests/tools.pp
new file mode 100644
index 000..61c6273
--- /dev/null
+++ b/modules/java/manifests/tools.pp
@@ -0,0 +1,21 @@
+# == Class: java::tools
+#
+# This class aims at providing convenience tools to be used on systems where
+# java (JRE or JDK) is installed.
+
+class java::tools {
+if ! defined ( Package['gdb'] ) {
+package { 'gdb':
+ensure = present
+}
+}
+
+# NOTE jmap is used, thus requiring a jdk to be installed
+file { '/usr/local/bin/jheapdump':
+ensure = file,
+owner = root,
+group = root,
+mode= '0555',
+source = 'puppet:///modules/java/jheapdump',
+}
+}
--
To view, visit https://gerrit.wikimedia.org/r/170996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7fc40ff5a0ebd29824f9dbf76bf3d989343ce515
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Ottomata 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] swift: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: report statsd data to localhost
..
swift: report statsd data to localhost
swift statsd traffic seems to account for = 50% of the statsd traffic, thus
driving txstatsd cpu usage very high on tungsten. A more reasonable solution is
to have statsd locally and let txstatsd push it to tungsten.
NOTE: this works only because the swift metrics are per-machine, and thus don't
need to get aggregated across machines in a central statsd
Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c
---
M hieradata/codfw.yaml
M manifests/role/swift.pp
M modules/swift_new/manifests/params.pp
3 files changed, 19 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/hieradata/codfw.yaml b/hieradata/codfw.yaml
index 72807ef..3468965 100644
--- a/hieradata/codfw.yaml
+++ b/hieradata/codfw.yaml
@@ -29,9 +29,9 @@
#search_backup: key
swift_new::hash_path_suffix: 'de4227064232ed08'
-swift_new::storage::statsd_host: 'statsd.eqiad.wmnet'
+swift_new::storage::statsd_host: 'localhost'
swift_new::proxy::proxy_address: 'http://ms-fe.svc.codfw.wmnet'
-swift_new::proxy::statsd_host: 'statsd.eqiad.wmnet'
+swift_new::proxy::statsd_host: 'localhost'
swift_new::proxy::backend_url_format: 'sitelang'
swift_new::proxy::rewrite_thumb_server: 'rendering.svc.eqiad.wmnet'
swift_new::proxy::dispersion_account: 'dispersion'
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 8a94de4..55e315b 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -358,6 +358,14 @@
memcached_port = '11211',
}
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = ${::swift_new::params::graphite_host},
+},
+},
+}
+
monitor_service { 'swift-http-frontend':
description = 'Swift HTTP frontend',
check_command =
check_http_url!${swift_check_http_host}!/monitoring/frontend,
@@ -385,6 +393,14 @@
include ::swift_new::container_sync
include ::swift_new::storage::monitoring
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = ${::swift_new::params::graphite_host},
+},
+},
+}
+
$all_drives = hiera('swift_storage_drives')
swift_new::init_device { $all_drives:
diff --git a/modules/swift_new/manifests/params.pp
b/modules/swift_new/manifests/params.pp
index a946632..c41c6f7 100644
--- a/modules/swift_new/manifests/params.pp
+++ b/modules/swift_new/manifests/params.pp
@@ -4,6 +4,7 @@
$account_keys = {},
$replication_accounts = {},
$replication_keys = {},
+ $graphite_host = 'graphite-in.eqiad.wmnet',
) {
# Noop class
}
--
To view, visit https://gerrit.wikimedia.org/r/171547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia95564b1b2950d16d44c347e1a612ef5b079822c
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: Faidon Liambotis fai...@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/graphite: switch back to package - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172546
Change subject: txstatsd/graphite: switch back to package
..
txstatsd/graphite: switch back to package
require_package interacts badly (with require = Package[]?) and makes puppet
fail non-deterministically (!) on hosts, revert back to package. note this
means that txstatsd is missing python-carbon dependency when installed on
hosts that don't include graphite.
Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/46/172546/1
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 6502af7..a27918a 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package('graphite-carbon', 'python-whisper')
+package { ['graphite-carbon', 'python-whisper']: }
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index 1572609..9de4aba 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,7 +45,7 @@
) {
include ::graphite
-require_package('memcached', 'python-memcache', 'graphite-web')
+package { ['memcached', 'python-memcache', 'graphite-web']: }
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 5df52c0..1b8923f 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
+package { ['python-txstatsd', 'python-twisted-web']: }
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
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: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172549
Change subject: swift: report statsd data to localhost
..
swift: report statsd data to localhost
this is similar to Ia95564b1b but for the legacy swift puppet module/role in
eqiad and esams
Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
---
M manifests/role/swift.pp
M manifests/swift.pp
2 files changed, 35 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/49/172549/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 55e315b..3cdc702 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -84,7 +84,7 @@
}
class proxy inherits role::swift::eqiad-prod {
class { '::swift::proxy':
-statsd_host = 'statsd.eqiad.wmnet',
+statsd_host = 'localhost',
statsd_metric_prefix = swift.eqiad-prod.${::hostname},
bind_port= '80',
proxy_address= 'http://ms-fe.eqiad.wmnet',
@@ -110,6 +110,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
class storage inherits role::swift::eqiad-prod {
include ::swift::storage
@@ -117,6 +125,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
}
class esams-prod inherits role::swift::base {
@@ -195,7 +211,7 @@
}
class proxy inherits role::swift::esams-prod {
class { '::swift::proxy':
-statsd_host = 'statsd.eqiad.wmnet',
+statsd_host = 'localhost',
statsd_metric_prefix = swift.esams-prod.${::hostname},
bind_port= '80',
proxy_address= 'http://ms-fe.esams.wmnet',
@@ -217,11 +233,27 @@
host = 'ms-fe.esams.wmnet',
}
include role::swift::icehouse
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
class storage inherits role::swift::esams-prod {
include ::swift::storage
include ::swift::storage::monitoring
include role::swift::icehouse
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
}
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 84ccb19..13b7e5c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -228,7 +228,7 @@
}
class config (
-$statsd_host = 'statsd.eqiad.wmnet',
+$statsd_host = 'localhost',
$statsd_metric_prefix =
swift.${::swift::base::cluster_name}.${::hostname}
){
require swift::storage::packages
--
To view, visit https://gerrit.wikimedia.org/r/172549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
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] txstatsd/graphite: switch back to package - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: txstatsd/graphite: switch back to package
..
txstatsd/graphite: switch back to package
require_package interacts badly (with require = Package[]?) and makes puppet
fail non-deterministically (!) on hosts, revert back to package. note this
means that txstatsd is missing python-carbon dependency when installed on
hosts that don't include graphite.
Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
---
M modules/graphite/manifests/init.pp
M modules/graphite/manifests/web.pp
M modules/txstatsd/manifests/init.pp
3 files changed, 3 insertions(+), 3 deletions(-)
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/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 6502af7..a27918a 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -14,7 +14,7 @@
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package('graphite-carbon', 'python-whisper')
+package { ['graphite-carbon', 'python-whisper']: }
$carbon_service_defaults = {
log_updates = false,
diff --git a/modules/graphite/manifests/web.pp
b/modules/graphite/manifests/web.pp
index 1572609..9de4aba 100644
--- a/modules/graphite/manifests/web.pp
+++ b/modules/graphite/manifests/web.pp
@@ -45,7 +45,7 @@
) {
include ::graphite
-require_package('memcached', 'python-memcache', 'graphite-web')
+package { ['memcached', 'python-memcache', 'graphite-web']: }
file { '/etc/graphite/cors.py':
source = 'puppet:///modules/graphite/cors.py',
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index 5df52c0..1b8923f 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -23,7 +23,7 @@
# }
#
class txstatsd($settings) {
-require_package('python-txstatsd', 'python-twisted-web', 'graphite-carbon')
+package { ['python-txstatsd', 'python-twisted-web']: }
file { '/etc/init/txstatsd.conf':
source = 'puppet:///modules/txstatsd/txstatsd.conf',
--
To view, visit https://gerrit.wikimedia.org/r/172546
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib66958e3b2f24b93d8779e9283e2daee435f74e7
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: Giuseppe Lavagetto glavage...@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] add privacy disclaimer - change (labs/private)
Filippo Giunchedi has submitted this change and it was merged. Change subject: add privacy disclaimer .. add privacy disclaimer Change-Id: I44efbae205fdc7a9a9babf55e75ac9953b9e9d40 --- A THIS_REPOSITORY_IS_NOT_PRIVATE 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Hashar: Looks good to me, but someone else must approve Alexandros Kosiaris: Looks good to me, approved diff --git a/THIS_REPOSITORY_IS_NOT_PRIVATE b/THIS_REPOSITORY_IS_NOT_PRIVATE new file mode 12 index 000..100b938 --- /dev/null +++ b/THIS_REPOSITORY_IS_NOT_PRIVATE @@ -0,0 +1 @@ +README \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/175969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I44efbae205fdc7a9a9babf55e75ac9953b9e9d40 Gerrit-PatchSet: 1 Gerrit-Project: labs/private Gerrit-Branch: master Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org Gerrit-Reviewer: BBlack bbl...@wikimedia.org Gerrit-Reviewer: Chad ch...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2013 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/176231 Change subject: codfw-prod: add ms-be2013 .. codfw-prod: add ms-be2013 Change-Id: I7844775a72b727792979aae3e95bf50df35d1585 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 230 insertions(+), 214 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/31/176231/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index ec7f7fe..9f7 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index bd57758..9e9c054 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,30 +1,32 @@ -codfw-prod/account.builder, build version 29 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 balance +codfw-prod/account.builder, build version 32 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 77700.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 77700.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 77700.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 77700.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 77700.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 77700.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 77700.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 77700.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 77700.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 77700.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 77700.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 77700.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 77700.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 77700.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 77700.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 77700.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 77700.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 77700.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 77700.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 77700.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 77700.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 77700.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 77700.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 77700.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 5064 -0.06 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 5064 -0.06 + 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 73890.00 + 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 73890.00 +
[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2013 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: add ms-be2013 .. codfw-prod: add ms-be2013 Change-Id: I7844775a72b727792979aae3e95bf50df35d1585 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 230 insertions(+), 214 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index ec7f7fe..9f7 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index bd57758..9e9c054 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,30 +1,32 @@ -codfw-prod/account.builder, build version 29 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 26 devices, 0.06 balance +codfw-prod/account.builder, build version 32 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 77700.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 77700.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 77700.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 77700.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 77700.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 77700.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 77700.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 77700.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 77700.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 77700.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 77700.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 77700.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 77700.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 77700.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 77700.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 77700.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 77700.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 77700.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 77700.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 77700.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 77700.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 77700.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 77700.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 77700.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 5064 -0.06 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 5064 -0.06 + 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 73890.00 + 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 73890.00 + 2 1 210.192.16.21 600210.192.16.21
[MediaWiki-commits] [Gerrit] make deploy safer by default, require DESTHOST - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/176233
Change subject: make deploy safer by default, require DESTHOST
..
make deploy safer by default, require DESTHOST
this should avoid accidentally typing make deploy and triggering a deploy,
require DESTHOST instead and update README
Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
---
M Makefile
M README.md
2 files changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring
refs/changes/33/176233/1
diff --git a/Makefile b/Makefile
index c819363..d238ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTHOST=palladium.eqiad.wmnet
+DESTHOST=
TARGETS=eqiad-prod esams-prod codfw-prod
BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder))
@@ -17,6 +17,7 @@
# TODO(fgiunchedi): rsync HEAD, not the working tree
deploy:
+ [ -n $(DESTHOST) ] || { echo 'set DESTHOST to deploy'; exit 1; }
rsync --progress --verbose --archive --compress --relative \
$(RING_FILES) $(BUILDER_FILES) $(DESTHOST):swift-ring
ssh $(DESTHOST) sudo rsync --verbose --backup --recursive \
diff --git a/README.md b/README.md
index fac67d8..29e2e7f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
review
* Once merged, deploy the rings to the puppet master:
-make deploy
+make deploy DESTHOST=puppet.eqiad.wmnet
Testing
--
To view, visit https://gerrit.wikimedia.org/r/176233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
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 deploy safer by default, require DESTHOST - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: make deploy safer by default, require DESTHOST
..
make deploy safer by default, require DESTHOST
this should avoid accidentally typing make deploy and triggering a deploy,
require DESTHOST instead and update README
Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
---
M Makefile
M README.md
2 files changed, 3 insertions(+), 2 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/Makefile b/Makefile
index c819363..d238ce8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DESTHOST=palladium.eqiad.wmnet
+DESTHOST=
TARGETS=eqiad-prod esams-prod codfw-prod
BUILDER_FILES=$(foreach dir,$(TARGETS),$(wildcard $(dir)/*.builder))
@@ -17,6 +17,7 @@
# TODO(fgiunchedi): rsync HEAD, not the working tree
deploy:
+ [ -n $(DESTHOST) ] || { echo 'set DESTHOST to deploy'; exit 1; }
rsync --progress --verbose --archive --compress --relative \
$(RING_FILES) $(BUILDER_FILES) $(DESTHOST):swift-ring
ssh $(DESTHOST) sudo rsync --verbose --backup --recursive \
diff --git a/README.md b/README.md
index fac67d8..29e2e7f 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@
review
* Once merged, deploy the rings to the puppet master:
-make deploy
+make deploy DESTHOST=puppet.eqiad.wmnet
Testing
--
To view, visit https://gerrit.wikimedia.org/r/176233
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I633a1aea460b444efde0cad589ac7d00a2c5daf3
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-ring
Gerrit-Branch: master
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] codfw-prod: add ms-be2015 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/176239 Change subject: codfw-prod: add ms-be2015 .. codfw-prod: add ms-be2015 Change-Id: Ib659b7f7e4a90e5d9e7e269793e19020c2eb8956 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 246 insertions(+), 230 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/39/176239/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 9f7..7870f63 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 9e9c054..74dcc5c 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,32 +1,34 @@ -codfw-prod/account.builder, build version 32 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 balance +codfw-prod/account.builder, build version 35 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 73890.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 73890.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 73890.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 73890.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 73890.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 73890.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 73890.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 73890.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 73890.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 73890.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 73890.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 73890.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 73890.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 73890.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 73890.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 73890.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 73890.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 73890.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 73890.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 73890.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 73890.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 73890.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 73890.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 73890.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 4818 -0.02 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 4818 -0.02 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 60.00 4818 -0.02 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 60.00 4818 -0.02 +
[MediaWiki-commits] [Gerrit] codfw-prod: add ms-be2015 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: add ms-be2015 .. codfw-prod: add ms-be2015 Change-Id: Ib659b7f7e4a90e5d9e7e269793e19020c2eb8956 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 246 insertions(+), 230 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 9f7..7870f63 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 9e9c054..74dcc5c 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,32 +1,34 @@ -codfw-prod/account.builder, build version 32 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 28 devices, 0.02 balance +codfw-prod/account.builder, build version 35 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 73890.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 73890.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 73890.00 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 73890.00 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 73890.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 73890.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 73890.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 73890.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 73890.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 73890.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 73890.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 73890.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 73890.00 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 73890.00 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 73890.00 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 73890.00 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 73890.00 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 73890.00 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 73890.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 73890.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 73890.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 73890.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 73890.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 73890.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 4818 -0.02 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 4818 -0.02 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 60.00 4818 -0.02 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 60.00 4818 -0.02 + 0 1 1 10.192.0.19 6002 10.192.0.19
[MediaWiki-commits] [Gerrit] import debian/ directory - change (operations...python-diamond)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: import debian/ directory
..
import debian/ directory
this is a replaced version of upstream's to better fit recent standards
the patches are maintained in a separate patch-queue/master branch and some are
due to be sent upstream too
Change-Id: I54de8fd3152c657b682f87785ec267f6e82f4bb6
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/diamond.conf
A debian/diamond.init
A debian/diamond.install
A debian/diamond.service
A debian/diamond.upstart
A debian/dirs
A debian/gbp.conf
A debian/patches/0001-clean-version-artifacts-in-make-clean.patch
A debian/patches/0002-numa.py-use-usr-bin-env.patch
A debian/patches/0003-numa-use-bin-true-in-tests.patch
A debian/patches/0004-make-dseopscenter-test-pass.patch
A debian/patches/0005-disable-failing-kafka-test.patch
A debian/patches/0006-remove-distro-detection-from-setup.py.patch
A debian/patches/0007-add-transitional-dastatsd.patch
A debian/patches/series
A debian/postinst
A debian/rules
A debian/source/format
22 files changed, 843 insertions(+), 0 deletions(-)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..9b440ff
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,7 @@
+diamond (3.5-1wmf1) trusty; urgency=medium
+
+ * Import upstream 3.5
++ do not import debian/ directory from upstream, replace with our own
+ * Add transitional package python-diamond
+
+ -- Filippo Giunchedi fili...@wikimedia.org Wed, 15 Oct 2014 16:17:36 +0100
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..7ba5d0e
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,25 @@
+Source: diamond
+Section: python
+Priority: optional
+Maintainer: Filippo Giunchedi fili...@wikimedia.org
+Build-Depends: debhelper (= 9), python-all (= 2.7), python-mock,
python-configobj, dh-python, dh-systemd
+Standards-Version: 3.9.6
+X-Python-Version: = 2.7
+
+Package: diamond
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-configobj, adduser
+Provides: ${python:Provides}, python-diamond
+Replaces: python-diamond (= 3.4)
+Breaks: python-diamond (= 3.4)
+Description: System statistics collector for Graphite
+ Diamond is a daemon and toolset for gathering system statistics
+ and publishing them to Graphite.
+
+Package: python-diamond
+Architecture: all
+Depends: diamond
+Priority: extra
+Section: oldlibs
+Description: transitional package for diamond
+ This is a transitional package for diamond, it can be safely removed.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..65ece65
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,35 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: diamond
+Upstream-Contact: diamond mailing list diam...@librelist.com
+Source: https://github.com/BrightcoveOS/Diamond
+
+Files: *
+Copyright: 2010-2012 by Brightcove Inc.http://www.brightcove.com/
+ 2011-2012 by Ivan Pouzyrevsky
+ 2011-2012 by Rob Smith http://www.kormoc.com
+ 2012 Wijnand Modderman-Lenstra https://maze.io/
+License: MIT
+
+Files: debian/*
+Copyright: 2014 Filippo Giunchedi fgiunch...@wikimedia.org
+ 2014 Wikimedia Foundation
+License: MIT
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the Software), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/debian/diamond.conf b/debian/diamond.conf
new file mode 100644
index 000..a0b69d3
--- /dev/null
+++ b/debian/diamond.conf
@@ -0,0 +1,227 @@
+
+# Diamond Configuration File
+
+
[MediaWiki-commits] [Gerrit] add LICENSE - change (operations...swift-utils)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/179137 Change subject: add LICENSE .. add LICENSE Change-Id: Idd745f2d6fd200bd3a53fd1e021ee9fccbc9 --- A LICENSE 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-utils refs/changes/37/179137/1 diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..444c7ba --- /dev/null +++ b/LICENSE @@ -0,0 +1,16 @@ +Copyright (C) 2014 Filippo Giunchedi fili...@wikimedia.org + 2014 Wikimedia Foundation + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- To view, visit https://gerrit.wikimedia.org/r/179137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idd745f2d6fd200bd3a53fd1e021ee9fccbc9 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-utils 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] add LICENSE - change (operations...swift-utils)
Filippo Giunchedi has submitted this change and it was merged. Change subject: add LICENSE .. add LICENSE Change-Id: Idd745f2d6fd200bd3a53fd1e021ee9fccbc9 --- A LICENSE 1 file changed, 16 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/LICENSE b/LICENSE new file mode 100644 index 000..444c7ba --- /dev/null +++ b/LICENSE @@ -0,0 +1,16 @@ +Copyright (C) 2014 Filippo Giunchedi fili...@wikimedia.org + 2014 Wikimedia Foundation + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -- To view, visit https://gerrit.wikimedia.org/r/179137 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idd745f2d6fd200bd3a53fd1e021ee9fccbc9 Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-utils Gerrit-Branch: master 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] mwprof: use graphite-in.eqiad.wmnet - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/179164
Change subject: mwprof: use graphite-in.eqiad.wmnet
..
mwprof: use graphite-in.eqiad.wmnet
this is in preparation to moving graphite to a machine with SSD.
NOTE: there seem to be a local modification on tungsten running
hhvm-profiler-to-carbon which isn't in puppet
Change-Id: Ib821481f826132c3dd5428643ab400fc81aadd43
---
M manifests/role/mwprof.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/64/179164/1
diff --git a/manifests/role/mwprof.pp b/manifests/role/mwprof.pp
index d123f18..8b4dd92 100644
--- a/manifests/role/mwprof.pp
+++ b/manifests/role/mwprof.pp
@@ -4,6 +4,7 @@
#
class role::mwprof {
class { '::mwprof':
+carbon_host= 'graphite-in.eqiad.wmnet',
collector_port = 3811,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/179164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib821481f826132c3dd5428643ab400fc81aadd43
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] mwprof: use graphite-in.eqiad.wmnet - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: mwprof: use graphite-in.eqiad.wmnet
..
mwprof: use graphite-in.eqiad.wmnet
this is in preparation to moving graphite to a machine with SSD.
NOTE: there seem to be a local modification on tungsten running
hhvm-profiler-to-carbon which isn't in puppet
Change-Id: Ib821481f826132c3dd5428643ab400fc81aadd43
---
M manifests/role/mwprof.pp
1 file changed, 1 insertion(+), 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/mwprof.pp b/manifests/role/mwprof.pp
index d123f18..8b4dd92 100644
--- a/manifests/role/mwprof.pp
+++ b/manifests/role/mwprof.pp
@@ -4,6 +4,7 @@
#
class role::mwprof {
class { '::mwprof':
+carbon_host= 'graphite-in.eqiad.wmnet',
collector_port = 3811,
}
}
--
To view, visit https://gerrit.wikimedia.org/r/179164
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib821481f826132c3dd5428643ab400fc81aadd43
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] send log to stdout with upstart and systemd - change (operations...python-diamond)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/179423 Change subject: send log to stdout with upstart and systemd .. send log to stdout with upstart and systemd Change-Id: I7d46f8d2d09a8a32a4bb5ba6630c09e40a744570 --- M debian/changelog M debian/diamond.service M debian/diamond.upstart 3 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/python-diamond refs/changes/23/179423/1 diff --git a/debian/changelog b/debian/changelog index 718fdc3..4bb2dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +diamond (3.5-3) trusty; urgency=medium + + * Send log to stdout with upstart and systemd + + -- Filippo Giunchedi fili...@wikimedia.org Fri, 12 Dec 2014 10:10:51 + + diamond (3.5-2) trusty; urgency=medium * Fix upgrade path from older python-diamond package. diff --git a/debian/diamond.service b/debian/diamond.service index 63f855a..8d569da 100644 --- a/debian/diamond.service +++ b/debian/diamond.service @@ -3,7 +3,7 @@ [Service] User=diamond -ExecStart=/usr/bin/diamond --foreground --skip-fork --skip-pidfile +ExecStart=/usr/bin/diamond --foreground --skip-fork --skip-pidfile --log-stdout [Install] WantedBy=multi-user.target diff --git a/debian/diamond.upstart b/debian/diamond.upstart index 0d97169..6652481 100644 --- a/debian/diamond.upstart +++ b/debian/diamond.upstart @@ -9,4 +9,4 @@ setuid diamond -exec /usr/bin/diamond --foreground --skip-fork $DAEMON_ARGS +exec /usr/bin/diamond --foreground --skip-fork --log-stdout $DAEMON_ARGS -- To view, visit https://gerrit.wikimedia.org/r/179423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7d46f8d2d09a8a32a4bb5ba6630c09e40a744570 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-diamond 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] codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/179437 Change subject: codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 .. codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 Change-Id: If85762b840b6ebafc9dea7f4da3fc25f2ad71b75 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 6 files changed, 64 insertions(+), 64 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/37/179437/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 8de8c1a..85f0796 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index b4c47be..e8e5e84 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 45 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance +codfw-prod/account.builder, build version 52 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 0.04 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 81920.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 8168 -0.29 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 8168 -0.29 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 81920.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 81920.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 81920.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 81920.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 81920.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 81920.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 81920.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 81920.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 8168 -0.29 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 8168 -0.29 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 8167 -0.31 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 8168 -0.29 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 8167 -0.31 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 8168 -0.29 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 81920.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 81920.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 81920.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 81920.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 81920.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 81920.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 0.00 96 999.99 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 0.00 98 999.99 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 0.00 00.00 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 0.00 00.00 -28
[MediaWiki-commits] [Gerrit] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/179436 Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I26c765571ea15622c23419969f43cefb2cd7b7b1 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 5 files changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/36/179436/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 5ad9f25..8de8c1a 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 8cfdb2a..b4c47be 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,4 +1,4 @@ -codfw-prod/account.builder, build version 43 +codfw-prod/account.builder, build version 45 65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta diff --git a/codfw-prod/container.builder b/codfw-prod/container.builder index 97e3907..b0e6ab8 100644 --- a/codfw-prod/container.builder +++ b/codfw-prod/container.builder Binary files differ diff --git a/codfw-prod/container.dump b/codfw-prod/container.dump index cf8699a..59c7d5f 100644 --- a/codfw-prod/container.dump +++ b/codfw-prod/container.dump @@ -1,11 +1,11 @@ -codfw-prod/container.builder, build version 43 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance +codfw-prod/container.builder, build version 46 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 0.00 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta 0 1 1 10.192.0.19 6001 10.192.0.19 6001 sdm3 92.00 81920.00 1 1 1 10.192.0.19 6001 10.192.0.19 6001 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600110.192.16.21 6001 sdm3 92.00 8166 -0.32 - 3 1 210.192.16.21 600110.192.16.21 6001 sdn3 92.00 8166 -0.32 + 2 1 210.192.16.21 600110.192.16.21 6001 sdm3 92.00 81920.00 + 3 1 210.192.16.21 600110.192.16.21 6001 sdn3 92.00 81920.00 4 1 310.192.32.14 600110.192.32.14 6001 sdm3 92.00 81920.00 5 1 310.192.32.14 600110.192.32.14 6001 sdn3 92.00 81920.00 6 1 1 10.192.0.20 6001 10.192.0.20 6001 sdm3 92.00 81920.00 @@ -14,20 +14,20 @@ 9 1 1 10.192.0.21 6001 10.192.0.21 6001 sdn3 92.00 81920.00 10 1 1 10.192.0.22 6001 10.192.0.22 6001 sdm3 92.00 81920.00 11 1 1 10.192.0.22 6001 10.192.0.22 6001 sdn3 92.00 81920.00 -12 1 210.192.16.22 600110.192.16.22 6001 sdm3 92.00 8166 -0.32 -13 1 210.192.16.22 600110.192.16.22 6001 sdn3 92.00 8166 -0.32 -14 1 210.192.16.23 600110.192.16.23 6001 sdm3 92.00 8166 -0.32 -15 1 210.192.16.23 600110.192.16.23 6001 sdn3 92.00 8166 -0.32 -16 1 210.192.16.24 600110.192.16.24 6001 sdm3 92.00 8166 -0.32 -17 1 210.192.16.24 600110.192.16.24 6001 sdn3 92.00 8166 -0.32 +12 1 210.192.16.22 600110.192.16.22 6001 sdm3 92.00 81920.00 +13 1 210.192.16.22 600110.192.16.22 6001 sdn3 92.00 81920.00 +14 1 210.192.16.23 600110.192.16.23 6001 sdm3 92.00 81920.00 +15 1 210.192.16.23 600110.192.16.23 6001 sdn3 92.00
[MediaWiki-commits] [Gerrit] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I26c765571ea15622c23419969f43cefb2cd7b7b1 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 5 files changed, 13 insertions(+), 13 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 5ad9f25..8de8c1a 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 8cfdb2a..b4c47be 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,4 +1,4 @@ -codfw-prod/account.builder, build version 43 +codfw-prod/account.builder, build version 45 65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta diff --git a/codfw-prod/container.builder b/codfw-prod/container.builder index 97e3907..b0e6ab8 100644 --- a/codfw-prod/container.builder +++ b/codfw-prod/container.builder Binary files differ diff --git a/codfw-prod/container.dump b/codfw-prod/container.dump index cf8699a..59c7d5f 100644 --- a/codfw-prod/container.dump +++ b/codfw-prod/container.dump @@ -1,11 +1,11 @@ -codfw-prod/container.builder, build version 43 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance +codfw-prod/container.builder, build version 46 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 0.00 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta 0 1 1 10.192.0.19 6001 10.192.0.19 6001 sdm3 92.00 81920.00 1 1 1 10.192.0.19 6001 10.192.0.19 6001 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600110.192.16.21 6001 sdm3 92.00 8166 -0.32 - 3 1 210.192.16.21 600110.192.16.21 6001 sdn3 92.00 8166 -0.32 + 2 1 210.192.16.21 600110.192.16.21 6001 sdm3 92.00 81920.00 + 3 1 210.192.16.21 600110.192.16.21 6001 sdn3 92.00 81920.00 4 1 310.192.32.14 600110.192.32.14 6001 sdm3 92.00 81920.00 5 1 310.192.32.14 600110.192.32.14 6001 sdn3 92.00 81920.00 6 1 1 10.192.0.20 6001 10.192.0.20 6001 sdm3 92.00 81920.00 @@ -14,20 +14,20 @@ 9 1 1 10.192.0.21 6001 10.192.0.21 6001 sdn3 92.00 81920.00 10 1 1 10.192.0.22 6001 10.192.0.22 6001 sdm3 92.00 81920.00 11 1 1 10.192.0.22 6001 10.192.0.22 6001 sdn3 92.00 81920.00 -12 1 210.192.16.22 600110.192.16.22 6001 sdm3 92.00 8166 -0.32 -13 1 210.192.16.22 600110.192.16.22 6001 sdn3 92.00 8166 -0.32 -14 1 210.192.16.23 600110.192.16.23 6001 sdm3 92.00 8166 -0.32 -15 1 210.192.16.23 600110.192.16.23 6001 sdn3 92.00 8166 -0.32 -16 1 210.192.16.24 600110.192.16.24 6001 sdm3 92.00 8166 -0.32 -17 1 210.192.16.24 600110.192.16.24 6001 sdn3 92.00 8166 -0.32 +12 1 210.192.16.22 600110.192.16.22 6001 sdm3 92.00 81920.00 +13 1 210.192.16.22 600110.192.16.22 6001 sdn3 92.00 81920.00 +14 1 210.192.16.23 600110.192.16.23 6001 sdm3 92.00 81920.00 +15 1 210.192.16.23 600110.192.16.23 6001 sdn3 92.00 81920.00 +16 1 210.192.16.24
[MediaWiki-commits] [Gerrit] codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 .. codfw-prod: put back weight on sdm/sdn for ms-be2013/14/15 Change-Id: If85762b840b6ebafc9dea7f4da3fc25f2ad71b75 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 6 files changed, 64 insertions(+), 64 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 8de8c1a..85f0796 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index b4c47be..e8e5e84 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 45 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance +codfw-prod/account.builder, build version 52 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 0.04 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 81920.00 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 81920.00 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 8168 -0.29 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 8168 -0.29 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 81920.00 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 81920.00 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 81920.00 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 81920.00 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 81920.00 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 81920.00 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 81920.00 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 81920.00 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 8168 -0.29 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 8168 -0.29 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 8167 -0.31 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 8168 -0.29 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 8167 -0.31 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 8168 -0.29 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 81920.00 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 81920.00 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 81920.00 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 81920.00 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 81920.00 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 81920.00 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 0.00 96 999.99 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 0.00 98 999.99 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 0.00 00.00 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 0.00 00.00 -28 1 310.192.32.18 600210.192.32.18
[MediaWiki-commits] [Gerrit] send log to stdout with upstart and systemd - change (operations...python-diamond)
Filippo Giunchedi has submitted this change and it was merged. Change subject: send log to stdout with upstart and systemd .. send log to stdout with upstart and systemd Change-Id: I7d46f8d2d09a8a32a4bb5ba6630c09e40a744570 --- M debian/changelog M debian/diamond.service M debian/diamond.upstart 3 files changed, 8 insertions(+), 2 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Alexandros Kosiaris: Looks good to me, but someone else must approve diff --git a/debian/changelog b/debian/changelog index 718fdc3..4bb2dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +diamond (3.5-3) trusty; urgency=medium + + * Send log to stdout with upstart and systemd + + -- Filippo Giunchedi fili...@wikimedia.org Fri, 12 Dec 2014 10:10:51 + + diamond (3.5-2) trusty; urgency=medium * Fix upgrade path from older python-diamond package. diff --git a/debian/diamond.service b/debian/diamond.service index 63f855a..8d569da 100644 --- a/debian/diamond.service +++ b/debian/diamond.service @@ -3,7 +3,7 @@ [Service] User=diamond -ExecStart=/usr/bin/diamond --foreground --skip-fork --skip-pidfile +ExecStart=/usr/bin/diamond --foreground --skip-fork --skip-pidfile --log-stdout [Install] WantedBy=multi-user.target diff --git a/debian/diamond.upstart b/debian/diamond.upstart index 0d97169..6652481 100644 --- a/debian/diamond.upstart +++ b/debian/diamond.upstart @@ -9,4 +9,4 @@ setuid diamond -exec /usr/bin/diamond --foreground --skip-fork $DAEMON_ARGS +exec /usr/bin/diamond --foreground --skip-fork --log-stdout $DAEMON_ARGS -- To view, visit https://gerrit.wikimedia.org/r/179423 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7d46f8d2d09a8a32a4bb5ba6630c09e40a744570 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/python-diamond 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: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] swift-add-drive: clarify when waiting for a disk - change (operations...swift-utils)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/180420 Change subject: swift-add-drive: clarify when waiting for a disk .. swift-add-drive: clarify when waiting for a disk Change-Id: Ic6eb12541c6cc77a7f563f32c62e800573cfbafc --- M swift-add-drive 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-utils refs/changes/20/180420/1 diff --git a/swift-add-drive b/swift-add-drive index f2b52f4..f5cc312 100644 --- a/swift-add-drive +++ b/swift-add-drive @@ -10,6 +10,7 @@ local other=$2 while sleep 2s; do +echo waiting for /dev/$dev to appear [ -e /dev/$dev ] break done -- To view, visit https://gerrit.wikimedia.org/r/180420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic6eb12541c6cc77a7f563f32c62e800573cfbafc Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-utils 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] swift-add-drive: discard preserved cache - change (operations...swift-utils)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift-add-drive: discard preserved cache
..
swift-add-drive: discard preserved cache
Change-Id: I51699a4dc3abcdb6384bce6b1d464eddc7c8a591
---
M swift-add-drive
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/swift-add-drive b/swift-add-drive
index 668e40e..f2b52f4 100644
--- a/swift-add-drive
+++ b/swift-add-drive
@@ -21,6 +21,7 @@
mount /srv/swift-storage/${dev}3
}
+megacli -DiscardPreservedCache -Lall -a0
megacli -CfgForeign -Clear -a0
megacli -CfgEachDskRaid0 WB RA Direct CachedBadBBU -a0
--
To view, visit https://gerrit.wikimedia.org/r/180419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51699a4dc3abcdb6384bce6b1d464eddc7c8a591
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-utils
Gerrit-Branch: master
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-add-drive: clarify when waiting for a disk - change (operations...swift-utils)
Filippo Giunchedi has submitted this change and it was merged. Change subject: swift-add-drive: clarify when waiting for a disk .. swift-add-drive: clarify when waiting for a disk Change-Id: Ic6eb12541c6cc77a7f563f32c62e800573cfbafc --- M swift-add-drive 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/swift-add-drive b/swift-add-drive index f2b52f4..f5cc312 100644 --- a/swift-add-drive +++ b/swift-add-drive @@ -10,6 +10,7 @@ local other=$2 while sleep 2s; do +echo waiting for /dev/$dev to appear [ -e /dev/$dev ] break done -- To view, visit https://gerrit.wikimedia.org/r/180420 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6eb12541c6cc77a7f563f32c62e800573cfbafc Gerrit-PatchSet: 1 Gerrit-Project: operations/software/swift-utils Gerrit-Branch: master 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-add-drive: discard preserved cache - change (operations...swift-utils)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/180419
Change subject: swift-add-drive: discard preserved cache
..
swift-add-drive: discard preserved cache
Change-Id: I51699a4dc3abcdb6384bce6b1d464eddc7c8a591
---
M swift-add-drive
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-utils
refs/changes/19/180419/1
diff --git a/swift-add-drive b/swift-add-drive
index 668e40e..f2b52f4 100644
--- a/swift-add-drive
+++ b/swift-add-drive
@@ -21,6 +21,7 @@
mount /srv/swift-storage/${dev}3
}
+megacli -DiscardPreservedCache -Lall -a0
megacli -CfgForeign -Clear -a0
megacli -CfgEachDskRaid0 WB RA Direct CachedBadBBU -a0
--
To view, visit https://gerrit.wikimedia.org/r/180419
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51699a4dc3abcdb6384bce6b1d464eddc7c8a591
Gerrit-PatchSet: 1
Gerrit-Project: operations/software/swift-utils
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] carbon-c-relay: add debian packaging - change (operations...carbon-c-relay)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: carbon-c-relay: add debian packaging
..
carbon-c-relay: add debian packaging
Enhanced C implementation of Carbon relay, aggregator and rewriter.
Initially, the idea is to be able to mirror carbon traffic to another host for
testing purposes. Going forward it can be used to provide HA, testing and so
on.
Change-Id: I1a48a09b485dfa6010f46bae24b24d43683172f6
---
A debian/carbon-c-relay.conf
A debian/carbon-c-relay.dirs
A debian/carbon-c-relay.docs
A debian/carbon-c-relay.init
A debian/carbon-c-relay.install
A debian/carbon-c-relay.lintian-overrides
A debian/carbon-c-relay.service
A debian/carbon-c-relay.upstart
A debian/changelog
A debian/clean
A debian/compat
A debian/control
A debian/copyright
A debian/postinst
A debian/rules
A debian/source/format
A debian/watch
17 files changed, 252 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/debian/carbon-c-relay.conf b/debian/carbon-c-relay.conf
new file mode 100644
index 000..f470578
--- /dev/null
+++ b/debian/carbon-c-relay.conf
@@ -0,0 +1,16 @@
+# example configuration scenarios.
+# Refer to /usr/share/doc/carbon-c-relay/README.md.gz for additional examples!
+
+## mirror all incoming metrics towards two destinations
+#cluster send-through
+# forward
+#host1:2003
+#host2:2003
+# ;
+#
+#match * send to send-through;
+
+## send all incoming metrics to the first responsive host
+#cluster send-to-any-one
+# any_of host1:2003 host2:2003;
+#match * send to send-to-any-one;
diff --git a/debian/carbon-c-relay.dirs b/debian/carbon-c-relay.dirs
new file mode 100644
index 000..6bac063
--- /dev/null
+++ b/debian/carbon-c-relay.dirs
@@ -0,0 +1 @@
+/var/lib/carbon-c-relay
diff --git a/debian/carbon-c-relay.docs b/debian/carbon-c-relay.docs
new file mode 100644
index 000..b43bf86
--- /dev/null
+++ b/debian/carbon-c-relay.docs
@@ -0,0 +1 @@
+README.md
diff --git a/debian/carbon-c-relay.init b/debian/carbon-c-relay.init
new file mode 100644
index 000..fd4f62c
--- /dev/null
+++ b/debian/carbon-c-relay.init
@@ -0,0 +1,128 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides: carbon-c-relay
+# Required-Start:$remote_fs $syslog $network
+# Required-Stop: $remote_fs $syslog $network
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: graphite carbon relay C implementation
+### END INIT INFO
+
+# Author: Filippo Giunchedi fili...@wikimedia.org
+
+# Do NOT set -e
+
+# PATH should only include /usr/* if it runs after the mountnfs.sh script
+PATH=/sbin:/usr/sbin:/bin:/usr/bin
+DESC=graphite carbon relay C implementation
+NAME=carbon-c-relay
+DAEMON=/usr/bin/$NAME
+DAEMON_ARGS=-f /etc/carbon-c-relay.conf
+DAEMON_USER=carbon-c-relay
+PIDFILE=/var/run/$NAME.pid
+SCRIPTNAME=/etc/init.d/$NAME
+
+# Exit if the package is not installed
+[ -x $DAEMON ] || exit 0
+
+# Read configuration variable file if it is present
+[ -r /etc/default/$NAME ] . /etc/default/$NAME
+
+# Load the VERBOSE setting and other rcS variables
+. /lib/init/vars.sh
+
+# Define LSB log_* functions.
+# Depend on lsb-base (= 3.2-14) to ensure that this file is present
+# and status_of_proc is working.
+. /lib/lsb/init-functions
+
+#
+# Function that starts the daemon/service
+#
+do_start()
+{
+ # Return
+ # 0 if daemon has been started
+ # 1 if daemon was already running
+ # 2 if daemon could not be started
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+ --chuid $DAEMON_USER --exec $DAEMON --test /dev/null \
+ || return 1
+ start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile \
+ --chuid $DAEMON_USER --background --exec $DAEMON --
$DAEMON_ARGS \
+ || return 2
+}
+
+#
+# Function that stops the daemon/service
+#
+do_stop()
+{
+ # Return
+ # 0 if daemon has been stopped
+ # 1 if daemon was already stopped
+ # 2 if daemon could not be stopped
+ # other if a failure occurred
+ start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile
$PIDFILE \
+ --user $DAEMON_USER --name $NAME
+ RETVAL=$?
+ [ $RETVAL = 2 ] return 2
+ # Wait for children to finish too if this is a daemon that forks
+ # and if the daemon is only ever run from this initscript.
+ # If the above conditions are not satisfied then add some other code
+ # that waits for the process to drop all resources that could be
+ # needed by services started subsequently. A last resort is to
+ # sleep for some time.
+ start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 \
+ --user $DAEMON_USER --exec $DAEMON
+ [ $? = 2 ] return 2
+ # Many daemons don't delete their pidfiles when they exit.
+ rm -f
[MediaWiki-commits] [Gerrit] swift: report statsd data to localhost - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: report statsd data to localhost
..
swift: report statsd data to localhost
this is similar to Ia95564b1b but for the legacy swift puppet module/role in
eqiad and esams
Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
---
M manifests/role/swift.pp
M manifests/swift.pp
2 files changed, 35 insertions(+), 3 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Alexandros Kosiaris: Looks good to me, but someone else must approve
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 55e315b..3cdc702 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -84,7 +84,7 @@
}
class proxy inherits role::swift::eqiad-prod {
class { '::swift::proxy':
-statsd_host = 'statsd.eqiad.wmnet',
+statsd_host = 'localhost',
statsd_metric_prefix = swift.eqiad-prod.${::hostname},
bind_port= '80',
proxy_address= 'http://ms-fe.eqiad.wmnet',
@@ -110,6 +110,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
class storage inherits role::swift::eqiad-prod {
include ::swift::storage
@@ -117,6 +125,14 @@
include role::swift::icehouse
include ::swift_new::params
include ::swift_new::container_sync
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
}
class esams-prod inherits role::swift::base {
@@ -195,7 +211,7 @@
}
class proxy inherits role::swift::esams-prod {
class { '::swift::proxy':
-statsd_host = 'statsd.eqiad.wmnet',
+statsd_host = 'localhost',
statsd_metric_prefix = swift.esams-prod.${::hostname},
bind_port= '80',
proxy_address= 'http://ms-fe.esams.wmnet',
@@ -217,11 +233,27 @@
host = 'ms-fe.esams.wmnet',
}
include role::swift::icehouse
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
class storage inherits role::swift::esams-prod {
include ::swift::storage
include ::swift::storage::monitoring
include role::swift::icehouse
+
+class { '::txstatsd':
+settings = {
+statsd = {
+'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+},
+},
+}
}
}
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 84ccb19..13b7e5c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -228,7 +228,7 @@
}
class config (
-$statsd_host = 'statsd.eqiad.wmnet',
+$statsd_host = 'localhost',
$statsd_metric_prefix =
swift.${::swift::base::cluster_name}.${::hostname}
){
require swift::storage::packages
--
To view, visit https://gerrit.wikimedia.org/r/172549
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7801c2748db1a95bdb54cb9e7077218df6b835f0
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: Faidon Liambotis fai...@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: expand txstats complete configuration - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172917
Change subject: swift: expand txstats complete configuration
..
swift: expand txstats complete configuration
the txstatsd class configuration has no defaults and passing in more parameters
doesn't merge those. Most importantly, this makes txstats create new metrics,
because the default prefix is stats. Thus as an hotfix pass in the complete
config everywhere.
Change-Id: I603bbe7ddad16d52ff3909105d55d76d18bfe41e
---
M manifests/role/swift.pp
1 file changed, 42 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/17/172917/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 3cdc702..fc80edeb 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -114,7 +114,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -129,7 +135,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -237,7 +249,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -250,7 +268,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -393,7 +417,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = ${::swift_new::params::graphite_host},
+'carbon-cache-host' =
${::swift_new::params::graphite_host},
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -428,7 +458,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = ${::swift_new::params::graphite_host},
+'carbon-cache-host' =
${::swift_new::params::graphite_host},
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
[MediaWiki-commits] [Gerrit] swift: expand txstats complete configuration - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: swift: expand txstats complete configuration
..
swift: expand txstats complete configuration
the txstatsd class configuration has no defaults and passing in more parameters
doesn't merge those. Most importantly, this makes txstats create new metrics,
because the default prefix is stats. Thus as an hotfix pass in the complete
config everywhere.
Change-Id: I603bbe7ddad16d52ff3909105d55d76d18bfe41e
---
M manifests/role/swift.pp
1 file changed, 42 insertions(+), 6 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 3cdc702..fc80edeb 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -114,7 +114,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -129,7 +135,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -237,7 +249,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -250,7 +268,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = 'graphite-in.eqiad.wmnet',
+'carbon-cache-host' =
'graphite-in.eqiad.wmnet',
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -393,7 +417,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = ${::swift_new::params::graphite_host},
+'carbon-cache-host' =
${::swift_new::params::graphite_host},
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
@@ -428,7 +458,13 @@
class { '::txstatsd':
settings = {
statsd = {
-'carbon-cache-host' = ${::swift_new::params::graphite_host},
+'carbon-cache-host' =
${::swift_new::params::graphite_host},
+'carbon-cache-port' = 2004,
+'listen-port'= 8125,
+'statsd-compliance' = 0,
+'prefix' = '',
+'max-queue-size' = 1000 * 1000,
+'max-datapoints-per-message' = 10 * 1000,
},
},
}
--
To
[MediaWiki-commits] [Gerrit] swift: throttle object-auditor - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/172990 Change subject: swift: throttle object-auditor .. swift: throttle object-auditor we've observed high iops from the object auditor while scanning disks, thus throttle file/bandwidth scanning from the defaults (20 files/s, 10MB/s). Change-Id: Id68dbfe120e485d9b65994488ac936146cd0cf46 --- M modules/swift_new/templates/object-server.conf.erb M templates/swift/etc.swift.object-server.conf.erb 2 files changed, 4 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/90/172990/1 diff --git a/modules/swift_new/templates/object-server.conf.erb b/modules/swift_new/templates/object-server.conf.erb index 232c029..676c530 100644 --- a/modules/swift_new/templates/object-server.conf.erb +++ b/modules/swift_new/templates/object-server.conf.erb @@ -33,3 +33,5 @@ concurrency = 1 [object-auditor] +files_per_second = 5 +bytes_per_second = 500 diff --git a/templates/swift/etc.swift.object-server.conf.erb b/templates/swift/etc.swift.object-server.conf.erb index 232c029..676c530 100644 --- a/templates/swift/etc.swift.object-server.conf.erb +++ b/templates/swift/etc.swift.object-server.conf.erb @@ -33,3 +33,5 @@ concurrency = 1 [object-auditor] +files_per_second = 5 +bytes_per_second = 500 -- To view, visit https://gerrit.wikimedia.org/r/172990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id68dbfe120e485d9b65994488ac936146cd0cf46 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: throttle object-auditor - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: swift: throttle object-auditor .. swift: throttle object-auditor we've observed high iops from the object auditor while scanning disks, thus throttle file/bandwidth scanning from the defaults (20 files/s, 10MB/s). Change-Id: Id68dbfe120e485d9b65994488ac936146cd0cf46 --- M modules/swift_new/templates/object-server.conf.erb M templates/swift/etc.swift.object-server.conf.erb 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Faidon Liambotis: Looks good to me, approved diff --git a/modules/swift_new/templates/object-server.conf.erb b/modules/swift_new/templates/object-server.conf.erb index 232c029..676c530 100644 --- a/modules/swift_new/templates/object-server.conf.erb +++ b/modules/swift_new/templates/object-server.conf.erb @@ -33,3 +33,5 @@ concurrency = 1 [object-auditor] +files_per_second = 5 +bytes_per_second = 500 diff --git a/templates/swift/etc.swift.object-server.conf.erb b/templates/swift/etc.swift.object-server.conf.erb index 232c029..676c530 100644 --- a/templates/swift/etc.swift.object-server.conf.erb +++ b/templates/swift/etc.swift.object-server.conf.erb @@ -33,3 +33,5 @@ concurrency = 1 [object-auditor] +files_per_second = 5 +bytes_per_second = 500 -- To view, visit https://gerrit.wikimedia.org/r/172990 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id68dbfe120e485d9b65994488ac936146cd0cf46 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: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] gdash: add swift iops dashboards - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/173010 Change subject: gdash: add swift iops dashboards .. gdash: add swift iops dashboards Change-Id: If56e6627e01bf2a49cf72ac9d66ec109ccc89ebe --- A files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph A files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph 2 files changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/10/173010/1 diff --git a/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph b/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph new file mode 100644 index 000..a30f234 --- /dev/null +++ b/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph @@ -0,0 +1,5 @@ +title top 10 disks by iops + +field :top_iops, +:alias = none, +:data = aliasByNode(highestAverage(servers.ms-be2*.iostat.sd[a-z].iops.value,10),1,3) diff --git a/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph b/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph new file mode 100644 index 000..0d2af29 --- /dev/null +++ b/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph @@ -0,0 +1,5 @@ +title top 10 disks by iops + +field :top_iops, +:alias = none, +:data = aliasByNode(highestAverage(servers.ms-be1*.iostat.sd[a-z].iops.value,10),1,3) -- To view, visit https://gerrit.wikimedia.org/r/173010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If56e6627e01bf2a49cf72ac9d66ec109ccc89ebe 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 swift iops dashboards - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: gdash: add swift iops dashboards .. gdash: add swift iops dashboards Change-Id: If56e6627e01bf2a49cf72ac9d66ec109ccc89ebe --- A files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph A files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph 2 files changed, 10 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph b/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph new file mode 100644 index 000..a30f234 --- /dev/null +++ b/files/gdash/dashboards/swift.codfw-prod/47_disk_iops.graph @@ -0,0 +1,5 @@ +title top 10 disks by iops + +field :top_iops, +:alias = none, +:data = aliasByNode(highestAverage(servers.ms-be2*.iostat.sd[a-z].iops.value,10),1,3) diff --git a/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph b/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph new file mode 100644 index 000..0d2af29 --- /dev/null +++ b/files/gdash/dashboards/swift.eqiad-prod/47_disk_iops.graph @@ -0,0 +1,5 @@ +title top 10 disks by iops + +field :top_iops, +:alias = none, +:data = aliasByNode(highestAverage(servers.ms-be1*.iostat.sd[a-z].iops.value,10),1,3) -- To view, visit https://gerrit.wikimedia.org/r/173010 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If56e6627e01bf2a49cf72ac9d66ec109ccc89ebe Gerrit-PatchSet: 2 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] elasticsearch: disable noisy check_elasticsearch - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: elasticsearch: disable noisy check_elasticsearch
..
elasticsearch: disable noisy check_elasticsearch
this check is based on ES cluster status != green, which is too sensitive e.g.
when moving shards around the cluster goes red.
its replacement checks the percentage of shards that are moving and alerts
according to a threshold, which has proven much less noisy
Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f
---
M modules/elasticsearch/manifests/nagios/check.pp
1 file changed, 0 insertions(+), 5 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Manybubbles: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/elasticsearch/manifests/nagios/check.pp
b/modules/elasticsearch/manifests/nagios/check.pp
index 3d63f9d..f16769f 100644
--- a/modules/elasticsearch/manifests/nagios/check.pp
+++ b/modules/elasticsearch/manifests/nagios/check.pp
@@ -4,11 +4,6 @@
# the elasticsearch::nagios::plugin class.
#
class elasticsearch::nagios::check {
-monitor_service { 'elasticsearch':
-check_command = 'check_elasticsearch',
-description = 'ElasticSearch health check',
-}
-
monitor_service { 'elasticsearch shards':
check_command = 'check_elasticsearch_shards',
description = 'ElasticSearch health check for shards',
--
To view, visit https://gerrit.wikimedia.org/r/172527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iffb6f05d9b7ab024e706c96280fd3c6a2a58879f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Chad ch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Manybubbles never...@wikimedia.org
Gerrit-Reviewer: Ottomata 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] gdash: fix parser cache gdash - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/173246 Change subject: gdash: fix parser cache gdash .. gdash: fix parser cache gdash reference MediaWiki.stats. not stats. Change-Id: I154f9612c4373c84ba008a76602e827096c95796 --- M files/gdash/dashboards/pcache/p1.graph M files/gdash/dashboards/pcache/p2.0.graph M files/gdash/dashboards/pcache/p2.1.graph 3 files changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/46/173246/1 diff --git a/files/gdash/dashboards/pcache/p1.graph b/files/gdash/dashboards/pcache/p1.graph index 10f637e..ac728de 100644 --- a/files/gdash/dashboards/pcache/p1.graph +++ b/files/gdash/dashboards/pcache/p1.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(stats.pcache_[hm]*.count)),Miss (expire)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (expire)))' field :stub, :color = orange, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(stats.pcache_[hm]*.count)),Miss (stub)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (stub)))' diff --git a/files/gdash/dashboards/pcache/p2.0.graph b/files/gdash/dashboards/pcache/p2.0.graph index d6a830b..8889fc3 100644 --- a/files/gdash/dashboards/pcache/p2.0.graph +++ b/files/gdash/dashboards/pcache/p2.0.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(stats.pcache_[hm]*.count)),Miss (expire)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (expire)))' field :stub, :color = orange, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(stats.pcache_[hm]*.count)),Miss (stub)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (stub)))' diff --git a/files/gdash/dashboards/pcache/p2.1.graph b/files/gdash/dashboards/pcache/p2.1.graph index defd8bb..90afeb8 100644 --- a/files/gdash/dashboards/pcache/p2.1.graph +++ b/files/gdash/dashboards/pcache/p2.1.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, -
[MediaWiki-commits] [Gerrit] gdash: fix parser cache gdash - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: gdash: fix parser cache gdash .. gdash: fix parser cache gdash reference MediaWiki.stats. not stats. Change-Id: I154f9612c4373c84ba008a76602e827096c95796 --- M files/gdash/dashboards/pcache/p1.graph M files/gdash/dashboards/pcache/p2.0.graph M files/gdash/dashboards/pcache/p2.1.graph 3 files changed, 12 insertions(+), 12 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/files/gdash/dashboards/pcache/p1.graph b/files/gdash/dashboards/pcache/p1.graph index 10f637e..ac728de 100644 --- a/files/gdash/dashboards/pcache/p1.graph +++ b/files/gdash/dashboards/pcache/p1.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(stats.pcache_[hm]*.count)),Miss (expire)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (expire)))' field :stub, :color = orange, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(stats.pcache_[hm]*.count)),Miss (stub)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (stub)))' diff --git a/files/gdash/dashboards/pcache/p2.0.graph b/files/gdash/dashboards/pcache/p2.0.graph index d6a830b..8889fc3 100644 --- a/files/gdash/dashboards/pcache/p2.0.graph +++ b/files/gdash/dashboards/pcache/p2.0.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(stats.pcache_[hm]*.count)),Miss (expire)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_expired.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (expire)))' field :stub, :color = orange, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(stats.pcache_[hm]*.count)),Miss (stub)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_stub.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (stub)))' diff --git a/files/gdash/dashboards/pcache/p2.1.graph b/files/gdash/dashboards/pcache/p2.1.graph index defd8bb..90afeb8 100644 --- a/files/gdash/dashboards/pcache/p2.1.graph +++ b/files/gdash/dashboards/pcache/p2.1.graph @@ -8,16 +8,16 @@ field :hit, :color = green, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(stats.pcache_[hm]*.count)),Hit))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_hit.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Hit))' field :absent, :color = blue, :alias = none, - :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(stats.pcache_[hm]*.count)),Miss (absent)))' + :data = 'cactiStyle(alias(asPercent(MediaWiki.stats.pcache_miss_absent.count,sumSeries(MediaWiki.stats.pcache_[hm]*.count)),Miss (absent)))' field :expired, :color = red, :alias = none, - :data =
[MediaWiki-commits] [Gerrit] rename db1017 into graphite1001 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/173789
Change subject: rename db1017 into graphite1001
..
rename db1017 into graphite1001
I'll kick off a reinstall with trusty too
RT #8881
Change-Id: I5406737d8738672ddc1a3b92e1bba1c0416c7458
---
M modules/dsh/files/group/db
M modules/dsh/files/group/mysql-secondary
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/89/173789/1
diff --git a/modules/dsh/files/group/db b/modules/dsh/files/group/db
index a98e08c..612e9f6 100644
--- a/modules/dsh/files/group/db
+++ b/modules/dsh/files/group/db
@@ -10,7 +10,6 @@
db1011
db1015
db1016
-db1017
db1018
db1019
db1020
diff --git a/modules/dsh/files/group/mysql-secondary
b/modules/dsh/files/group/mysql-secondary
index 27f9aba..43bf8a4 100644
--- a/modules/dsh/files/group/mysql-secondary
+++ b/modules/dsh/files/group/mysql-secondary
@@ -5,7 +5,6 @@
db1005
db1006
db1007
-db1017
db1018
db1019
db1021
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 44e52d1..aa77062 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -57,6 +57,7 @@
cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium)
echo partman/raid1-varnish.cfg ;; \
cp1008) echo partman/raid1-varnish.cfg ;; \
antimony|arsenic|caesium|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
+ graphite[12]00*) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/lvs.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.cfg ;; \
eeden) echo partman/raid1-1partition.cfg ;; \
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index e49c734..bb343fe 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -882,11 +882,6 @@
fixed-address db1016.eqiad.wmnet;
}
-host db1017 {
- hardware ethernet 78:2b:cb:05:03:99;
- fixed-address db1017.eqiad.wmnet;
-}
-
host db1018 {
hardware ethernet 78:2b:cb:0a:13:12;
fixed-address db1018.eqiad.wmnet;
@@ -1626,6 +1621,11 @@
fixed-address gold.wikimedia.org;
}
+host graphite1001 {
+ hardware ethernet 78:2b:cb:05:03:99;
+ fixed-address graphite1001.eqiad.wmnet;
+}
+
host hafnium {
hardware ethernet 78:2b:cb:1f:17:48;
fixed-address hafnium.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/173789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5406737d8738672ddc1a3b92e1bba1c0416c7458
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] rename db1017 into graphite1001 - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: rename db1017 into graphite1001
..
rename db1017 into graphite1001
I'll kick off a reinstall with trusty too
RT #8881
Change-Id: I5406737d8738672ddc1a3b92e1bba1c0416c7458
---
M modules/dsh/files/group/db
M modules/dsh/files/group/mysql-secondary
M modules/install-server/files/autoinstall/netboot.cfg
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
4 files changed, 6 insertions(+), 7 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/dsh/files/group/db b/modules/dsh/files/group/db
index a98e08c..612e9f6 100644
--- a/modules/dsh/files/group/db
+++ b/modules/dsh/files/group/db
@@ -10,7 +10,6 @@
db1011
db1015
db1016
-db1017
db1018
db1019
db1020
diff --git a/modules/dsh/files/group/mysql-secondary
b/modules/dsh/files/group/mysql-secondary
index 27f9aba..43bf8a4 100644
--- a/modules/dsh/files/group/mysql-secondary
+++ b/modules/dsh/files/group/mysql-secondary
@@ -5,7 +5,6 @@
db1005
db1006
db1007
-db1017
db1018
db1019
db1021
diff --git a/modules/install-server/files/autoinstall/netboot.cfg
b/modules/install-server/files/autoinstall/netboot.cfg
index 44e52d1..aa77062 100755
--- a/modules/install-server/files/autoinstall/netboot.cfg
+++ b/modules/install-server/files/autoinstall/netboot.cfg
@@ -57,6 +57,7 @@
cp102[1-9]|cp10[3-6][0-9]|cp1070|cp[34]0[0-9][0-9]|sq6[7-9]|sq70|dysprosium)
echo partman/raid1-varnish.cfg ;; \
cp1008) echo partman/raid1-varnish.cfg ;; \
antimony|arsenic|caesium|erbium|gadolinium|holmium|magnesium|neodymium|palladium|promethium|rubidium|strontium|terbium)
echo partman/lvm.cfg ;; \
+ graphite[12]00*) echo partman/lvm.cfg ;; \
lvs[1-6]|lvs[12]00*) echo partman/lvs.cfg ;; \
lvs[34]00*) echo partman/raid1-lvm.cfg ;; \
eeden) echo partman/raid1-1partition.cfg ;; \
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index e49c734..bb343fe 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -882,11 +882,6 @@
fixed-address db1016.eqiad.wmnet;
}
-host db1017 {
- hardware ethernet 78:2b:cb:05:03:99;
- fixed-address db1017.eqiad.wmnet;
-}
-
host db1018 {
hardware ethernet 78:2b:cb:0a:13:12;
fixed-address db1018.eqiad.wmnet;
@@ -1626,6 +1621,11 @@
fixed-address gold.wikimedia.org;
}
+host graphite1001 {
+ hardware ethernet 78:2b:cb:05:03:99;
+ fixed-address graphite1001.eqiad.wmnet;
+}
+
host hafnium {
hardware ethernet 78:2b:cb:1f:17:48;
fixed-address hafnium.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/173789
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5406737d8738672ddc1a3b92e1bba1c0416c7458
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] eqiad: rename db1017 to graphite1001 - change (operations/dns)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/173790 Change subject: eqiad: rename db1017 to graphite1001 .. eqiad: rename db1017 to graphite1001 RT #8881 Change-Id: Ibe00ef38e9d2db7c7873e8d9135ec8b31742a678 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dns refs/changes/90/173790/1 diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 65222ee..159a502 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -443,7 +443,7 @@ 3 1H IN PTR ae2-1018.cr2-eqiad.wikimedia.org. 4 1H IN PTR nas1001-a.eqiad.wmnet. 5 1H IN PTR nas1001-b.eqiad.wmnet. -6 1H IN PTR db1017.eqiad.wmnet. +6 1H IN PTR graphite1001.eqiad.wmnet. 7 1H IN PTR db1018.eqiad.wmnet. 8 1H IN PTR db1019.eqiad.wmnet. 9 1H IN PTR db1020.eqiad.wmnet. @@ -1970,7 +1970,7 @@ 15 1H IN PTR wmf3076.mgmt.eqiad.wmnet. 16 1H IN PTR db1016.mgmt.eqiad.wmnet. 16 1H IN PTR wmf3075.mgmt.eqiad.wmnet. -17 1H IN PTR db1017.mgmt.eqiad.wmnet. +17 1H IN PTR graphite1001.mgmt.eqiad.wmnet. 17 1H IN PTR wmf3269.mgmt.eqiad.wmnet. 18 1H IN PTR db1018.mgmt.eqiad.wmnet. 18 1H IN PTR wmf3268.mgmt.eqiad.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 5ffb377..a67d00f 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -202,7 +202,7 @@ tungsten1H IN A10.64.0.18 db1015 1H IN A10.64.0.19 db1016 1H IN A10.64.0.20 -db1017 1H IN A10.64.16.6 +graphite10011H IN A10.64.16.6 db1018 1H IN A10.64.16.7 db1019 1H IN A10.64.16.8 db1020 1H IN A10.64.16.9 -- To view, visit https://gerrit.wikimedia.org/r/173790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibe00ef38e9d2db7c7873e8d9135ec8b31742a678 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] eqiad: rename db1017 to graphite1001 - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged. Change subject: eqiad: rename db1017 to graphite1001 .. eqiad: rename db1017 to graphite1001 RT #8881 Change-Id: Ibe00ef38e9d2db7c7873e8d9135ec8b31742a678 --- M templates/10.in-addr.arpa M templates/wmnet 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa index 98d9436..b2d0ce4 100644 --- a/templates/10.in-addr.arpa +++ b/templates/10.in-addr.arpa @@ -443,7 +443,7 @@ 3 1H IN PTR ae2-1018.cr2-eqiad.wikimedia.org. 4 1H IN PTR nas1001-a.eqiad.wmnet. 5 1H IN PTR nas1001-b.eqiad.wmnet. -6 1H IN PTR db1017.eqiad.wmnet. +6 1H IN PTR graphite1001.eqiad.wmnet. 7 1H IN PTR db1018.eqiad.wmnet. 8 1H IN PTR db1019.eqiad.wmnet. 9 1H IN PTR db1020.eqiad.wmnet. @@ -1972,7 +1972,7 @@ 15 1H IN PTR wmf3076.mgmt.eqiad.wmnet. 16 1H IN PTR db1016.mgmt.eqiad.wmnet. 16 1H IN PTR wmf3075.mgmt.eqiad.wmnet. -17 1H IN PTR db1017.mgmt.eqiad.wmnet. +17 1H IN PTR graphite1001.mgmt.eqiad.wmnet. 17 1H IN PTR wmf3269.mgmt.eqiad.wmnet. 18 1H IN PTR db1018.mgmt.eqiad.wmnet. 18 1H IN PTR wmf3268.mgmt.eqiad.wmnet. diff --git a/templates/wmnet b/templates/wmnet index 73dfb06..10bd3dd 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -202,7 +202,7 @@ tungsten1H IN A10.64.0.18 db1015 1H IN A10.64.0.19 db1016 1H IN A10.64.0.20 -db1017 1H IN A10.64.16.6 +graphite10011H IN A10.64.16.6 db1018 1H IN A10.64.16.7 db1019 1H IN A10.64.16.8 db1020 1H IN A10.64.16.9 -- To view, visit https://gerrit.wikimedia.org/r/173790 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibe00ef38e9d2db7c7873e8d9135ec8b31742a678 Gerrit-PatchSet: 2 Gerrit-Project: operations/dns Gerrit-Branch: master 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] eqiad: add missing forward for graphite1001 - change (operations/dns)
Filippo Giunchedi has submitted this change and it was merged. Change subject: eqiad: add missing forward for graphite1001 .. eqiad: add missing forward for graphite1001 RT #8881 Change-Id: I4a72932a2a2de07e1f082def3d690624d735533b --- M templates/wmnet 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/templates/wmnet b/templates/wmnet index 10bd3dd..66e92a6 100644 --- a/templates/wmnet +++ b/templates/wmnet @@ -953,7 +953,7 @@ wmf3076 1H IN A10.65.6.15 db1016 1H IN A10.65.6.16 wmf3075 1H IN A10.65.6.16 -db1017 1H IN A10.65.6.17 +graphite1001 1H IN A10.65.6.17 wmf3269 1H IN A10.65.6.17 db1018 1H IN A10.65.6.18 wmf3268 1H IN A10.65.6.18 -- To view, visit https://gerrit.wikimedia.org/r/174078 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a72932a2a2de07e1f082def3d690624d735533b Gerrit-PatchSet: 1 Gerrit-Project: operations/dns Gerrit-Branch: master 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] add graphite role to graphite1001 - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174121
Change subject: add graphite role to graphite1001
..
add graphite role to graphite1001
Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
---
M manifests/site.pp
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/174121/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 7786ed8..8810482 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2801,6 +2801,15 @@
include role::performance
}
+# graphite test machine, currently with SSD caching + spinning disks
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
# Labs Graphite and StatsD host
node 'labmon1001.eqiad.wmnet' {
include standard
--
To view, visit https://gerrit.wikimedia.org/r/174121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
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 graphite role to graphite1001 - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: add graphite role to graphite1001
..
add graphite role to graphite1001
Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
---
M manifests/site.pp
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 7786ed8..8810482 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2801,6 +2801,15 @@
include role::performance
}
+# graphite test machine, currently with SSD caching + spinning disks
+node 'graphite1001.eqiad.wmnet' {
+include admin
+include standard
+include role::graphite::production
+include role::txstatsd
+include role::gdash
+}
+
# Labs Graphite and StatsD host
node 'labmon1001.eqiad.wmnet' {
include standard
--
To view, visit https://gerrit.wikimedia.org/r/174121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I26667c99343f40262b98c7016e9269e5e19c32eb
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] gdash: install rubygems only trusty - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/174127
Change subject: gdash: install rubygems only trusty
..
gdash: install rubygems only trusty
Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
---
M modules/gdash/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/27/174127/1
diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 18029ee..29a566d 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -53,7 +53,11 @@
provider = 'trebuchet',
}
-package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+if ubuntu_version(' trusty') {
+package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+} else {
+package { [ 'ruby-rack', 'ruby-sinatra' ]: }
+}
file { '/etc/gdash':
ensure = directory,
--
To view, visit https://gerrit.wikimedia.org/r/174127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
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: install rubygems only trusty - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: gdash: install rubygems only trusty
..
gdash: install rubygems only trusty
Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
---
M modules/gdash/manifests/init.pp
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gdash/manifests/init.pp b/modules/gdash/manifests/init.pp
index 18029ee..29a566d 100644
--- a/modules/gdash/manifests/init.pp
+++ b/modules/gdash/manifests/init.pp
@@ -53,7 +53,11 @@
provider = 'trebuchet',
}
-package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+if ubuntu_version(' trusty') {
+package { [ 'ruby-rack', 'ruby-sinatra', 'rubygems' ]: }
+} else {
+package { [ 'ruby-rack', 'ruby-sinatra' ]: }
+}
file { '/etc/gdash':
ensure = directory,
--
To view, visit https://gerrit.wikimedia.org/r/174127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I29af0e539ae487a07403d877b06b1549dd5e5591
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] Import new upstream version from git 1acdff3 - change (operations...carbon-c-relay)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/180757 Change subject: Import new upstream version from git 1acdff3 .. Import new upstream version from git 1acdff3 * Import new upstream version from git 1acdff3 + udp listener support + misc bug fixes Change-Id: I4e3d3362bca80394e8d76edc4f08bd08a6ae36b2 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/carbon-c-relay refs/changes/57/180757/1 diff --git a/debian/changelog b/debian/changelog index c9a1f15..9984355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +carbon-c-relay (0.36+git20141218-1) unstable; urgency=medium + + * Import new upstream version from git 1acdff3 ++ udp listener support ++ misc bug fixes + + -- Filippo Giunchedi fili...@wikimedia.org Thu, 18 Dec 2014 10:24:40 + + carbon-c-relay (0.36-1) unstable; urgency=medium * Initial release. (Closes: #768983) -- To view, visit https://gerrit.wikimedia.org/r/180757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4e3d3362bca80394e8d76edc4f08bd08a6ae36b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/carbon-c-relay 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] Imported Upstream version 0.36+git1acdff3 - change (operations...carbon-c-relay)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/180756 Change subject: Imported Upstream version 0.36+git1acdff3 .. Imported Upstream version 0.36+git1acdff3 Change-Id: Ia850be88f3e7ffc8dcd23f1b13f04f14996e28e3 --- M README.md A contrib/relay.conf A contrib/relay.init A contrib/relay.logrotate A contrib/relay.monit A contrib/relay.spec A contrib/relay.sysconfig M dispatcher.c M dispatcher.h M receptor.c M receptor.h M relay.c M router.c 13 files changed, 442 insertions(+), 70 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/carbon-c-relay refs/changes/56/180756/1 diff --git a/README.md b/README.md index 4d670e5..bc612b9 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,22 @@ right destination(s). The route file supports two main constructs: clusters and matches. The first define groups of hosts data metrics can be sent to, the latter define which metrics should be sent to which -cluster. Aggregation rules are seen as matches. The syntax in this -file is as follows: +cluster. Aggregation rules are seen as matches. + +For every metric received by the relay, cleansing is performed. The +following changes are performed before any match, aggregate or rewrite +rule sees the metric: + + - double dot elimination (necessary for correctly functioning +consistent hash routing) + - trailing/leading dot elimination + - whitespace normalisation (this mostly affects output of the relay +to other targets: metric, value and timestamp will be separated by +a single space only, ever) + - irregular char replacement with underscores (\_), currently +irregular is defined as not being in [0-9a-zA-Z-_:#]. + +The route file syntax is as follows: ``` # comments are allowed in any place and start with a hash (#) @@ -124,9 +138,11 @@ final, as no new entries are allowed to be added any more. On top of an aggregation multiple aggregations can be computed. They can be of the same or different aggregation types, but should write to a unique new -metric. Produced metrics are sent to the relay as if they were -submitted from the outside, hence match and aggregation rules apply to -those. Care should be taken that loops are avoided. Also, since +metric. The metric names can include back references like in rewrite +expressions, allowing for powerful single aggregation rules that yield +in many aggregations. Produced metrics are sent to the relay as if they +were submitted from the outside, hence match and aggregation rules apply +to those. Care should be taken that loops are avoided. Also, since aggregations appear as matches without `stop` keyword, their positioning matters in the same way ordering of match statements. @@ -313,8 +329,8 @@ e.g. for each hostname encountered. A typical aggregation looks like: aggregate -sys.dc1.somehost-[0-9]+.somecluster.mysql.replication_delay -sys.dc2.somehost-[0-9]+.somecluster.mysql.replication_delay +^sys\.dc1\.somehost-[0-9]+\.somecluster\.mysql\.replication_delay +^sys\.dc2\.somehost-[0-9]+\.somecluster\.mysql\.replication_delay every 10 seconds expire after 35 seconds compute sum write to @@ -350,6 +366,31 @@ carbon-c-relay instance, such that it is easy to forward the produced metrics to another relay instance is a good practice. +The previous example could also be written as follows to be more +dynamic: + +aggregate +^sys\.dc[0-9].(somehost-[0-9]+)\.([^.]+)\.mysql\.replication_delay +every 10 seconds +expire after 35 seconds +compute sum write to +mysql.host.\1.replication_delay +compute sum write to +mysql.host.all.replication_delay +compute sum write to +mysql.cluster.\2.replication_delay +compute sum write to +mysql.cluster.all.replication_delay +; + +Here a single match, results in four aggregations, each of a different +scope. In this example aggregation based on hostname and cluster are +being made, as well as the more general `all` targets, which in this +example have both identical values. Note that with this single +aggregation rule, both per-cluster, per-host and total aggregations are +produced. Obviously, the input metrics define which hosts and clusters +are produced. + Author -- diff --git a/contrib/relay.conf b/contrib/relay.conf new file mode 100644 index 000..a32242c --- /dev/null +++ b/contrib/relay.conf @@ -0,0 +1,63 @@ +# comments are allowed in any place and start with a hash (#) +# +#cluster name +#forward | any_of | carbon_ch | fnv1a_ch [replication count] +#host[:port] [proto udp | tcp] ... +#; +#match * | expression +#send to cluster | blackhole +#[stop] +#; +#rewrite expression +#into replacement +#; +#aggregate +#
[MediaWiki-commits] [Gerrit] Import new upstream version from git 1acdff3 - change (operations...carbon-c-relay)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Import new upstream version from git 1acdff3 .. Import new upstream version from git 1acdff3 * Import new upstream version from git 1acdff3 + udp listener support + misc bug fixes Change-Id: I4e3d3362bca80394e8d76edc4f08bd08a6ae36b2 --- M debian/changelog 1 file changed, 8 insertions(+), 0 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Faidon Liambotis: Looks good to me, approved diff --git a/debian/changelog b/debian/changelog index c9a1f15..9984355 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +carbon-c-relay (0.36+git20141218-1) unstable; urgency=medium + + * Import new upstream version from git 1acdff3 ++ udp listener support ++ misc bug fixes + + -- Filippo Giunchedi fili...@wikimedia.org Thu, 18 Dec 2014 10:24:40 + + carbon-c-relay (0.36-1) unstable; urgency=medium * Initial release. (Closes: #768983) -- To view, visit https://gerrit.wikimedia.org/r/180757 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4e3d3362bca80394e8d76edc4f08bd08a6ae36b2 Gerrit-PatchSet: 1 Gerrit-Project: operations/debs/carbon-c-relay 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: Giuseppe Lavagetto glavage...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Imported Upstream version 0.36+git1acdff3 - change (operations...carbon-c-relay)
Filippo Giunchedi has submitted this change and it was merged. Change subject: Imported Upstream version 0.36+git1acdff3 .. Imported Upstream version 0.36+git1acdff3 Change-Id: Ia850be88f3e7ffc8dcd23f1b13f04f14996e28e3 --- M README.md A contrib/relay.conf A contrib/relay.init A contrib/relay.logrotate A contrib/relay.monit A contrib/relay.spec A contrib/relay.sysconfig M dispatcher.c M dispatcher.h M receptor.c M receptor.h M relay.c M router.c 13 files changed, 442 insertions(+), 70 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/README.md b/README.md index 4d670e5..bc612b9 100644 --- a/README.md +++ b/README.md @@ -28,8 +28,22 @@ right destination(s). The route file supports two main constructs: clusters and matches. The first define groups of hosts data metrics can be sent to, the latter define which metrics should be sent to which -cluster. Aggregation rules are seen as matches. The syntax in this -file is as follows: +cluster. Aggregation rules are seen as matches. + +For every metric received by the relay, cleansing is performed. The +following changes are performed before any match, aggregate or rewrite +rule sees the metric: + + - double dot elimination (necessary for correctly functioning +consistent hash routing) + - trailing/leading dot elimination + - whitespace normalisation (this mostly affects output of the relay +to other targets: metric, value and timestamp will be separated by +a single space only, ever) + - irregular char replacement with underscores (\_), currently +irregular is defined as not being in [0-9a-zA-Z-_:#]. + +The route file syntax is as follows: ``` # comments are allowed in any place and start with a hash (#) @@ -124,9 +138,11 @@ final, as no new entries are allowed to be added any more. On top of an aggregation multiple aggregations can be computed. They can be of the same or different aggregation types, but should write to a unique new -metric. Produced metrics are sent to the relay as if they were -submitted from the outside, hence match and aggregation rules apply to -those. Care should be taken that loops are avoided. Also, since +metric. The metric names can include back references like in rewrite +expressions, allowing for powerful single aggregation rules that yield +in many aggregations. Produced metrics are sent to the relay as if they +were submitted from the outside, hence match and aggregation rules apply +to those. Care should be taken that loops are avoided. Also, since aggregations appear as matches without `stop` keyword, their positioning matters in the same way ordering of match statements. @@ -313,8 +329,8 @@ e.g. for each hostname encountered. A typical aggregation looks like: aggregate -sys.dc1.somehost-[0-9]+.somecluster.mysql.replication_delay -sys.dc2.somehost-[0-9]+.somecluster.mysql.replication_delay +^sys\.dc1\.somehost-[0-9]+\.somecluster\.mysql\.replication_delay +^sys\.dc2\.somehost-[0-9]+\.somecluster\.mysql\.replication_delay every 10 seconds expire after 35 seconds compute sum write to @@ -350,6 +366,31 @@ carbon-c-relay instance, such that it is easy to forward the produced metrics to another relay instance is a good practice. +The previous example could also be written as follows to be more +dynamic: + +aggregate +^sys\.dc[0-9].(somehost-[0-9]+)\.([^.]+)\.mysql\.replication_delay +every 10 seconds +expire after 35 seconds +compute sum write to +mysql.host.\1.replication_delay +compute sum write to +mysql.host.all.replication_delay +compute sum write to +mysql.cluster.\2.replication_delay +compute sum write to +mysql.cluster.all.replication_delay +; + +Here a single match, results in four aggregations, each of a different +scope. In this example aggregation based on hostname and cluster are +being made, as well as the more general `all` targets, which in this +example have both identical values. Note that with this single +aggregation rule, both per-cluster, per-host and total aggregations are +produced. Obviously, the input metrics define which hosts and clusters +are produced. + Author -- diff --git a/contrib/relay.conf b/contrib/relay.conf new file mode 100644 index 000..a32242c --- /dev/null +++ b/contrib/relay.conf @@ -0,0 +1,63 @@ +# comments are allowed in any place and start with a hash (#) +# +#cluster name +#forward | any_of | carbon_ch | fnv1a_ch [replication count] +#host[:port] [proto udp | tcp] ... +#; +#match * | expression +#send to cluster | blackhole +#[stop] +#; +#rewrite expression +#into replacement +#; +#aggregate +#expression ... +#every interval seconds +#expire after
[MediaWiki-commits] [Gerrit] txstatsd: add support for graphite line-protocol - change (operations...txstatsd)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/180786 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. For our use case however we will need line (or plaintext) protocol to be able to route metrics around. 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(-) git pull ssh://gerrit.wikimedia.org:29418/operations/debs/txstatsd refs/changes/86/180786/3 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: newchange Gerrit-Change-Id: I3b4230f8a358adaee7134bd586b503774574a31e Gerrit-PatchSet: 3 Gerrit-Project: operations/debs/txstatsd Gerrit-Branch: master Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Chasemp chas...@gmail.com Gerrit-Reviewer: Faidon Liambotis fai...@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: introduce local c-relay - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181080
Change subject: graphite: introduce local c-relay
..
graphite: introduce local c-relay
The idea behind this change is to have a local carbon-c-relay instance (on port
1903) whose sole task is to forward incoming metrics to the local carbon-cache,
in practice replacing carbon-relay's role.
In turn, this local carbon-c-relay will receive metrics from a top level
carbon-c-relay listening on standard port 2003 for line/plaintext protocol
metrics.
Change-Id: I61f687237baed6674fcc9813acc9df0ce40d4fbb
---
M manifests/role/graphite.pp
M modules/graphite/files/carbonctl
M modules/graphite/manifests/init.pp
A modules/graphite/templates/local-relay.conf.erb
A modules/graphite/templates/local-relay.upstart.conf.erb
5 files changed, 58 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/80/181080/1
diff --git a/manifests/role/graphite.pp b/manifests/role/graphite.pp
index 706a567..f89d058 100644
--- a/manifests/role/graphite.pp
+++ b/manifests/role/graphite.pp
@@ -149,6 +149,18 @@
},
storage_dir = $carbon_storage_dir,
+c_relay_settings = {
+'backends' = [
+'127.0.0.1:2103',
+'127.0.0.1:2203',
+'127.0.0.1:2303',
+'127.0.0.1:2403',
+'127.0.0.1:2503',
+'127.0.0.1:2603',
+'127.0.0.1:2703',
+'127.0.0.1:2803',
+],
+},
}
class { '::graphite::web':
diff --git a/modules/graphite/files/carbonctl b/modules/graphite/files/carbonctl
index e6d9437..1fd4fac 100755
--- a/modules/graphite/files/carbonctl
+++ b/modules/graphite/files/carbonctl
@@ -12,6 +12,7 @@
/sbin/status carbon/cache NAME=$name | sed 's/ //'
done
grep -Fqx '[relay]' /etc/carbon/carbon.conf /sbin/status
carbon/relay
+[ -e /etc/carbon/local-relay.conf ] /sbin/status
carbon/local-relay
} | { sed 's/, process//' | column -t | tee /dev/stderr | grep -qv
running ; } 21
;;
check)
diff --git a/modules/graphite/manifests/init.pp
b/modules/graphite/manifests/init.pp
index 41a27ed..29b5108 100644
--- a/modules/graphite/manifests/init.pp
+++ b/modules/graphite/manifests/init.pp
@@ -1,20 +1,22 @@
# == Class: graphite
#
# Graphite is a monitoring tool that stores numeric time-series data and
-# renders graphs of this data on demand. It consists of three software
+# renders graphs of this data on demand. It consists of the following software
# components:
#
# - Carbon, a daemon that listens for time-series data
+# - Carbon-c-relay, an high-performance metric router
# - Whisper, a database library for storing time-series data
# - Graphite webapp, a webapp which renders graphs on demand
#
class graphite(
$carbon_settings,
+$c_relay_settings,
$storage_schemas,
$storage_aggregation = {},
$storage_dir = '/var/lib/carbon',
) {
-require_package('graphite-carbon', 'python-whisper')
+require_package('graphite-carbon', 'python-whisper', 'carbon-c-relay')
$carbon_service_defaults = {
log_updates = false,
@@ -62,6 +64,22 @@
notify = Service['carbon'],
}
+file { '/etc/carbon/local-relay.conf':
+content = template('graphite/local-relay.conf.erb'),
+require = Class['packages::carbon_c_relay'],
+notify = Service['carbon'],
+}
+
+# NOTE: the service is named local-relay as opposed to c-relay otherwise
+# we'd have these very similar but different names:
+# service carbon-c-relay # from debian package, the standard relay
+# service carbon/c-relay # from this module, forwarding to local
carbon-cache
+file { '/etc/init/carbon/local-relay.conf':
+content = template('graphite/local-relay.upstart.conf.erb'),
+require = Class['packages::carbon_c_relay'],
+notify = Service['carbon'],
+}
+
file { '/etc/init/carbon':
source = 'puppet:///modules/graphite/carbon-upstart',
recurse = true,
diff --git a/modules/graphite/templates/local-relay.conf.erb
b/modules/graphite/templates/local-relay.conf.erb
new file mode 100644
index 000..40d1773
--- /dev/null
+++ b/modules/graphite/templates/local-relay.conf.erb
@@ -0,0 +1,13 @@
+# simple carbon-c-relay configuration to replace carbon-relay, will
+# load-balance metrics sending among all members of the local cluster.
+
+cluster carbon-cache
+ any_of
+ % @c_relay_settings['backends'].each do |b| -%
+ %= b %
+ % end -%
+ ;
+
+match *
+ send to carbon-cache
+ ;
diff --git a/modules/graphite/templates/local-relay.upstart.conf.erb
b/modules/graphite/templates/local-relay.upstart.conf.erb
new file mode 100644
index 000..c871672
--- /dev/null
[MediaWiki-commits] [Gerrit] admin: awight stats/hive access - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/181556 Change subject: admin: awight stats/hive access .. admin: awight stats/hive access Bug: T85169 Change-Id: Iec35600fdaccf75b6c47de7621efa67d9cce59f7 --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/56/181556/1 diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index dabe657..a3b321d 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -214,7 +214,7 @@ halfak, dr0ptp4kt, qchris, tnegrin, ironholds, kleduc, nuria, haithams, otto, deskana, bsitzmann, dbrant, declerambaul, ellery, nettrom, leila, - ezachte, mforns, reedy, west1, phuedx] + ezachte, mforns, reedy, west1, phuedx, awight] analytics-admins: gid: 732 description: Admin access to analytics cluster. -- To view, visit https://gerrit.wikimedia.org/r/181556 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec35600fdaccf75b6c47de7621efa67d9cce59f7 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: grant twentyafterfour gallium - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged. Change subject: admin: grant twentyafterfour gallium .. admin: grant twentyafterfour gallium Give twentyafterfour access to gallium through contint-admins group. Approved by manager. Bug: T85033 Change-Id: I3ac7d289e8d8c2cd9d1c7024581a086ce07438ae --- M modules/admin/data/data.yaml 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved Greg Grossmeier: Looks good to me, but someone else must approve Hashar: Looks good to me, but someone else must approve 20after4: Looks good to me, but someone else must approve diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml index dabe657..30e73ad 100644 --- a/modules/admin/data/data.yaml +++ b/modules/admin/data/data.yaml @@ -119,7 +119,7 @@ contint-admins: gid: 719 description: users with some sudo permissions on jenkins hosts -members: [bd808, cscott, demon, krinkle, reedy, marktraceur] +members: [bd808, cscott, demon, krinkle, reedy, marktraceur, twentyafterfour] privileges: ['ALL = (jenkins) NOPASSWD: ALL', 'ALL = (jenkins-slave) NOPASSWD: ALL', 'ALL = (gerritslave) NOPASSWD: ALL', -- To view, visit https://gerrit.wikimedia.org/r/181211 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3ac7d289e8d8c2cd9d1c7024581a086ce07438ae Gerrit-PatchSet: 3 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: John F. Lewis johnflewi...@gmail.com Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org Gerrit-Reviewer: Greg Grossmeier g...@wikimedia.org Gerrit-Reviewer: Hashar has...@free.fr Gerrit-Reviewer: Krinkle krinklem...@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] txstatsd: set explicit permissions and ownership - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/182084
Change subject: txstatsd: set explicit permissions and ownership
..
txstatsd: set explicit permissions and ownership
Change-Id: I1c9d5492512a60a00031baf9c7697fa028145c1b
---
M modules/txstatsd/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/182084/1
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index e2af1c7..b11c80d 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -31,9 +31,15 @@
file { '/etc/txstatsd':
ensure = directory,
+owner = 'root',
+group = 'root',
+mode = '0555',
}
file { '/etc/txstatsd/txstatsd.cfg':
+owner = 'root',
+group = 'root',
+mode = '0444',
content = template('txstatsd/txstatsd.cfg.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/182084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c9d5492512a60a00031baf9c7697fa028145c1b
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] txstatsd: set explicit permissions and ownership - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: txstatsd: set explicit permissions and ownership
..
txstatsd: set explicit permissions and ownership
Change-Id: I1c9d5492512a60a00031baf9c7697fa028145c1b
---
M modules/txstatsd/manifests/init.pp
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
Ottomata: Looks good to me, but someone else must approve
diff --git a/modules/txstatsd/manifests/init.pp
b/modules/txstatsd/manifests/init.pp
index e2af1c7..b11c80d 100644
--- a/modules/txstatsd/manifests/init.pp
+++ b/modules/txstatsd/manifests/init.pp
@@ -31,9 +31,15 @@
file { '/etc/txstatsd':
ensure = directory,
+owner = 'root',
+group = 'root',
+mode = '0555',
}
file { '/etc/txstatsd/txstatsd.cfg':
+owner = 'root',
+group = 'root',
+mode = '0444',
content = template('txstatsd/txstatsd.cfg.erb'),
}
--
To view, visit https://gerrit.wikimedia.org/r/182084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c9d5492512a60a00031baf9c7697fa028145c1b
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: Ottomata 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] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/177765 Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I22760093b0bd3ed277a2a5ea735b24b5e7bc19c0 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 102 insertions(+), 102 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/65/177765/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 7870f63..817aceb 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 74dcc5c..017fb2d 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 35 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 balance +codfw-prod/account.builder, build version 42 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 70440.01 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 70440.01 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 70440.01 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 70440.01 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 70440.01 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 70440.01 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 70440.01 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 70440.01 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 70440.01 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 70440.01 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 70440.01 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 70440.01 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 70440.01 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 70440.01 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 70440.01 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 70440.01 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 70440.01 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 70440.01 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 70440.01 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 70440.01 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 70440.01 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 70440.01 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 70440.01 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 70440.01 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 45940.01 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 45940.01 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 60.00 48184.88 -27 1
[MediaWiki-commits] [Gerrit] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I22760093b0bd3ed277a2a5ea735b24b5e7bc19c0 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz M codfw-prod/object.builder M codfw-prod/object.dump M codfw-prod/object.ring.gz 9 files changed, 102 insertions(+), 102 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 7870f63..817aceb 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 74dcc5c..017fb2d 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 35 -65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 5.00 balance +codfw-prod/account.builder, build version 42 +65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 70440.01 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 70440.01 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 70440.01 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 70440.01 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 70440.01 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 70440.01 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 70440.01 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 70440.01 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 70440.01 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 70440.01 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 70440.01 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 70440.01 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 70440.01 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 70440.01 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 70440.01 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 70440.01 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 70440.01 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 70440.01 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 70440.01 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 70440.01 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 70440.01 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 70440.01 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 70440.01 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 70440.01 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 60.00 45940.01 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 60.00 45940.01 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 60.00 48184.88 -27 1 1 10.192.0.30 6002 10.192.0.30 6002
[MediaWiki-commits] [Gerrit] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/177790 Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I95476c06119568d71bdc747be11cb862f19ba017 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 6 files changed, 62 insertions(+), 62 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/software/swift-ring refs/changes/90/177790/1 diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 817aceb..5ad9f25 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 017fb2d..8cfdb2a 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 42 +codfw-prod/account.builder, build version 43 65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 8120 -0.88 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 8120 -0.88 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 7933 -3.16 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 7933 -3.16 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 8019 -2.11 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 8020 -2.10 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 8121 -0.87 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 8120 -0.88 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 8121 -0.87 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 8121 -0.87 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 8121 -0.87 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 8121 -0.87 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 7933 -3.16 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 7933 -3.16 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 7933 -3.16 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 7932 -3.17 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 7933 -3.16 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 7933 -3.16 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 8020 -2.10 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 8019 -2.11 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 8019 -2.11 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 8020 -2.10 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 8019 -2.11 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 8020 -2.10 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 0.00 1040 999.99 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 0.00 1033 999.99 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 0.00271 999.99 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 0.00300 999.99 -28 1 310.192.32.18 600210.192.32.18
[MediaWiki-commits] [Gerrit] codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 - change (operations...swift-ring)
Filippo Giunchedi has submitted this change and it was merged. Change subject: codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 .. codfw-prod: empty ms-be2013/2014/2015 sdm3/sdn3 we'll need to replace these with actual SSDs RT #8804 Change-Id: I95476c06119568d71bdc747be11cb862f19ba017 --- M codfw-prod/account.builder M codfw-prod/account.dump M codfw-prod/account.ring.gz M codfw-prod/container.builder M codfw-prod/container.dump M codfw-prod/container.ring.gz 6 files changed, 62 insertions(+), 62 deletions(-) Approvals: Filippo Giunchedi: Verified; Looks good to me, approved diff --git a/codfw-prod/account.builder b/codfw-prod/account.builder index 817aceb..5ad9f25 100644 --- a/codfw-prod/account.builder +++ b/codfw-prod/account.builder Binary files differ diff --git a/codfw-prod/account.dump b/codfw-prod/account.dump index 017fb2d..8cfdb2a 100644 --- a/codfw-prod/account.dump +++ b/codfw-prod/account.dump @@ -1,34 +1,34 @@ -codfw-prod/account.builder, build version 42 +codfw-prod/account.builder, build version 43 65536 partitions, 3.00 replicas, 1 regions, 3 zones, 30 devices, 999.99 balance The minimum number of hours before a partition can be reassigned is 3 Devices:id region zone ip address port replication ip replication port name weight partitions balance meta - 0 1 1 10.192.0.19 6002 10.192.0.19 6002 sdm3 92.00 8120 -0.88 - 1 1 1 10.192.0.19 6002 10.192.0.19 6002 sdn3 92.00 8120 -0.88 - 2 1 210.192.16.21 600210.192.16.21 6002 sdm3 92.00 7933 -3.16 - 3 1 210.192.16.21 600210.192.16.21 6002 sdn3 92.00 7933 -3.16 - 4 1 310.192.32.14 600210.192.32.14 6002 sdm3 92.00 8019 -2.11 - 5 1 310.192.32.14 600210.192.32.14 6002 sdn3 92.00 8020 -2.10 - 6 1 1 10.192.0.20 6002 10.192.0.20 6002 sdm3 92.00 8121 -0.87 - 7 1 1 10.192.0.20 6002 10.192.0.20 6002 sdn3 92.00 8120 -0.88 - 8 1 1 10.192.0.21 6002 10.192.0.21 6002 sdm3 92.00 8121 -0.87 - 9 1 1 10.192.0.21 6002 10.192.0.21 6002 sdn3 92.00 8121 -0.87 -10 1 1 10.192.0.22 6002 10.192.0.22 6002 sdm3 92.00 8121 -0.87 -11 1 1 10.192.0.22 6002 10.192.0.22 6002 sdn3 92.00 8121 -0.87 -12 1 210.192.16.22 600210.192.16.22 6002 sdm3 92.00 7933 -3.16 -13 1 210.192.16.22 600210.192.16.22 6002 sdn3 92.00 7933 -3.16 -14 1 210.192.16.23 600210.192.16.23 6002 sdm3 92.00 7933 -3.16 -15 1 210.192.16.23 600210.192.16.23 6002 sdn3 92.00 7932 -3.17 -16 1 210.192.16.24 600210.192.16.24 6002 sdm3 92.00 7933 -3.16 -17 1 210.192.16.24 600210.192.16.24 6002 sdn3 92.00 7933 -3.16 -18 1 310.192.32.15 600210.192.32.15 6002 sdm3 92.00 8020 -2.10 -19 1 310.192.32.15 600210.192.32.15 6002 sdn3 92.00 8019 -2.11 -20 1 310.192.32.16 600210.192.32.16 6002 sdm3 92.00 8019 -2.11 -21 1 310.192.32.16 600210.192.32.16 6002 sdn3 92.00 8020 -2.10 -22 1 310.192.32.17 600210.192.32.17 6002 sdm3 92.00 8019 -2.11 -23 1 310.192.32.17 600210.192.32.17 6002 sdn3 92.00 8020 -2.10 -24 1 210.192.16.32 600210.192.16.32 6002 sdm3 0.00 1040 999.99 -25 1 210.192.16.32 600210.192.16.32 6002 sdn3 0.00 1033 999.99 -26 1 1 10.192.0.30 6002 10.192.0.30 6002 sdm3 0.00271 999.99 -27 1 1 10.192.0.30 6002 10.192.0.30 6002 sdn3 0.00300 999.99 -28 1 310.192.32.18 600210.192.32.18 6002 sdm3 0.00669 999.99 -
[MediaWiki-commits] [Gerrit] diamond: require python-statsd - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178195
Change subject: diamond: require python-statsd
..
diamond: require python-statsd
use require_package due to python-statsd being included multiple times (e.g.
swift)
Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
---
M modules/diamond/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/178195/1
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 9641a6b..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -63,9 +63,12 @@
},
) {
package { [ 'python-diamond', 'python-configobj' ]:
-ensure = present,
+ensure = present,
+require = Class['packages::python_statsd'],
}
+require_package('python-statsd')
+
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/178195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
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: require python-statsd - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: diamond: require python-statsd
..
diamond: require python-statsd
use require_package due to python-statsd being included multiple times (e.g.
swift)
Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
---
M modules/diamond/manifests/init.pp
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 9641a6b..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -63,9 +63,12 @@
},
) {
package { [ 'python-diamond', 'python-configobj' ]:
-ensure = present,
+ensure = present,
+require = Class['packages::python_statsd'],
}
+require_package('python-statsd')
+
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
owner = 'root',
--
To view, visit https://gerrit.wikimedia.org/r/178195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0cc7328c7d8271fe2cc86a88de937d4961c22aa4
Gerrit-PatchSet: 2
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: Giuseppe Lavagetto glavage...@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] python-statsd: use require_package everywhere - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178221
Change subject: python-statsd: use require_package everywhere
..
python-statsd: use require_package everywhere
to avoid duplicate declarations require_package() is needed everywhere
Change-Id: I959194a96c159411f5193991461aa817607bee68
---
M manifests/role/swift.pp
M manifests/swift.pp
M modules/swift_new/manifests/init.pp
M modules/swift_new/manifests/stats/accounts.pp
M modules/swift_new/manifests/stats/dispersion.pp
M modules/zuul/manifests/init.pp
6 files changed, 11 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/21/178221/1
diff --git a/manifests/role/swift.pp b/manifests/role/swift.pp
index 39522ba..b7026e6 100644
--- a/manifests/role/swift.pp
+++ b/manifests/role/swift.pp
@@ -47,7 +47,7 @@
mode= '0555',
source = 'puppet:///files/swift/swift-account-stats',
require = [Package['python-swiftclient'],
-Package['python-statsd']
+Package['packages::python_statsd']
],
}
file { '/etc/swift/account_mw_media.env':
@@ -71,7 +71,7 @@
mode= '0555',
source = 'puppet:///files/swift/swift-dispersion-stats',
require = [Package['swift'],
-Package['python-statsd']
+Package['packages::python_statsd']
],
}
cron { 'swift-dispersion-stats':
@@ -188,7 +188,7 @@
mode= '0555',
source = 'puppet:///files/swift/swift-account-stats',
require = [Package['python-swiftclient'],
-Package['python-statsd']
+Package['packages::python_statsd']
],
}
file { '/etc/swift/account_mw_media.env':
@@ -212,7 +212,7 @@
mode= '0555',
source = 'puppet:///files/swift/swift-dispersion-stats',
require = [Package['swift'],
-Package['python-statsd']
+Package['packages::python_statsd']
],
}
cron { 'swift-dispersion-stats':
diff --git a/manifests/swift.pp b/manifests/swift.pp
index 6f26256..84ab89c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -33,11 +33,12 @@
'swift-doc',
'python-swift',
'python-swiftclient',
-'python-statsd',
]:
ensure = 'present',
}
+require_package('python-statsd')
+
File {
owner = 'swift',
group = 'swift',
diff --git a/modules/swift_new/manifests/init.pp
b/modules/swift_new/manifests/init.pp
index a44cd99..121dbe3 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift_new/manifests/init.pp
@@ -37,12 +37,13 @@
'swift',
'python-swift',
'python-swiftclient',
-'python-statsd',
'parted',
]:
ensure = 'present',
}
+require_package('python-statsd')
+
File {
owner = 'swift',
group = 'swift',
diff --git a/modules/swift_new/manifests/stats/accounts.pp
b/modules/swift_new/manifests/stats/accounts.pp
index e06d721..71c9150 100644
--- a/modules/swift_new/manifests/stats/accounts.pp
+++ b/modules/swift_new/manifests/stats/accounts.pp
@@ -7,7 +7,7 @@
) {
$required_packages = [
Package['python-swiftclient'],
-Package['python-statsd'],
+Package['packages::python_statsd'],
Package['swift'],
]
diff --git a/modules/swift_new/manifests/stats/dispersion.pp
b/modules/swift_new/manifests/stats/dispersion.pp
index c7a5cc7..5a7b530 100644
--- a/modules/swift_new/manifests/stats/dispersion.pp
+++ b/modules/swift_new/manifests/stats/dispersion.pp
@@ -5,7 +5,7 @@
) {
$required_packages = [
Package['python-swiftclient'],
-Package['python-statsd'],
+Package['packages::python_statsd'],
Package['swift'],
]
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 607644c..166e67a 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -41,7 +41,6 @@
'python-smmap',
'python-extras', # backported in Precise (bug 47122)
-'python-statsd',
'python-pip',
'python-setuptools',
@@ -56,6 +55,7 @@
'python-prettytable',
]
+ require_package('python-statsd')
ensure_packages($packages)
# Used to be in /var/lib/git/zuul but /var/lib/git can be used
--
To view, visit https://gerrit.wikimedia.org/r/178221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id:
[MediaWiki-commits] [Gerrit] python-statsd: use require_package everywhere - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: python-statsd: use require_package everywhere
..
python-statsd: use require_package everywhere
to avoid duplicate declarations require_package() is needed everywhere
Change-Id: I959194a96c159411f5193991461aa817607bee68
---
M manifests/swift.pp
M modules/swift_new/manifests/init.pp
M modules/zuul/manifests/init.pp
3 files changed, 5 insertions(+), 3 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/swift.pp b/manifests/swift.pp
index 6f26256..84ab89c 100644
--- a/manifests/swift.pp
+++ b/manifests/swift.pp
@@ -33,11 +33,12 @@
'swift-doc',
'python-swift',
'python-swiftclient',
-'python-statsd',
]:
ensure = 'present',
}
+require_package('python-statsd')
+
File {
owner = 'swift',
group = 'swift',
diff --git a/modules/swift_new/manifests/init.pp
b/modules/swift_new/manifests/init.pp
index a44cd99..121dbe3 100644
--- a/modules/swift_new/manifests/init.pp
+++ b/modules/swift_new/manifests/init.pp
@@ -37,12 +37,13 @@
'swift',
'python-swift',
'python-swiftclient',
-'python-statsd',
'parted',
]:
ensure = 'present',
}
+require_package('python-statsd')
+
File {
owner = 'swift',
group = 'swift',
diff --git a/modules/zuul/manifests/init.pp b/modules/zuul/manifests/init.pp
index 607644c..166e67a 100644
--- a/modules/zuul/manifests/init.pp
+++ b/modules/zuul/manifests/init.pp
@@ -41,7 +41,6 @@
'python-smmap',
'python-extras', # backported in Precise (bug 47122)
-'python-statsd',
'python-pip',
'python-setuptools',
@@ -56,6 +55,7 @@
'python-prettytable',
]
+ require_package('python-statsd')
ensure_packages($packages)
# Used to be in /var/lib/git/zuul but /var/lib/git can be used
--
To view, visit https://gerrit.wikimedia.org/r/178221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I959194a96c159411f5193991461aa817607bee68
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Filippo Giunchedi fgiunch...@wikimedia.org
Gerrit-Reviewer: Hashar has...@free.fr
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] diamond: install python-statsd on = precise - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: diamond: install python-statsd on = precise
..
diamond: install python-statsd on = precise
backporting to lucid is a very small gain for a lot of pain (e.g. no debhelper
9, no python 2.7 by default) and we have very few lucid hosts left, namely:
sodium.wikimedia.org
ms1004.eqiad.wmnet
nescio.esams.wikimedia.org
Change-Id: Ia8b7773c818a6396517497fd050f69a5ea675b8c
---
M modules/diamond/manifests/init.pp
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Filippo Giunchedi: Verified; Looks good to me, approved
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 9014959..240f789 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -67,7 +67,9 @@
require = Class['packages::python_statsd'],
}
-require_package('python-statsd')
+if os_version('debian = jessie || ubuntu = precise') {
+require_package('python-statsd')
+}
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
--
To view, visit https://gerrit.wikimedia.org/r/178475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia8b7773c818a6396517497fd050f69a5ea675b8c
Gerrit-PatchSet: 3
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: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert diamond: install python-statsd on = precise - change (operations/puppet)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178520
Change subject: Revert diamond: install python-statsd on = precise
..
Revert diamond: install python-statsd on = precise
Change-Id: Iad33d47a234b986f9e3bddd7d3e4cd40c474b3a6
---
M modules/diamond/manifests/init.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/178520/1
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 240f789..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -67,9 +67,7 @@
require = Class['packages::python_statsd'],
}
-if os_version('debian = jessie || ubuntu = precise') {
-require_package('python-statsd')
-}
+require_package('python-statsd')
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
--
To view, visit https://gerrit.wikimedia.org/r/178520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iad33d47a234b986f9e3bddd7d3e4cd40c474b3a6
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] Revert diamond: install python-statsd on = precise - change (operations/puppet)
Filippo Giunchedi has submitted this change and it was merged.
Change subject: Revert diamond: install python-statsd on = precise
..
Revert diamond: install python-statsd on = precise
Change-Id: Iad33d47a234b986f9e3bddd7d3e4cd40c474b3a6
---
M modules/diamond/manifests/init.pp
1 file changed, 1 insertion(+), 3 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 240f789..9014959 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -67,9 +67,7 @@
require = Class['packages::python_statsd'],
}
-if os_version('debian = jessie || ubuntu = precise') {
-require_package('python-statsd')
-}
+require_package('python-statsd')
file { [ '/etc/diamond/collectors', '/etc/diamond/handlers' ]:
ensure = directory,
--
To view, visit https://gerrit.wikimedia.org/r/178520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad33d47a234b986f9e3bddd7d3e4cd40c474b3a6
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] debirf.conf: adjust options for this environment - change (operations...rescue-pxe)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178846
Change subject: debirf.conf: adjust options for this environment
..
debirf.conf: adjust options for this environment
Bug: T78135
Change-Id: Iabbfcfba7582ffd76d1fee29b33db4b1f5762cb4
---
M debian-amd64/debirf.conf
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/rescue-pxe
refs/changes/46/178846/3
diff --git a/debian-amd64/debirf.conf b/debian-amd64/debirf.conf
index b6be6af..97febfa 100644
--- a/debian-amd64/debirf.conf
+++ b/debian-amd64/debirf.conf
@@ -3,7 +3,7 @@
# Label for debirf system (for hostname and initrd). debirf will be
# used if unspecified.
#
-DEBIRF_LABEL=debirf-rescue
+DEBIRF_LABEL=rescue
# Where shoud debirf build the image? By default, debirf will build
# in the profile directory.
@@ -13,20 +13,20 @@
# What suite should be used? The default is determined by
# lsb_release, and falls back to sid.
#
-#DEBIRF_SUITE=
+DEBIRF_SUITE=jessie
# The default distro (eg. debian or ubuntu) is based on the distro
# of the suite specified. If you want to use a suite from a
# non-Debian/Ubuntu distro, specify the distro explicitly here (all
# lowercase).
#
-#DEBIRF_DISTRO=
+DEBIRF_DISTRO=debian
# What mirror should debirf pull the suite from? By default, this is
# based on the DEBIRF_DISTRO
# (eg. http://mirrors.kernel.org/${DEBIRF_DISTRO};).
#
-#DEBIRF_MIRROR=
+DEBIRF_MIRROR=http://http.debian.net/debian
# What keyring should be used to verify the debootstrap for the
# specified suite? This is also based on the DEBIRF_DISTRO by
--
To view, visit https://gerrit.wikimedia.org/r/178846
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iabbfcfba7582ffd76d1fee29b33db4b1f5762cb4
Gerrit-PatchSet: 3
Gerrit-Project: operations/software/rescue-pxe
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] add hwraid repository and some utilities - change (operations...rescue-pxe)
Filippo Giunchedi has uploaded a new change for review.
https://gerrit.wikimedia.org/r/178847
Change subject: add hwraid repository and some utilities
..
add hwraid repository and some utilities
nwipe is a fork of dwipe from DBAN
Bug: T78135
Change-Id: I63400acc41c4c135b1ecda9e0e6778194eb091b8
---
A debian-amd64/modules/a10_add_hwraid_repo
A debian-amd64/modules/install-packages
A modules/a10_add_hwraid_repo
A modules/install-packages
4 files changed, 17 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/software/rescue-pxe
refs/changes/47/178847/3
diff --git a/debian-amd64/modules/a10_add_hwraid_repo
b/debian-amd64/modules/a10_add_hwraid_repo
new file mode 12
index 000..58968db
--- /dev/null
+++ b/debian-amd64/modules/a10_add_hwraid_repo
@@ -0,0 +1 @@
+../../modules/a10_add_hwraid_repo
\ No newline at end of file
diff --git a/debian-amd64/modules/install-packages
b/debian-amd64/modules/install-packages
new file mode 12
index 000..ed69266
--- /dev/null
+++ b/debian-amd64/modules/install-packages
@@ -0,0 +1 @@
+../../modules/install-packages
\ No newline at end of file
diff --git a/modules/a10_add_hwraid_repo b/modules/a10_add_hwraid_repo
new file mode 100755
index 000..9ef0892
--- /dev/null
+++ b/modules/a10_add_hwraid_repo
@@ -0,0 +1,6 @@
+#!/bin/sh -e
+
+# jessie isn't there yet
+echo deb http://hwraid.le-vert.net/debian wheezy main \
+${DEBIRF_ROOT}/etc/apt/sources.list.d/hwraid.list
+
diff --git a/modules/install-packages b/modules/install-packages
new file mode 100755
index 000..0315dc0
--- /dev/null
+++ b/modules/install-packages
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+wget -O${DEBIRF_ROOT}/tmp/hwraid.key
http://hwraid.le-vert.net/debian/hwraid.le-vert.net.gpg.key
+debirf_exec apt-key add /tmp/hwraid.key
+
+debirf_exec apt-get update
+debirf_exec apt-get --assume-yes install megacli
+
+# dwipe fork https://github.com/martijnvanbrummelen/nwipe
+debirf_exec apt-get --assume-yes install nwipe
--
To view, visit https://gerrit.wikimedia.org/r/178847
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63400acc41c4c135b1ecda9e0e6778194eb091b8
Gerrit-PatchSet: 3
Gerrit-Project: operations/software/rescue-pxe
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
