Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/246084
Change subject: Only use TcpConnStates diamond collector on parsoid and parsoid
varnish hosts
......................................................................
Only use TcpConnStates diamond collector on parsoid and parsoid varnish hosts
TcpConnStates looks at all TCP connections via netstat --tcp --all.
On hosts with many many connections (e.g. text varnishes), this
takes many many minutes to complete, blocking other metrics from
being regularly reported.
Change-Id: I5a1c5da70c9698cf091fa8c41431c255ac7fde90
---
M manifests/role/parsoid.pp
M modules/diamond/manifests/init.pp
M modules/role/manifests/cache/parsoid.pp
3 files changed, 10 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/84/246084/1
diff --git a/manifests/role/parsoid.pp b/manifests/role/parsoid.pp
index 4d0de85..87f284a 100644
--- a/manifests/role/parsoid.pp
+++ b/manifests/role/parsoid.pp
@@ -135,6 +135,11 @@
nrpe_command => '/usr/lib/nagios/plugins/check_disk -w 40% -c 3% -l
-e',
critical => true,
}
+
+ # Monitor TCP Connection States
+ diamond::collector { 'TcpConnStates':
+ source => 'puppet:///modules/diamond/collector/tcpconnstates.py',
+ }
}
class role::parsoid::beta {
diff --git a/modules/diamond/manifests/init.pp
b/modules/diamond/manifests/init.pp
index 594e039..caf566c 100644
--- a/modules/diamond/manifests/init.pp
+++ b/modules/diamond/manifests/init.pp
@@ -123,8 +123,4 @@
devices =>
'PhysicalDrive[0-9]+$|md[0-9]+$|sd[a-z]+$|x?vd[a-z]+$|disk[0-9]+$|dm-[0-9]+$',
},
}
-
- diamond::collector { 'TcpConnStates':
- source => 'puppet:///modules/diamond/collector/tcpconnstates.py',
- }
}
diff --git a/modules/role/manifests/cache/parsoid.pp
b/modules/role/manifests/cache/parsoid.pp
index eaeff67..8155501 100644
--- a/modules/role/manifests/cache/parsoid.pp
+++ b/modules/role/manifests/cache/parsoid.pp
@@ -3,6 +3,11 @@
description => 'Parsoid Varnish cache server',
}
+ # Monitor TCP Connection States
+ diamond::collector { 'TcpConnStates':
+ source => 'puppet:///modules/diamond/collector/tcpconnstates.py',
+ }
+
include role::cache::2layer
class { 'lvs::realserver':
--
To view, visit https://gerrit.wikimedia.org/r/246084
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5a1c5da70c9698cf091fa8c41431c255ac7fde90
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
