Alexandros Kosiaris has submitted this change and it was merged.
Change subject: torrus - remove pmpta subtrees and renderers
......................................................................
torrus - remove pmpta subtrees and renderers
Change-Id: I0f1b9e5c31939ae17d6e448573a6cd8a3e69965c
---
M files/torrus/conf/schema-override.pl
M files/torrus/xmlconfig/facilities_aggregates.xml
M files/torrus/xmlconfig/power.xml
3 files changed, 3 insertions(+), 540 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/files/torrus/conf/schema-override.pl
b/files/torrus/conf/schema-override.pl
index 4b197d0..0bc9b30 100644
--- a/files/torrus/conf/schema-override.pl
+++ b/files/torrus/conf/schema-override.pl
@@ -13,9 +13,4 @@
$Torrus::Renderer::graphStyles{'mobile-eqiad'}{'color'} = '#e6004d';
$Torrus::Renderer::graphStyles{'api-eqiad'}{'color'} = '##yellow';
-$Torrus::Renderer::graphStyles{'text-pmtpa'}{'color'} = '#5555cc';
-$Torrus::Renderer::graphStyles{'upload-pmtpa'}{'color'} = '#33337a';
-$Torrus::Renderer::graphStyles{'bits-pmtpa'}{'color'} = '#4545a6';
-$Torrus::Renderer::graphStyles{'mobile-pmtpa'}{'color'} = '#4545A6';
-$Torrus::Renderer::graphStyles{'api-pmtpa'}{'color'} = '##orange';
diff --git a/files/torrus/xmlconfig/facilities_aggregates.xml
b/files/torrus/xmlconfig/facilities_aggregates.xml
index b5f766c..e8c8ea8 100644
--- a/files/torrus/xmlconfig/facilities_aggregates.xml
+++ b/files/torrus/xmlconfig/facilities_aggregates.xml
@@ -5,17 +5,15 @@
<datasources>
<subtree name="Power_usage">
<subtree name="Total_power_usage">
- <param name="expr-Power_Measured_pmtpa"
value="{/Power_strips/pmtpa/ps1-c1-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-c2-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-c3-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d1-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d2-pmtpa/System/Total_power},{/Power_strips/pmtpa/ps1-d3-pmtpa/System/Total_power},ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN"/>
<param name="expr-Power_Measured_eqiad"
value="{/Power_strips/eqiad/ps1-a1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-a8-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-b8-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c1-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c2-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c3-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c4-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c5-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c6-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c7-eqiad/System/Total_power},{/Power_strips/eqiad/ps1-c8-eqiad/System/Total_power},ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN,ADDNAN"/>
- <param name="expr-Power_Measured"
value="%expr-Power_Measured_pmtpa%,%expr-Power_Measured_eqiad%,ADDNAN,ADDNAN"/>
+ <param name="expr-Power_Measured"
value="%expr-Power_Measured_eqiad%,ADDNAN,ADDNAN"/>
- <param name="expr-Power_Estimated_pmtpa"
value="%expr-Power_Measured_pmtpa%,16000,ADDNAN"/>
<param name="expr-Power_Estimated_eqiad"
value="%expr-Power_Measured_eqiad%,0,ADDNAN"/>
<param name="expr-Power_Estimated_esams"
value="32200"/>
<param name="expr-Power_Estimated_knams"
value="3680"/>
- <param name="expr-Power_Estimated"
value="%expr-Power_Estimated_pmtpa%,%expr-Power_Estimated_eqiad%,%expr-Power_Estimated_esams%,%expr-Power_Estimated_knams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN"/>
+ <param name="expr-Power_Estimated"
value="%expr-Power_Estimated_eqiad%,%expr-Power_Estimated_esams%,%expr-Power_Estimated_knams%,ADDNAN,ADDNAN,ADDNAN,ADDNAN"/>
<leaf name="Total_measured_power">
<param name="ds-type" value="rrd-file"/>
diff --git a/files/torrus/xmlconfig/power.xml b/files/torrus/xmlconfig/power.xml
index 8eb3ca1..28b6246 100644
--- a/files/torrus/xmlconfig/power.xml
+++ b/files/torrus/xmlconfig/power.xml
@@ -13,494 +13,6 @@
<datasources>
<subtree name="Power_strips">
- <subtree name="pmtpa">
- <subtree name="ps1-c1-pmtpa">
- <param name="system-id"
value="ps1-c1-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack C1, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-c1-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- <subtree name="ps1-c2-pmtpa">
- <param name="system-id"
value="ps1-c2-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack C2, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-c2-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- <subtree name="ps1-c3-pmtpa">
- <param name="system-id"
value="ps1-c3-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack C3, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-c3-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- <subtree name="ps1-d1-pmtpa">
- <param name="system-id"
value="ps1-d1-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack D1, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-d1-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- <subtree name="ps1-d2-pmtpa">
- <param name="system-id"
value="ps1-d2-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack D2, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-d2-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- <subtree name="ps1-d3-pmtpa">
- <param name="system-id"
value="ps1-d3-pmtpa"/>
- <param name="data-dir"
value="/var/lib/torrus/collector_rrd"/>
- <apply-template name="snmp-defaults"/>
- <param name="legend">
- Location:Rack D3, pmtpa, Tampa,
USA;
- Contact:n...@wikimedia.org;
- Uptime:4 days since 20-09-2008
23{COLON}15;
- Description:Sentry Smart CDU;
- </param>
- <param name="snmp-check-sysuptime"
value="yes"/>
- <param name="snmp-host"
value="ps1-d3-pmtpa.mgmt.pmtpa.wmnet"/>
- <param name="snmp-version" value="2c"/>
- <param name="phases" value="1"/>
- <subtree name="System">
- <apply-template
name="servertech-systemgroup"/>
- </subtree>
- <subtree name="Tower_A_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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_Infeed_A">
- <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_Infeed_B">
- <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_Infeed_C">
- <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-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-aggregate-expressions"/>
- </subtree>
- <subtree name="Sensor_1">
- <param name="envmon" value="1"/>
- <param name="th" value="1"/>
- <apply-template
name="servertech-temphumidity"/>
- </subtree>
- </subtree>
-
- </subtree>
<subtree name="eqiad">
<subtree name="ps1-a1-eqiad">
@@ -2659,52 +2171,10 @@
<param name="ds-expr-Power"
value="%expr-Power_value%"/>
<param name="ds-expr-Capacity"
value="%expr-Voltage%,%expr-Capacity%,*,%phases%,SQRT,/"/>
</leaf>
- </template>
+ </template>
</datasources>
<token-sets>
-
- <token-set name="ps1-c1-pmtpa_Tower_A">
- <param name="comment" value="ps1-c1-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-c1-pmtpa_Tower_B">
- <param name="comment" value="ps1-c1-pmtpa Tower B"/>
- </token-set>
-
- <token-set name="ps1-c2-pmtpa_Tower_A">
- <param name="comment" value="ps1-c2-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-c2-pmtpa_Tower_B">
- <param name="comment" value="ps1-c2-pmtpa Tower B"/>
- </token-set>
-
- <token-set name="ps1-c3-pmtpa_Tower_A">
- <param name="comment" value="ps1-c3-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-c3-pmtpa_Tower_B">
- <param name="comment" value="ps1-c3-pmtpa Tower B"/>
- </token-set>
-
- <token-set name="ps1-d1-pmtpa_Tower_A">
- <param name="comment" value="ps1-d1-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-d1-pmtpa_Tower_B">
- <param name="comment" value="ps1-d1-pmtpa Tower B"/>
- </token-set>
-
- <token-set name="ps1-d2-pmtpa_Tower_A">
- <param name="comment" value="ps1-d2-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-d2-pmtpa_Tower_B">
- <param name="comment" value="ps1-d2-pmtpa Tower B"/>
- </token-set>
-
- <token-set name="ps1-d3-pmtpa_Tower_A">
- <param name="comment" value="ps1-d3-pmtpa Tower A"/>
- </token-set>
- <token-set name="ps1-d3-pmtpa_Tower_B">
- <param name="comment" value="ps1-d3-pmtpa Tower B"/>
- </token-set>
<token-set name="ps1-a1-eqiad_Tower_A">
<param name="comment" value="ps1-a1-eqiad Tower A"/>
--
To view, visit https://gerrit.wikimedia.org/r/164492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0f1b9e5c31939ae17d6e448573a6cd8a3e69965c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: ArielGlenn <ar...@wikimedia.org>
Gerrit-Reviewer: Hoo man <h...@online.de>
Gerrit-Reviewer: Mark Bergsma <m...@wikimedia.org>
Gerrit-Reviewer: Matanya <mata...@foss.co.il>
Gerrit-Reviewer: RobH <r...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
