From ded3d426ed4907569c46f38c4d247d9a4ebf2245 Mon Sep 17 00:00:00 2001
From: jhg03a <jhg03a+github@acu.edu>
Date: Fri, 11 Jul 2014 10:26:56 -0500
Subject: [PATCH] added total to graphs since it is a 64-bit counter instead of
 32-bit like sent & received

---
 resource/script_queries/wmi_ifTraffic.xml     |  5 +
 ...face_-_traffic_bitssec_95th_percentile.xml | 78 +++++++++++++++-
 ...ace_-_traffic_bytessec_total_bandwidth.xml | 91 ++++++++++++++++++-
 3 files changed, 168 insertions(+), 6 deletions(-)

diff --git a/resource/script_queries/wmi_ifTraffic.xml b/resource/script_queries/wmi_ifTraffic.xml
index 7c7d31a..6851e8d 100644
--- a/resource/script_queries/wmi_ifTraffic.xml
+++ b/resource/script_queries/wmi_ifTraffic.xml
@@ -61,6 +61,11 @@
 			<direction>output</direction>
 			<query_name>stats_BytesSentPersec</query_name>
 		</stats_BytesSentPersec>
+		<stats_BytesTotalPersec>
+			<name>Bytes Total Per Second</name>
+			<direction>output</direction>
+			<query_name>stats_BytesTotalPersec</query_name>
+		</stats_BytesTotalPersec>
 		<stats_OutputQueueLength>
 			<name>Output Queue Length</name>
 			<direction>output</direction>
diff --git a/templates/cacti_graph_template_windows_-_interface_-_traffic_bitssec_95th_percentile.xml b/templates/cacti_graph_template_windows_-_interface_-_traffic_bitssec_95th_percentile.xml
index 54d9f13..c631103 100644
--- a/templates/cacti_graph_template_windows_-_interface_-_traffic_bitssec_95th_percentile.xml
+++ b/templates/cacti_graph_template_windows_-_interface_-_traffic_bitssec_95th_percentile.xml
@@ -144,6 +144,58 @@
 				<hard_return>on</hard_return>
 				<sequence>8</sequence>
 			</hash_10002466c4cfaa554507407152d087401f4272>
+			<hash_100024dad1b2cec49033c20bef46b206751263>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>008A77</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>4</graph_type_id>
+				<consolidation_function_id>3</consolidation_function_id>
+				<cdef_id>hash_05002473f95f8b77b5508157d64047342c421e</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Total</text_format>
+				<hard_return></hard_return>
+				<sequence>9</sequence>
+			</hash_100024dad1b2cec49033c20bef46b206751263>
+			<hash_1000241bfc0c81351a468e38b88e146b689946>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>4</consolidation_function_id>
+				<cdef_id>hash_05002473f95f8b77b5508157d64047342c421e</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Current:</text_format>
+				<hard_return></hard_return>
+				<sequence>10</sequence>
+			</hash_1000241bfc0c81351a468e38b88e146b689946>
+			<hash_100024c50629361112e4d7930b1382a5b0f7d6>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>1</consolidation_function_id>
+				<cdef_id>hash_05002473f95f8b77b5508157d64047342c421e</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Average:</text_format>
+				<hard_return></hard_return>
+				<sequence>11</sequence>
+			</hash_100024c50629361112e4d7930b1382a5b0f7d6>
+			<hash_10002410fdad7ebb203432e02f898e0c88aa1a>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>3</consolidation_function_id>
+				<cdef_id>hash_05002473f95f8b77b5508157d64047342c421e</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Maximum:</text_format>
+				<hard_return>on</hard_return>
+				<sequence>12</sequence>
+			</hash_10002410fdad7ebb203432e02f898e0c88aa1a>
 			<hash_1000242b0a6822a5a27ca60f3f951573b2a596>
 				<task_item_id>0</task_item_id>
 				<color_id>0</color_id>
@@ -155,7 +207,7 @@
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format></text_format>
 				<hard_return>on</hard_return>
-				<sequence>9</sequence>
+				<sequence>13</sequence>
 			</hash_1000242b0a6822a5a27ca60f3f951573b2a596>
 			<hash_100024fe79fffa497f01e277044984689c613c>
 				<task_item_id>hash_080024b8485afc33815771ab8074989ee21cb6</task_item_id>
@@ -168,7 +220,7 @@
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format>95th Percentile</text_format>
 				<hard_return></hard_return>
