Faidon Liambotis has submitted this change and it was merged.
Change subject: network: enable check_bgp for cr1-esams/cr2-knams
......................................................................
network: enable check_bgp for cr1-esams/cr2-knams
We previously had check_bgp checks disabled for cr1-esams, as the
combination of the relatively high-latency between eqiad and esams and
the high number of AMS-IX peers (> 200) resulted into check_bgp taking
over 100 seconds to run, hitting timeouts in the process.
Now that check_bgp works with v2c and is actually reasonably fast,
re-enable the check for cr1-esams and add the same for cr2-esams.
$ time ./check_bgp -c <secret> cr1-esams.wikimedia.org
OK: host 'cr1-esams.wikimedia.org', sessions up: 221, down: 0, shutdown: 0
real 0m5.793s
user 0m0.576s
sys 0m0.028s
Change-Id: Iec5aeb6d811f1bc82ee3f6544358964a4527ac36
---
M manifests/network.pp
1 file changed, 12 insertions(+), 13 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/network.pp b/manifests/network.pp
index 466a7ee..a13dd82 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -426,19 +426,12 @@
description => 'Router interfaces',
check_command => "check_ifstatus_nomon!${snmp_ro_community}",
}
-# XXX
-# cr1-esams BGP disabled for now. The check_bgp script takes over 100s
-# to complete on this host currently, assuming reasonably-fair conditions
-# on neon and the network. Probably because esams has 238 BGP peers
-# and it's relatively high-latency from neon. Need to investigate a
-# better solution, as the check_bgp perl script sucks in general and
-# is ancient.
-# @monitoring::service { 'cr1-esams bgp status':
-# host => 'cr1-esams',
-# group => 'routers',
-# description => 'BGP status',
-# check_command => "check_bgp!${snmp_ro_community}",
-# }
+ @monitoring::service { 'cr1-esams bgp status':
+ host => 'cr1-esams',
+ group => 'routers',
+ description => 'BGP status',
+ check_command => "check_bgp!${snmp_ro_community}",
+ }
# cr2-esams
@monitoring::host { 'cr2-esams':
@@ -451,6 +444,12 @@
description => 'Router interfaces',
check_command => "check_ifstatus_nomon!${snmp_ro_community}",
}
+ @monitoring::service { 'cr2-esams bgp status':
+ host => 'cr2-esams',
+ group => 'routers',
+ description => 'BGP status',
+ check_command => "check_bgp!${snmp_ro_community}",
+ }
# cr2-knams
@monitoring::host { 'cr2-knams':
--
To view, visit https://gerrit.wikimedia.org/r/279960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iec5aeb6d811f1bc82ee3f6544358964a4527ac36
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
