Faidon Liambotis has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230309
Change subject: Add cr1-eqord and cr1-eqdfw to monitoring tools
......................................................................
Add cr1-eqord and cr1-eqdfw to monitoring tools
Specifically:
- icinga
- RANCID
- smokeping
- Torrus
Change-Id: If839f22ae9ed6425393f4bbfaf1845b8ae54f3a7
---
M manifests/network.pp
M manifests/role/torrus.pp
M modules/rancid/files/core/router.db
M modules/smokeping/files/config.d/Targets
4 files changed, 73 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/230309/1
diff --git a/manifests/network.pp b/manifests/network.pp
index 4a83815..8fc0efd 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -328,7 +328,7 @@
description => 'Storage equipment',
}
- ### ESAMS ###
+ ### esams ###
# cr1-esams
@monitoring::host { 'cr1-esams':
@@ -385,7 +385,7 @@
check_command => "check_ifstatus_nomon!${snmp_ro_community}",
}
- ### EQIAD ###
+ ### eqiad ###
# cr1-eqiad
@monitoring::host { 'cr1-eqiad':
@@ -447,7 +447,27 @@
critical => true,
}
- ### ULSFO ###
+ ### eqord ###
+
+ # cr1-eqord
+ @monitoring::host { 'cr1-eqord':
+ ip_address => '208.80.154.198',
+ group => 'routers',
+ }
+ @monitoring::service { 'cr1-eqord interfaces':
+ host => 'cr1-eqord',
+ group => 'routers',
+ description => 'Router interfaces',
+ check_command => "check_ifstatus_nomon!${snmp_ro_community}",
+ }
+ @monitoring::service { 'cr1-eqord bgp status':
+ host => 'cr1-eqord',
+ group => 'routers',
+ description => 'BGP status',
+ check_command => "check_bgp!${snmp_ro_community}",
+ }
+
+ ### ulsfo ###
# cr1-ulsfo
@monitoring::host { 'cr1-ulsfo':
@@ -497,7 +517,7 @@
check_command => "check_ifstatus_nomon!${snmp_ro_community}",
}
- ### CODFW ###
+ ### codfw ###
# cr1-codfw
@monitoring::host { 'cr1-codfw':
@@ -535,4 +555,24 @@
check_command => "check_bgp!${snmp_ro_community}",
}
+ ### eqdfw ###
+
+ # cr1-eqdfw
+ @monitoring::host { 'cr1-eqdfw':
+ ip_address => '208.80.153.198',
+ group => 'routers',
+ }
+ @monitoring::service { 'cr1-eqdfw interfaces':
+ host => 'cr1-eqdfw',
+ group => 'routers',
+ description => 'Router interfaces',
+ check_command => "check_ifstatus_nomon!${snmp_ro_community}",
+ }
+ @monitoring::service { 'cr1-eqdfw bgp status':
+ host => 'cr1-eqdfw',
+ group => 'routers',
+ description => 'BGP status',
+ check_command => "check_bgp!${snmp_ro_community}",
+ }
+
}
diff --git a/manifests/role/torrus.pp b/manifests/role/torrus.pp
index 28eecf8..e2f6174 100644
--- a/manifests/role/torrus.pp
+++ b/manifests/role/torrus.pp
@@ -6,16 +6,18 @@
$snmp_ro_community = $passwords::network::snmp_ro_community
$corerouters = [
+ 'cr1-eqdfw.wikimedia.org',
'cr1-eqiad.wikimedia.org',
+ 'cr1-eqord.wikimedia.org',
'cr1-esams.wikimedia.org',
'cr1-ulsfo.wikimedia.org',
'cr1-ulsfo.wikimedia.org',
+ 'cr2-codfw.wikimedia.org',
'cr2-eqiad.wikimedia.org',
'cr2-knams.wikimedia.org',
'cr2-ulsfo.wikimedia.org',
- 'cr2-codfw.wikimedia.org',
- 'pfw1-eqiad.wikimedia.org',
'pfw1-codfw.wikimedia.org',
+ 'pfw1-eqiad.wikimedia.org',
]
$accessswitches = [
diff --git a/modules/rancid/files/core/router.db
b/modules/rancid/files/core/router.db
index 4d8c93e..3776ae2 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -6,6 +6,7 @@
cr2-knams.wikimedia.org:juniper:up:
cr1-eqiad.wikimedia.org:juniper:up:
cr2-eqiad.wikimedia.org:juniper:up:
+cr1-eqord.wikimedia.org:juniper:up:
asw-a-eqiad.mgmt.eqiad.wmnet:juniper:up:
asw-b-eqiad.mgmt.eqiad.wmnet:juniper:up:
asw-c-eqiad.mgmt.eqiad.wmnet:juniper:up:
@@ -24,6 +25,7 @@
mr1-ulsfo.mgmt.ulsfo.wmnet:juniper:up:
cr1-codfw.wikimedia.org:juniper:up:
cr2-codfw.wikimedia.org:juniper:up:
+cr1-eqdfw.wikimedia.org:juniper:up:
asw-a-codfw.mgmt.codfw.wmnet:juniper:up:
asw-b-codfw.mgmt.codfw.wmnet:juniper:up:
asw-c-codfw.mgmt.codfw.wmnet:juniper:up:
diff --git a/modules/smokeping/files/config.d/Targets
b/modules/smokeping/files/config.d/Targets
index 8aed421..1d2cf45 100644
--- a/modules/smokeping/files/config.d/Targets
+++ b/modules/smokeping/files/config.d/Targets
@@ -15,7 +15,7 @@
+ eqiad
menu = eqiad
-title = Wikimedia Ashburn, Virginia network
+title = Wikimedia Ashburn, VA network
alerts = bigloss,someloss,startloss
++ Core
@@ -91,10 +91,25 @@
title = iron.wikimedia.org [B4-EQIAD]
host = iron.wikimedia.org
++ eqord
+
+menu = eqord
+title = Wikimedia Chicago, IL network
+alerts = bigloss,someloss,startloss
+
+++ Core
+menu = Core
+title = Core Network Infrastructure
+
++++ cr1-eqord
+menu = cr1-eqord
+title = cr1-eqord.wikimedia.org
+host = cr1-eqord.wikimedia.org
+
+ codfw
menu = codfw
-title = Wikimedia Dallas, Texas network
+title = Wikimedia Dallas, TX network
alerts = bigloss,someloss,startloss
++ Core
@@ -110,6 +125,11 @@
menu = cr2-codfw
title = cr2-codfw.wikimedia.org
host = cr2-codfw.wikimedia.org
+
++++ cr1-eqdfw
+menu = cr1-eqdfw
+title = cr1-eqdfw.wikimedia.org
+host = cr1-eqdfw.wikimedia.org
+++ asw-a-codfw
menu = asw-a-codfw
@@ -182,7 +202,7 @@
+ ulsfo
menu = ulsfo
-title = Wikimedia San Francisco, California network
+title = Wikimedia San Francisco, CA network
alerts = bigloss,someloss,startloss
++ Core
--
To view, visit https://gerrit.wikimedia.org/r/230309
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If839f22ae9ed6425393f4bbfaf1845b8ae54f3a7
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