-				<sequence>10</sequence>
+				<sequence>14</sequence>
 			</hash_100024fe79fffa497f01e277044984689c613c>
 			<hash_100024aae3942c32fe83b0d038e4640bd10917>
 				<task_item_id>hash_080024b8485afc33815771ab8074989ee21cb6</task_item_id>
@@ -181,10 +233,16 @@
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format>(|95:bits:6:max:2| mbit in+out)</text_format>
 				<hard_return></hard_return>
-				<sequence>11</sequence>
+				<sequence>15</sequence>
 			</hash_100024aae3942c32fe83b0d038e4640bd10917>
 		</items>
 		<inputs>
+			<hash_090024f54d792396ffbf021af903be01c6e1f9>
+				<name>Data Source [traffic_total]</name>
+				<description></description>
+				<column_name>task_item_id</column_name>
+				<items>hash_000024dad1b2cec49033c20bef46b206751263|hash_0000241bfc0c81351a468e38b88e146b689946|hash_000024c50629361112e4d7930b1382a5b0f7d6|hash_00002410fdad7ebb203432e02f898e0c88aa1a</items>
+			</hash_090024f54d792396ffbf021af903be01c6e1f9>
 			<hash_090024df465434c97933096aa8cea7ea2c279b>
 				<name>Data Source [traffic_in]</name>
 				<description></description>
@@ -255,6 +313,20 @@
 				<t_data_input_field_id></t_data_input_field_id>
 				<data_input_field_id>0</data_input_field_id>
 			</hash_0800240cbdf7de1362edfd2baafee127598878>
+			<hash_080024042a205e5540846099cabf22385fc112>
+				<t_data_source_name></t_data_source_name>
+				<data_source_name>traffic_total</data_source_name>
+				<t_rrd_minimum></t_rrd_minimum>
+				<rrd_minimum>0</rrd_minimum>
+				<t_rrd_maximum></t_rrd_maximum>
+				<rrd_maximum>U</rrd_maximum>
+				<t_data_source_type_id></t_data_source_type_id>
+				<data_source_type_id>2</data_source_type_id>
+				<t_rrd_heartbeat></t_rrd_heartbeat>
+				<rrd_heartbeat>600</rrd_heartbeat>
+				<t_data_input_field_id></t_data_input_field_id>
+				<data_input_field_id>0</data_input_field_id>
+			</hash_080024042a205e5540846099cabf22385fc112>
 		</items>
 		<data>
 			<item_000>
diff --git a/templates/cacti_graph_template_windows_-_interface_-_traffic_bytessec_total_bandwidth.xml b/templates/cacti_graph_template_windows_-_interface_-_traffic_bytessec_total_bandwidth.xml
index d2b08d9..92ad3f9 100644
--- a/templates/cacti_graph_template_windows_-_interface_-_traffic_bytessec_total_bandwidth.xml
+++ b/templates/cacti_graph_template_windows_-_interface_-_traffic_bytessec_total_bandwidth.xml
@@ -89,7 +89,7 @@
 				<value></value>
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format>Maximum:</text_format>
-				<hard_return></hard_return>
+				<hard_return>on</hard_return>
 				<sequence>4</sequence>
 			</hash_100024a3e0a7cf3b01d2e74ab75ce189a88027>
 			<hash_10002449fb47fac0f8a576a053f498f2de9f8f>
@@ -154,7 +154,7 @@
 				<value></value>
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format>Maximum:</text_format>
-				<hard_return></hard_return>
+				<hard_return>on</hard_return>
 				<sequence>11</sequence>
 			</hash_100024bad2848731b648442ffb0354d7fdf2f8>
 			<hash_1000243feb327a4fa9b3c6a55bfc5bd2de1cbc>
@@ -167,9 +167,74 @@
 				<value></value>
 				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
 				<text_format>Total Out: |sum:auto:current:2:auto|</text_format>
-				<hard_return></hard_return>
+				<hard_return>on</hard_return>
 				<sequence>12</sequence>
 			</hash_1000243feb327a4fa9b3c6a55bfc5bd2de1cbc>
