Faidon Liambotis has submitted this change and it was merged.
Change subject: netops: disable SNMP checks for OOB interfaces
......................................................................
netops: disable SNMP checks for OOB interfaces
These don't work most of the time and we already monitor the SNMP checks
over the in-band interface anyway.
Change-Id: I80234ef296c8ab8e940463f6052ebff91e91f84a
---
M modules/netops/manifests/check.pp
M modules/netops/manifests/monitoring.pp
2 files changed, 31 insertions(+), 25 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/netops/manifests/check.pp
b/modules/netops/manifests/check.pp
index 2cbf1e6..5d24f16 100644
--- a/modules/netops/manifests/check.pp
+++ b/modules/netops/manifests/check.pp
@@ -4,14 +4,14 @@
#
# === Parameters
#
-# [*snmp_community*]
-# The SNMP community to use to poll the device.
-#
# [*ipv4*]
# The IPv4 address of the device. Required.
#
# [*ipv6*]
# The IPv6 address of the device. Optional.
+#
+# [*snmp_community*]
+# The SNMP community to use to poll the device. Optional
#
# [*interfaces*]
# Whether to perform interface status checks. Defaults to false.
@@ -27,9 +27,9 @@
# }
define netops::check(
- $snmp_community,
$ipv4,
$ipv6=undef,
+ $snmp_community=undef,
$bgp=false,
$interfaces=false,
) {
diff --git a/modules/netops/manifests/monitoring.pp
b/modules/netops/manifests/monitoring.pp
index cbf3652..3d66f60 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -11,38 +11,44 @@
class netops::monitoring {
include passwords::network
+ # core/mgmt routers
$defaults = {
snmp_community => $passwords::network::snmp_ro_community,
interfaces => true,
}
$routers = {
# eqiad
- 'cr1-eqiad' => { ipv4 => '208.80.154.196', ipv6 =>
'2620:0:861:ffff::1', bgp => true, },
- 'cr2-eqiad' => { ipv4 => '208.80.154.197', ipv6 =>
'2620:0:861:ffff::2', bgp => true, },
- 'mr1-eqiad' => { ipv4 => '208.80.154.199', ipv6 =>
'2620:0:861:ffff::6', },
- 'mr1-eqiad.oob' => { ipv4 => '198.32.107.153', ipv6 =>
'2607:f6f0:205::153', },
- 'pfw-eqiad' => { ipv4 => '208.80.154.218', },
+ 'cr1-eqiad' => { ipv4 => '208.80.154.196', ipv6 =>
'2620:0:861:ffff::1', bgp => true, },
+ 'cr2-eqiad' => { ipv4 => '208.80.154.197', ipv6 =>
'2620:0:861:ffff::2', bgp => true, },
+ 'mr1-eqiad' => { ipv4 => '208.80.154.199', ipv6 =>
'2620:0:861:ffff::6', },
+ 'pfw-eqiad' => { ipv4 => '208.80.154.218', },
# eqord
- 'cr1-eqord' => { ipv4 => '208.80.154.198', ipv6 =>
'2620:0:861:ffff::5', bgp => true, },
+ 'cr1-eqord' => { ipv4 => '208.80.154.198', ipv6 =>
'2620:0:861:ffff::5', bgp => true, },
# codfw
- 'cr1-codfw' => { ipv4 => '208.80.153.192', ipv6 =>
'2620:0:860:ffff::1', bgp => true, },
- 'cr2-codfw' => { ipv4 => '208.80.153.193', ipv6 =>
'2620:0:860:ffff::2', bgp => true, },
- 'mr1-codfw' => { ipv4 => '208.80.153.196', ipv6 =>
'2620:0:860:ffff::6', },
- 'mr1-codfw.oob' => { ipv4 => '216.117.46.36', },
- 'pfw-codfw' => { ipv4 => '208.80.153.195', },
+ 'cr1-codfw' => { ipv4 => '208.80.153.192', ipv6 =>
'2620:0:860:ffff::1', bgp => true, },
+ 'cr2-codfw' => { ipv4 => '208.80.153.193', ipv6 =>
'2620:0:860:ffff::2', bgp => true, },
+ 'mr1-codfw' => { ipv4 => '208.80.153.196', ipv6 =>
'2620:0:860:ffff::6', },
+ 'pfw-codfw' => { ipv4 => '208.80.153.195', },
# eqdfw
- 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 =>
'2620:0:860:ffff::6', bgp => true, },
+ 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 =>
'2620:0:860:ffff::6', bgp => true, },
# esams
- 'cr1-esams' => { ipv4 => '91.198.174.245', ipv6 =>
'2620:0:862:ffff::5', bgp => true, },
- 'cr2-esams' => { ipv4 => '91.198.174.244', ipv6 =>
'2620:0:862:ffff::3', bgp => true, },
- 'cr2-knams' => { ipv4 => '91.198.174.246', ipv6 =>
'2620:0:862:ffff::4', bgp => true, },
- 'mr1-esams' => { ipv4 => '91.198.174.247', ipv6 =>
'2620:0:862:ffff::1', },
- 'mr1-esams.oob' => { ipv4 => '164.138.24.90', },
+ 'cr1-esams' => { ipv4 => '91.198.174.245', ipv6 =>
'2620:0:862:ffff::5', bgp => true, },
+ 'cr2-esams' => { ipv4 => '91.198.174.244', ipv6 =>
'2620:0:862:ffff::3', bgp => true, },
+ 'cr2-knams' => { ipv4 => '91.198.174.246', ipv6 =>
'2620:0:862:ffff::4', bgp => true, },
+ 'mr1-esams' => { ipv4 => '91.198.174.247', ipv6 =>
'2620:0:862:ffff::1', },
# ulsfo
- 'cr1-ulsfo' => { ipv4 => '198.35.26.192', ipv6 =>
'2620:0:863:ffff::1', bgp => true, },
- 'cr2-ulsfo' => { ipv4 => '198.35.26.193', ipv6 =>
'2620:0:863:ffff::2', bgp => true, },
- 'mr1-ulsfo' => { ipv4 => '198.35.26.194', ipv6 =>
'2620:0:863:ffff::6', },
- 'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
+ 'cr1-ulsfo' => { ipv4 => '198.35.26.192', ipv6 =>
'2620:0:863:ffff::1', bgp => true, },
+ 'cr2-ulsfo' => { ipv4 => '198.35.26.193', ipv6 =>
'2620:0:863:ffff::2', bgp => true, },
+ 'mr1-ulsfo' => { ipv4 => '198.35.26.194', ipv6 =>
'2620:0:863:ffff::6', },
}
create_resources(netops::check, $routers, $defaults)
+
+ # OOB interfaces -- no SNMP for these
+ $oob = {
+ 'mr1-eqiad.oob' => { ipv4 => '198.32.107.153', ipv6 =>
'2607:f6f0:205::153', },
+ 'mr1-codfw.oob' => { ipv4 => '216.117.46.36', },
+ 'mr1-esams.oob' => { ipv4 => '164.138.24.90', },
+ 'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
+ }
+ create_resources(netops::check, $oob)
}
--
To view, visit https://gerrit.wikimedia.org/r/281490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I80234ef296c8ab8e940463f6052ebff91e91f84a
Gerrit-PatchSet: 2
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
