[MediaWiki-commits] [Gerrit] operations/puppet[production]: Icinga: Add basic monitoring for routers' active RE

2017-08-29 Thread Ayounsi (Code Review)
Ayounsi has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/374435 )

Change subject: Icinga: Add basic monitoring for routers' active RE
..


Icinga: Add basic monitoring for routers' active RE

Bug: T174397
Change-Id: Ibfc003bb76ce50e4db2d95d6cf66eff36bf28e3f
---
M modules/netops/manifests/monitoring.pp
1 file changed, 10 insertions(+), 1 deletion(-)

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 79f4f11..54a59dd 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -30,7 +30,7 @@
 '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', },
-'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw', 
'cr2-codfw'], bgp => true, alarms => false, },
+'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, },
 # esams
@@ -51,6 +51,15 @@
 'mr1-codfw.oob' => { ipv4 => '216.117.46.36',   },
 'mr1-esams.oob' => { ipv4 => '164.138.24.90',   },
 'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
+'re0.cr1-eqiad' => { ipv4 => '10.65.0.12',  parents => 
['mr1-eqiad'] },
+'re0.cr2-eqiad' => { ipv4 => '10.65.0.14',  parents => 
['mr1-eqiad'] },
+'re0.cr1-codfw' => { ipv4 => '10.193.0.10', parents => 
['mr1-codfw'] },
+'re0.cr2-codfw' => { ipv4 => '10.193.0.12', parents => 
['mr1-codfw'] },
+'re0.cr1-esams' => { ipv4 => '10.21.0.116', parents => 
['mr1-esams'] },
+'re0.cr2-esams' => { ipv4 => '10.21.0.117', parents => 
['mr1-esams'] },
+'re0.cr1-ulsfo' => { ipv4 => '10.128.128.2',parents => 
['mr1-ulsfo'] },
+'re0.cr2-ulsfo' => { ipv4 => '10.128.128.3',parents => 
['mr1-ulsfo'] },
+
 }
 create_resources(netops::check, $oob)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/374435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibfc003bb76ce50e4db2d95d6cf66eff36bf28e3f
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ayounsi 
Gerrit-Reviewer: Alexandros Kosiaris 
Gerrit-Reviewer: Ayounsi 
Gerrit-Reviewer: Faidon Liambotis 
Gerrit-Reviewer: Mark Bergsma 
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]: Icinga: Add basic monitoring for routers' active RE

2017-08-28 Thread Ayounsi (Code Review)
Ayounsi has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374435 )

Change subject: Icinga: Add basic monitoring for routers' active RE
..

Icinga: Add basic monitoring for routers' active RE

Bug: T174397
Change-Id: Ibfc003bb76ce50e4db2d95d6cf66eff36bf28e3f
---
M modules/netops/manifests/monitoring.pp
1 file changed, 11 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/35/374435/1

diff --git a/modules/netops/manifests/monitoring.pp 
b/modules/netops/manifests/monitoring.pp
index 79f4f11..84b9cbf 100644
--- a/modules/netops/manifests/monitoring.pp
+++ b/modules/netops/manifests/monitoring.pp
@@ -30,7 +30,8 @@
 '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', },
-'pfw3-codfw' => { ipv4 => '208.80.153.197', parents => ['cr1-codfw', 
'cr2-codfw'], bgp => true, alarms => false, },
+'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, },
 # esams
@@ -51,6 +52,15 @@
 'mr1-codfw.oob' => { ipv4 => '216.117.46.36',   },
 'mr1-esams.oob' => { ipv4 => '164.138.24.90',   },
 'mr1-ulsfo.oob' => { ipv4 => '209.237.234.242', },
+'re0.cr1-eqiad' => { ipv4 => '10.65.0.12',  parents => 
['mr1-eqiad'] },
+'re0.cr2-eqiad' => { ipv4 => '10.65.0.14',  parents => 
['mr1-eqiad'] },
+'re0.cr1-codfw' => { ipv4 => '10.193.0.10', parents => 
['mr1-codfw'] },
+'re0.cr2-codfw' => { ipv4 => '10.193.0.12', parents => 
['mr1-codfw'] },
+'re0.cr1-esams' => { ipv4 => '10.21.0.116', parents => 
['mr1-esams'] },
+'re0.cr2-esams' => { ipv4 => '10.21.0.117', parents => 
['mr1-esams'] },
+'re0.cr1-ulsfo' => { ipv4 => '10.128.128.2',parents => 
['mr1-ulsfo'] },
+'re0.cr2-ulsfo' => { ipv4 => '10.128.128.3',parents => 
['mr1-ulsfo'] },
+
 }
 create_resources(netops::check, $oob)
 

-- 
To view, visit https://gerrit.wikimedia.org/r/374435
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibfc003bb76ce50e4db2d95d6cf66eff36bf28e3f
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