Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/281495
Change subject: netops: monitor all asw/msw/psw as well
......................................................................
netops: monitor all asw/msw/psw as well
Monitor uptime and Juniper alarms on all switches as well.
Bug: T83992
Change-Id: If7f862791261e47419b2013082592a06961484e7
---
M modules/netops/manifests/check.pp
M modules/netops/manifests/monitoring.pp
2 files changed, 38 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/95/281495/1
diff --git a/modules/netops/manifests/check.pp
b/modules/netops/manifests/check.pp
index b2e5b08..448be66 100644
--- a/modules/netops/manifests/check.pp
+++ b/modules/netops/manifests/check.pp
@@ -33,6 +33,7 @@
$ipv4,
$ipv6=undef,
$snmp_community=undef,
+ $group='routers',
$alarms=false,
$bgp=false,
$interfaces=false,
@@ -40,20 +41,20 @@
@monitoring::host { $title:
ip_address => $ipv4,
- group => 'routers',
+ group => $group,
}
if $ipv6 {
@monitoring::host { "${title} IPv6":
ip_address => $ipv6,
- group => 'routers',
+ group => $group,
}
}
if $alarms {
@monitoring::service { "${title} Juniper alarms":
host => $title,
- group => 'routers',
+ group => $group,
description => 'Juniper alarms',
check_command => "check_jnx_alarms!${snmp_community}",
}
@@ -62,7 +63,7 @@
if $interfaces {
@monitoring::service { "${title} interfaces":
host => $title,
- group => 'routers',
+ group => $group,
description => 'Router interfaces',
check_command => "check_ifstatus_nomon!${snmp_community}",
}
@@ -71,7 +72,7 @@
if $bgp {
@monitoring::service { "${title} BGP status":
host => $title,
- group => 'routers',
+ group => $group,
description => 'BGP status',
check_command => "check_bgp!${snmp_community}",
}
diff --git a/modules/netops/manifests/monitoring.pp
b/modules/netops/manifests/monitoring.pp
index 1c2ee64..c10ee5e 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -12,8 +12,9 @@
include passwords::network
# core/mgmt routers
- $defaults = {
+ $routers_defaults = {
snmp_community => $passwords::network::snmp_ro_community,
+ group => 'routers',
alarms => true,
interfaces => true,
}
@@ -42,7 +43,7 @@
'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)
+ create_resources(netops::check, $routers, $routers_defaults)
# OOB interfaces -- no SNMP for these
$oob = {
@@ -52,4 +53,33 @@
'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
}
create_resources(netops::check, $oob)
+
+ # access/management/peering switches
+ $switches_defaults = {
+ snmp_community => $passwords::network::snmp_ro_community,
+ group => 'switches',
+ alarms => true,
+ }
+ $switches = {
+ # eqiad
+ 'asw-a-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.17', },
+ 'asw2-a5-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.20', },
+ 'asw-b-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.18', },
+ 'asw-c-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.23', },
+ 'asw-d-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.24', },
+ 'msw1-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.10', },
+ 'psw1-eqiad.mgmt.eqiad.wmnet' => { ipv4 => '10.65.0.21', },
+ # codfw
+ 'asw-a-codfw.mgmt.codfw.wmnet' => { ipv4 => '10.193.0.16', },
+ 'asw-b-codfw.mgmt.codfw.wmnet' => { ipv4 => '10.193.0.17', },
+ 'asw-c-codfw.mgmt.codfw.wmnet' => { ipv4 => '10.193.0.18', },
+ 'asw-d-codfw.mgmt.codfw.wmnet' => { ipv4 => '10.193.0.19', },
+ 'msw1-codfw.mgmt.codfw.wmnet' => { ipv4 => '10.193.0.3', },
+ # esams
+ 'asw-esams.mgmt.esams.wmnet' => { ipv4 => '10.21.0.104', },
+ 'csw2-esams.mgmt.esams.wmnet' => { ipv4 => '10.21.0.105', },
+ # ulsfo
+ 'asw-ulsfo.mgmt.ulsfo.wmnet' => { ipv4 => '10.128.128.6', },
+ }
+ create_resources(netops::check, $switches, $switches_defaults)
}
--
To view, visit https://gerrit.wikimedia.org/r/281495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7f862791261e47419b2013082592a06961484e7
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
