[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga
Ayounsi has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/370658 ) Change subject: Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga .. Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga Bug: T171970 Change-Id: If68ba22cbbbc765bdd9faab7fc3eb45f5dfaf89f --- M modules/netops/manifests/monitoring.pp M modules/rancid/files/core/router.db M modules/role/manifests/torrus.pp M modules/smokeping/files/config.d/Targets 4 files changed, 0 insertions(+), 8 deletions(-) Approvals: jenkins-bot: Verified Ayounsi: Looks good to me, approved diff --git a/modules/netops/manifests/monitoring.pp b/modules/netops/manifests/monitoring.pp index f493589..79f4f11 100644 --- a/modules/netops/manifests/monitoring.pp +++ b/modules/netops/manifests/monitoring.pp @@ -30,7 +30,6 @@ 'cr1-codfw' => { ipv4 => '208.80.153.192', ipv6 => '2620:0:860:::1', bgp => true, }, 'cr2-codfw' => { ipv4 => '208.80.153.193', ipv6 => '2620:0:860:::2', bgp => true, }, 'mr1-codfw' => { ipv4 => '208.80.153.196', ipv6 => '2620:0:860:::6', }, -'pfw-codfw' => { ipv4 => '208.80.153.195', }, 'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw', 'cr2-codfw'], bgp => true, alarms => false, }, # eqdfw 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 => '2620:0:860:::5', bgp => true, }, diff --git a/modules/rancid/files/core/router.db b/modules/rancid/files/core/router.db index 49c73de..b93ec25 100644 --- a/modules/rancid/files/core/router.db +++ b/modules/rancid/files/core/router.db @@ -15,7 +15,6 @@ lab-ex4200-1.mgmt.eqiad.wmnet;juniper;down; 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; diff --git a/modules/role/manifests/torrus.pp b/modules/role/manifests/torrus.pp index 0ac8b38..6df8763 100644 --- a/modules/role/manifests/torrus.pp +++ b/modules/role/manifests/torrus.pp @@ -17,7 +17,6 @@ 'cr2-eqiad.wikimedia.org', 'cr2-knams.wikimedia.org', 'cr2-ulsfo.wikimedia.org', -'pfw1-codfw.wikimedia.org', 'pfw1-eqiad.wikimedia.org', ] diff --git a/modules/smokeping/files/config.d/Targets b/modules/smokeping/files/config.d/Targets index e0059da..4b152b5 100644 --- a/modules/smokeping/files/config.d/Targets +++ b/modules/smokeping/files/config.d/Targets @@ -214,11 +214,6 @@ menu = frack title = Fundraising Infrastructure -+++ pfw-codfw -menu = pfw-codfw -title = pfw-codfw.wikimedia.org -host = pfw-codfw.wikimedia.org - +++ pfw3-codfw menu = pfw3-codfw title = pfw3-codfw.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/370658 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If68ba22cbbbc765bdd9faab7fc3eb45f5dfaf89f Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ayounsi Gerrit-Reviewer: Ayounsi Gerrit-Reviewer: Giuseppe Lavagetto Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga
Ayounsi has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/370658 ) Change subject: Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga .. Remove pfw-codfw from Smokeping, Rancid, Torrus, Icinga Bug: T171970 Change-Id: If68ba22cbbbc765bdd9faab7fc3eb45f5dfaf89f --- M modules/netops/manifests/monitoring.pp M modules/rancid/files/core/router.db M modules/role/manifests/torrus.pp M modules/smokeping/files/config.d/Targets 4 files changed, 0 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/58/370658/1 diff --git a/modules/netops/manifests/monitoring.pp b/modules/netops/manifests/monitoring.pp index f493589..79f4f11 100644 --- a/modules/netops/manifests/monitoring.pp +++ b/modules/netops/manifests/monitoring.pp @@ -30,7 +30,6 @@ 'cr1-codfw' => { ipv4 => '208.80.153.192', ipv6 => '2620:0:860:::1', bgp => true, }, 'cr2-codfw' => { ipv4 => '208.80.153.193', ipv6 => '2620:0:860:::2', bgp => true, }, 'mr1-codfw' => { ipv4 => '208.80.153.196', ipv6 => '2620:0:860:::6', }, -'pfw-codfw' => { ipv4 => '208.80.153.195', }, 'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw', 'cr2-codfw'], bgp => true, alarms => false, }, # eqdfw 'cr1-eqdfw' => { ipv4 => '208.80.153.198', ipv6 => '2620:0:860:::5', bgp => true, }, diff --git a/modules/rancid/files/core/router.db b/modules/rancid/files/core/router.db index 49c73de..b93ec25 100644 --- a/modules/rancid/files/core/router.db +++ b/modules/rancid/files/core/router.db @@ -15,7 +15,6 @@ lab-ex4200-1.mgmt.eqiad.wmnet;juniper;down; 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; diff --git a/modules/role/manifests/torrus.pp b/modules/role/manifests/torrus.pp index 0ac8b38..6df8763 100644 --- a/modules/role/manifests/torrus.pp +++ b/modules/role/manifests/torrus.pp @@ -17,7 +17,6 @@ 'cr2-eqiad.wikimedia.org', 'cr2-knams.wikimedia.org', 'cr2-ulsfo.wikimedia.org', -'pfw1-codfw.wikimedia.org', 'pfw1-eqiad.wikimedia.org', ] diff --git a/modules/smokeping/files/config.d/Targets b/modules/smokeping/files/config.d/Targets index e0059da..4b152b5 100644 --- a/modules/smokeping/files/config.d/Targets +++ b/modules/smokeping/files/config.d/Targets @@ -214,11 +214,6 @@ menu = frack title = Fundraising Infrastructure -+++ pfw-codfw -menu = pfw-codfw -title = pfw-codfw.wikimedia.org -host = pfw-codfw.wikimedia.org - +++ pfw3-codfw menu = pfw3-codfw title = pfw3-codfw.wikimedia.org -- To view, visit https://gerrit.wikimedia.org/r/370658 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If68ba22cbbbc765bdd9faab7fc3eb45f5dfaf89f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Ayounsi ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits