Ayounsi has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368824 )
Change subject: Add codfw frack to Smokeping, Icinga and Rancid
......................................................................
Add codfw frack to Smokeping, Icinga and Rancid
Bug: T171970
Change-Id: Ibf84e381556d3a56c3756e31f56d58b7de7ca508
---
M modules/netops/manifests/monitoring.pp
M modules/rancid/files/core/router.db
M modules/smokeping/files/config.d/Targets
3 files changed, 31 insertions(+), 17 deletions(-)
Approvals:
jenkins-bot: Verified
Ayounsi: Looks good to me, approved
Dzahn: Looks good to me, but someone else must approve
diff --git a/modules/netops/manifests/monitoring.pp
b/modules/netops/manifests/monitoring.pp
index e001d04..ea5265a 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -20,28 +20,29 @@
}
$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', },
- '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', },
- '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', },
+ 'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw',
'cr2-codfw'], bgp => true, },
# eqdfw
- 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 =>
'2620:0:860:ffff::5', bgp => true, },
+ 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 =>
'2620:0:860:ffff::5', 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', },
+ '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', },
+ '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, $routers_defaults)
@@ -77,6 +78,7 @@
'asw-c-codfw' => { ipv4 => '10.193.0.18', parents => ['cr1-codfw',
'cr2-codfw'] },
'asw-d-codfw' => { ipv4 => '10.193.0.19', parents => ['cr1-codfw',
'cr2-codfw'] },
'msw1-codfw' => { ipv4 => '10.193.0.3', parents => ['cr1-codfw',
'cr2-codfw'] },
+ 'fasw-c-codfw' => { ipv4 => '10.193.0.57', parents => ['pfw3-codfw']
},
# esams
'asw-esams' => { ipv4 => '10.21.0.104', parents => ['cr1-esams',
'cr2-esams'] },
'csw2-esams' => { ipv4 => '10.21.0.105', parents => ['asw-esams']
},
diff --git a/modules/rancid/files/core/router.db
b/modules/rancid/files/core/router.db
index f72a1f2..49c73de 100644
--- a/modules/rancid/files/core/router.db
+++ b/modules/rancid/files/core/router.db
@@ -16,6 +16,8 @@
lab-ex4500-1.mgmt.eqiad.wmnet;juniper;down;
pfw1-eqiad.wikimedia.org;juniper;up;
pfw1-codfw.wikimedia.org;juniper;up;
+pfw3-codfw.wikimedia.org;juniper;up;
+fasw-c-codfw.mgmt.codfw.wmnet;juniper;up;
cr1-ulsfo.wikimedia.org;juniper;up;
cr2-ulsfo.wikimedia.org;juniper;up;
asw-ulsfo.mgmt.ulsfo.wmnet;juniper;up;
diff --git a/modules/smokeping/files/config.d/Targets
b/modules/smokeping/files/config.d/Targets
index 0bdcc8e..e0059da 100644
--- a/modules/smokeping/files/config.d/Targets
+++ b/modules/smokeping/files/config.d/Targets
@@ -219,6 +219,16 @@
title = pfw-codfw.wikimedia.org
host = pfw-codfw.wikimedia.org
++++ pfw3-codfw
+menu = pfw3-codfw
+title = pfw3-codfw.wikimedia.org
+host = pfw3-codfw.wikimedia.org
+
++++ fasw-c-codfw
+menu = fasw-c-codfw
+title = fasw-c-codfw.mgmt.codfw.wmnet
+host = fasw-c-codfw.mgmt.codfw.wmnet
+
+++ rigel
menu = rigel
title = rigel.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/368824
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf84e381556d3a56c3756e31f56d58b7de7ca508
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi <[email protected]>
Gerrit-Reviewer: Ayounsi <[email protected]>
Gerrit-Reviewer: Dzahn <[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