+			<hash_1000245162800064e40fbd5ad48b5f3ca44376>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>DA4725</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>4</graph_type_id>
+				<consolidation_function_id>3</consolidation_function_id>
+				<cdef_id>0</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Combined</text_format>
+				<hard_return></hard_return>
+				<sequence>13</sequence>
+			</hash_1000245162800064e40fbd5ad48b5f3ca44376>
+			<hash_10002456bdc1811de1346b74b67d0d31bedd7c>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>4</consolidation_function_id>
+				<cdef_id>0</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Current:</text_format>
+				<hard_return></hard_return>
+				<sequence>14</sequence>
+			</hash_10002456bdc1811de1346b74b67d0d31bedd7c>
+			<hash_100024d59e939f39a41f97a1e6176ea11f604e>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>1</consolidation_function_id>
+				<cdef_id>0</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Average:</text_format>
+				<hard_return></hard_return>
+				<sequence>15</sequence>
+			</hash_100024d59e939f39a41f97a1e6176ea11f604e>
+			<hash_100024c8a42b47d2467aaeed8029faafabc6e8>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>9</graph_type_id>
+				<consolidation_function_id>3</consolidation_function_id>
+				<cdef_id>0</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Maximum:</text_format>
+				<hard_return>on</hard_return>
+				<sequence>16</sequence>
+			</hash_100024c8a42b47d2467aaeed8029faafabc6e8>
+			<hash_1000241c89fe3cf440e1e9e4bc508b57a08cde>
+				<task_item_id>hash_080024042a205e5540846099cabf22385fc112</task_item_id>
+				<color_id>0</color_id>
+				<alpha>FF</alpha>
+				<graph_type_id>1</graph_type_id>
+				<consolidation_function_id>1</consolidation_function_id>
+				<cdef_id>0</cdef_id>
+				<value></value>
+				<gprint_id>hash_060024e9c43831e54eca8069317a2ce8c6f751</gprint_id>
+				<text_format>Total Combined: |sum:auto:current:2:auto|</text_format>
+				<hard_return></hard_return>
+				<sequence>17</sequence>
+			</hash_1000241c89fe3cf440e1e9e4bc508b57a08cde>
 		</items>
 		<inputs>
 			<hash_0900241157a3abd1ac778388280f4e4e4ae924>
@@ -184,6 +249,12 @@
 				<column_name>task_item_id</column_name>
 				<items>hash_000024bad2848731b648442ffb0354d7fdf2f8|hash_00002474ea711cca395188859c3c06b4d7ee54|hash_000024cb9f5e8fa65772113c2392f3bd0892fa|hash_0000247a238c53eafd9beb2a63ce83fd288e05|hash_0000243feb327a4fa9b3c6a55bfc5bd2de1cbc</items>
 			</hash_090024dcb0cd08b14eaacedaa3dd2d2816cf4b>
+			<hash_090024d4abd25c4fade92123aa1f61825bdf9b>
+				<name>Data Source [traffic_total]</name>
+				<description></description>
+				<column_name>task_item_id</column_name>
+				<items>hash_0000245162800064e40fbd5ad48b5f3ca44376|hash_00002456bdc1811de1346b74b67d0d31bedd7c|hash_000024d59e939f39a41f97a1e6176ea11f604e|hash_000024c8a42b47d2467aaeed8029faafabc6e8|hash_0000241c89fe3cf440e1e9e4bc508b57a08cde</items>
+			</hash_090024d4abd25c4fade92123aa1f61825bdf9b>
 		</inputs>
 	</hash_000024e4f4389176c3d9ae148f956ad7cb9fe2>
 	<hash_01002467ae0049f4b759e56958a5a5ec0749b1>
@@ -242,6 +313,20 @@
 				<t_data_input_field_id></t_data_input_field_id>
 				<data_input_field_id>0</data_input_field_id>
 			</hash_0800240cbdf7de1362edfd2baafee127598878>
+			<hash_080024042a205e5540846099cabf22385fc112>
+				<t_data_source_name></t_data_source_name>
+				<data_source_name>traffic_total</data_source_name>
+				<t_rrd_minimum></t_rrd_minimum>
+				<rrd_minimum>0</rrd_minimum>
+				<t_rrd_maximum></t_rrd_maximum>
+				<rrd_maximum>U</rrd_maximum>
+				<t_data_source_type_id></t_data_source_type_id>
+				<data_source_type_id>2</data_source_type_id>
+				<t_rrd_heartbeat></t_rrd_heartbeat>
+				<rrd_heartbeat>600</rrd_heartbeat>
+				<t_data_input_field_id></t_data_input_field_id>
+				<data_input_field_id>0</data_input_field_id>
+			</hash_080024042a205e5540846099cabf22385fc112>
 		</items>
 		<data>
 			<item_000>