Cmjohnson has uploaded a new change for review. https://gerrit.wikimedia.org/r/199918
Change subject: Adding init.pp & power.xml entries for ps1-d1 to d8-eqiad
......................................................................
Adding init.pp & power.xml entries for ps1-d1 to d8-eqiad
Change-Id: Ib46ce78ac248840d47b1e5358ab6d491ba6c42e9
---
M modules/facilities/manifests/init.pp
M modules/torrus/files/xmlconfig/power.xml
2 files changed, 777 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/18/199918/1
diff --git a/modules/facilities/manifests/init.pp
b/modules/facilities/manifests/init.pp
index efa30f7..7e3fbf7 100644
--- a/modules/facilities/manifests/init.pp
+++ b/modules/facilities/manifests/init.pp
@@ -89,5 +89,30 @@
facilities::monitor_pdu_3phase { 'ps1-c8-eqiad':
ip => '10.65.0.55',
}
+ # D
+ facilities::monitor_pdu_3phase { 'ps1-d1-eqiad':
+ ip => '10.65.0.56',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d2-eqiad':
+ ip => '10.65.0.57',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d3-eqiad':
+ ip => '10.65.0.58',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d4-eqiad':
+ ip => '10.65.0.59',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d5-eqiad':
+ ip => '10.65.0.60',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d6-eqiad':
+ ip => '10.65.0.61',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d7-eqiad':
+ ip => '10.65.0.62',
+ }
+ facilities::monitor_pdu_3phase { 'ps1-d8-eqiad':
+ ip => '10.65.0.63',
+ }
}
diff --git a/modules/torrus/files/xmlconfig/power.xml
b/modules/torrus/files/xmlconfig/power.xml
index 28b6246..602f4b7 100644
--- a/modules/torrus/files/xmlconfig/power.xml
+++ b/modules/torrus/files/xmlconfig/power.xml
@@ -2096,6 +2096,702 @@
<apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
</subtree>
</subtree>
+ <subtree
name="ps1-d1-eqiad">
+ <param name="system-id"
value="ps1-d1-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D1, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d1-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d2-eqiad">
+ <param name="system-id"
value="ps1-d2-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D2, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d2-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d3-eqiad">
+ <param name="system-id"
value="ps1-d3-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D3, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Switched CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d3-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d4-eqiad">
+ <param name="system-id"
value="ps1-d4-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D4, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Switched CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d4-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d5-eqiad">
+ <param name="system-id"
value="ps1-d5-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D5, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d5-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d6-eqiad">
+ <param name="system-id"
value="ps1-d6-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D6, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d6-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d7-eqiad">
+ <param name="system-id"
value="ps1-d7-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D7, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d7-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
+
+ <subtree name="ps1-d8-eqiad">
+ <param name="system-id"
value="ps1-d8-eqiad"/>
+ <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
+ <apply-template name="snmp-defaults"/>
+ <param name="legend">
+ Location:Rack D8, eqiad,
Ashburn, USA;
+ Contact:[email protected];
+ Description:Sentry Smart CDU;
+ </param>
+ <param name="snmp-check-sysuptime"
value="yes"/>
+ <param name="snmp-host"
value="ps1-d8-eqiad.mgmt.eqiad.wmnet"/>
+ <param name="snmp-version" value="2c"/>
+ <param name="phases" value="3"/>
+ <subtree name="System">
+ <apply-template
name="servertech-systemgroup"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_X">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Y">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_A_Phase_Z">
+ <param name="tower" value="1"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_A"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_X">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="1"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Y">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="2"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Tower_B_Phase_Z">
+ <param name="tower" value="2"/>
+ <param name="infeed" value="3"/>
+ <apply-template
name="servertech-infeed"/>
+ <param name="tokenset-member"
value="%system-id%_Tower_B"/>
+ </subtree>
+ <subtree name="Sensor_1">
+ <param name="envmon" value="1"/>
+ <param name="th" value="1"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+ <subtree name="Sensor_2">
+ <param name="envmon" value="1"/>
+ <param name="th" value="2"/>
+ <apply-template
name="servertech-temphumidity"/>
+ </subtree>
+
+ <!-- Aggregates -->
+ <subtree name="Tower_A">
+ <param name="aggregate-id"
value="tower1"/>
+ <param name="aggregate-name"
value="Tower A"/>
+ <param name="tower" value="1"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_A"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ <subtree name="Tower_B">
+ <param name="aggregate-id"
value="tower2"/>
+ <param name="aggregate-name"
value="Tower B"/>
+ <param name="tower" value="2"/>
+ <param name="precedence"
value="60"/>
+ <apply-template
name="servertech-infeed-aggr"/>
+ <!-- Define the RPN expressions
for all leaves -->
+ <param name="tower-path"
value="../Tower_B"/>
+ <apply-template
name="servertech-tower-3ph-aggregate-expressions"/>
+ </subtree>
+ </subtree>
</subtree>
</subtree>
@@ -2343,6 +3039,62 @@
<token-set name="ps1-c8-eqiad_Tower_B">
<param name="comment" value="ps1-c8-eqiad Tower B"/>
</token-set>
+
+ <token-set name="ps1-d1-eqiad_Tower_A">
+ <param name="comment" value="ps1-d1-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d1-eqiad_Tower_B">
+ <param name="comment" value="ps1-d1-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d2-eqiad_Tower_A">
+ <param name="comment" value="ps1-d2-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d2-eqiad_Tower_B">
+ <param name="comment" value="ps1-d2-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d3-eqiad_Tower_A">
+ <param name="comment" value="ps1-d3-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d3-eqiad_Tower_B">
+ <param name="comment" value="ps1-d3-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d4-eqiad_Tower_A">
+ <param name="comment" value="ps1-d4-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d4-eqiad_Tower_B">
+ <param name="comment" value="ps1-d4-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d5-eqiad_Tower_A">
+ <param name="comment" value="ps1-d5-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d5-eqiad_Tower_B">
+ <param name="comment" value="ps1-d5-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d6-eqiad_Tower_A">
+ <param name="comment" value="ps1-d6-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d6-eqiad_Tower_B">
+ <param name="comment" value="ps1-d6-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d7-eqiad_Tower_A">
+ <param name="comment" value="ps1-d7-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d7-eqiad_Tower_B">
+ <param name="comment" value="ps1-d7-eqiad Tower B"/>
+ </token-set>
+
+ <token-set name="ps1-d8-eqiad_Tower_A">
+ <param name="comment" value="ps1-d8-eqiad Tower A"/>
+ </token-set>
+ <token-set name="ps1-d8-eqiad_Tower_B">
+ <param name="comment" value="ps1-d8-eqiad Tower B"/>
+ </token-set>
</token-sets>
</configuration>
--
To view, visit https://gerrit.wikimedia.org/r/199918
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib46ce78ac248840d47b1e5358ab6d491ba6c42e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Cmjohnson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
