Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281473
Change subject: netops: add IPv6 host checks
......................................................................
netops: add IPv6 host checks
Add an IPv6 check to all the routers that have an IPv6 address.
Change-Id: I4bf4cc7a1baca35f7345316dd822174889b1cefb
---
M modules/netops/manifests/check.pp
M modules/netops/manifests/monitoring.pp
2 files changed, 27 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/73/281473/1
diff --git a/modules/netops/manifests/check.pp
b/modules/netops/manifests/check.pp
index f1207f7..5c76a6d 100644
--- a/modules/netops/manifests/check.pp
+++ b/modules/netops/manifests/check.pp
@@ -10,6 +10,9 @@
# [*ipv4*]
# The IPv4 address of the device. Optional.
#
+# [*ipv6*]
+# The IPv6 address of the device. Optional.
+#
# [*interfaces*]
# Whether to perform interface status checks. Defaults to false.
#
@@ -26,16 +29,23 @@
define netops::check(
$snmp_community,
$ipv4=undef,
+ $ipv6=undef,
$bgp=false,
$interfaces=false,
) {
if $ipv4 {
- @monitoring::host { $title:
+ @monitoring::host { "${title} IPv4":
ip_address => $ipv4,
group => 'routers',
}
}
+ if $ipv6 {
+ @monitoring::host { "${title} IPv6":
+ ip_address => $ipv6,
+ group => 'routers',
+ }
+ }
if $interfaces {
@monitoring::service { "${title} interfaces":
diff --git a/modules/netops/manifests/monitoring.pp
b/modules/netops/manifests/monitoring.pp
index b1f912f..c8c98c6 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -17,29 +17,29 @@
}
$routers = {
# eqiad
- 'cr1-eqiad' => { ipv4 => '208.80.154.196', bgp => true, },
- 'cr2-eqiad' => { ipv4 => '208.80.154.197', bgp => true, },
- 'mr1-eqiad' => { ipv4 => '208.80.154.199', },
- 'mr1-eqiad.oob' => { ipv4 => '198.32.107.153', },
+ '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', },
# eqord
- 'cr1-eqord' => { ipv4 => '208.80.154.198', 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', bgp => true, },
- 'cr2-codfw' => { ipv4 => '208.80.153.193', bgp => true, },
- 'mr1-codfw' => { ipv4 => '208.80.153.196', },
+ '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', },
# eqdfw
- 'cr1-eqdfw' => { ipv4 => '208.80.153.198', 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', bgp => true, },
- 'cr2-esams' => { ipv4 => '91.198.174.244', bgp => true, },
- 'cr2-knams' => { ipv4 => '91.198.174.246', bgp => true, },
- 'mr1-esams' => { ipv4 => '91.198.174.247', },
+ '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', },
# ulsfo
- 'cr1-ulsfo' => { ipv4 => '198.35.26.192', bgp => true, },
- 'cr2-ulsfo' => { ipv4 => '198.35.26.193', bgp => true, },
- 'mr1-ulsfo' => { ipv4 => '198.35.26.194', },
+ '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', },
}
create_resources(netops::check, $routers, $defaults)
--
To view, visit https://gerrit.wikimedia.org/r/281473
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4bf4cc7a1baca35f7345316dd822174889b1cefb
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
