Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Torrus: add torrus to netmon1001
......................................................................
Torrus: add torrus to netmon1001
another patch to remove torrus from manutius will follow this patch
RT #5148
Change-Id: Ic06536730af2eb2228a2ebf2c3e8f21cd1f66065
---
M manifests/site.pp
1 file changed, 62 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 27c8de1..c912a92 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1098,6 +1098,7 @@
}
node 'manutius.wikimedia.org' {
+
$corerouters = [
'cr2-pmtpa.wikimedia.org',
'cr1-esams.wikimedia.org',
@@ -1859,8 +1860,69 @@
include smokeping
include smokeping::web
include role::librenms
+ include misc::torrus
+ include misc::torrus::web
+ include misc::torrus::xml-generation::cdn
+ include passwords::network
+
+ $snmp_ro_community = $passwords::network::snmp_ro_community
interface::add_ip6_mapped { 'main': }
+
+ $corerouters = [
+ 'cr1-sdtpa.wikimedia.org',
+ 'cr2-pmtpa.wikimedia.org',
+ 'csw1-sdtpa.wikimedia.org',
+ 'cr1-esams.wikimedia.org',
+ 'cr2-knams.wikimedia.org',
+ 'csw2-esams.wikimedia.org',
+ 'cr1-eqiad.wikimedia.org',
+ 'cr2-eqiad.wikimedia.org',
+ 'cr1-ulsfo.wikimedia.org',
+ 'cr2-ulsfo.wikimedia.org',
+ 'mr1-pmtpa.mgmt.pmtpa.wmnet',
+ 'pfw1-eqiad.wikimedia.org'
+ ]
+
+ $accessswitches = [
+ 'asw-a4-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-a5-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-b-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-d-pmtpa.mgmt.pmtpa.wmnet',
+ 'asw-d1-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-d2-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-d3-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw2-d3-sdtpa.mgmt.pmtpa.wmnet',
+ 'asw-a-eqiad.mgmt.eqiad.wmnet',
+ 'asw-b-eqiad.mgmt.eqiad.wmnet',
+ 'asw-c-eqiad.mgmt.eqiad.wmnet',
+ 'asw2-a5-eqiad.mgmt.eqiad.wmnet',
+ 'psw1-eqiad.mgmt.eqiad.wmnet',
+ 'msw1-eqiad.mgmt.eqiad.wmnet',
+ 'msw2-pmtpa.mgmt.pmtpa.wmnet',
+ 'msw2-sdtpa.mgmt.pmtpa.wmnet'
+ ]
+
+ $storagehosts = [ 'nas1-a.pmtpa.wmnet', 'nas1-b.pmtpa.wmnet',
'nas1001-a.eqiad.wmnet', 'nas1001-b.eqiad.wmnet' ]
+
+
+ misc::torrus::discovery::ddxfile { 'corerouters':
+ subtree => '/Core_routers',
+ snmp_community => $snmp_ro_community,
+ hosts => $corerouters,
+ }
+
+ misc::torrus::discovery::ddxfile { 'accessswitches':
+ subtree => '/Access_switches',
+ snmp_community => $snmp_ro_community,
+ hosts => $accessswitches,
+ }
+
+ misc::torrus::discovery::ddxfile { 'storage':
+ subtree => '/Storage',
+ snmp_community => $snmp_ro_community,
+ hosts => $storagehosts,
+ }
}
node 'nfs1.pmtpa.wmnet' {
--
To view, visit https://gerrit.wikimedia.org/r/108314
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic06536730af2eb2228a2ebf2c3e8f21cd1f66065
Gerrit-PatchSet: 12
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: Ori.livneh <o...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
