From: Krzysztof Piotr Oledzki <ole@ans.pl>
Date: Mon, 25 Oct 2010 12:59:22 +0000 (+0200)
Subject: [CONTRIB] Update Cacti Tempates
X-Git-Tag: v1.5-dev8~425
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6190b7d9dca43c18c1f37b96091610976289561c;p=thirdparty%2Fhaproxy.git

[CONTRIB] Update Cacti Tempates

This patch adds new haproxy_socket.xml template and updates
haproxy_backend.xml and haproxy_frontend.xml templates.
(cherry picked from commit 67cd1d55b5513e4186f021a7014e9442fd7a710f)
---

diff --git a/contrib/netsnmp-perl/haproxy_backend.xml b/contrib/netsnmp-perl/haproxy_backend.xml
index 9bbde2fe8e..a5dbe543d6 100644
--- a/contrib/netsnmp-perl/haproxy_backend.xml
+++ b/contrib/netsnmp-perl/haproxy_backend.xml
@@ -37,13 +37,6 @@
 			<direction>output</direction>
 			<oid>.1.3.6.1.4.1.29385.106.1.1.7</oid>
 		</beSTot>
-		<beEResp>
-			<name>Response Errors</name>
-			<method>get</method>
-			<source>value</source>
-			<direction>output</direction>
-			<oid>.1.3.6.1.4.1.29385.106.1.1.14</oid>
-		</beEResp>
 		<beBIn>
 			<name>Bytes In</name>
 			<method>get</method>
@@ -58,5 +51,33 @@
 			<direction>output</direction>
 			<oid>.1.3.6.1.4.1.29385.106.1.1.9</oid>
 		</beBOut>
+		<beEConn>
+			<name>Connection Errors</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.1.13</oid>
+		</beEConn>
+		<beEResp>
+			<name>Response Errors</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.1.14</oid>
+		</beEResp>
+		<beLBTot>
+			<name>LB Total</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.1.30</oid>
+		</beLBTot>
+		<beDReq>
+			<name>Denied Requests</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.1.10</oid>
+		</beDReq>
 	</fields>
 </interface>
diff --git a/contrib/netsnmp-perl/haproxy_frontend.xml b/contrib/netsnmp-perl/haproxy_frontend.xml
index 09789c88e3..028ebc7353 100644
--- a/contrib/netsnmp-perl/haproxy_frontend.xml
+++ b/contrib/netsnmp-perl/haproxy_frontend.xml
@@ -30,6 +30,20 @@
 			<direction>input</direction>
 			<oid>.1.3.6.1.4.1.29385.106.1.0.1</oid>
 		</feSvName>
+		<feSCur>
+			<name>Current Sessions</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.0.4</oid>
+		</feSCur>
+		<feSMax>
+			<name>Maximum Sessions</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.0.5</oid>
+		</feSMax>
 		<feSTot>
 			<name>Total Sessions</name>
 			<method>get</method>
@@ -58,5 +72,12 @@
 			<direction>output</direction>
 			<oid>.1.3.6.1.4.1.29385.106.1.0.9</oid>
 		</feBOut>
+		<feDReq>
+			<name>Denied Requests</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.0.10</oid>
+		</feDReq>
 	</fields>
 </interface>
diff --git a/contrib/netsnmp-perl/haproxy_socket.xml b/contrib/netsnmp-perl/haproxy_socket.xml
new file mode 100644
index 0000000000..63ae110e2e
--- /dev/null
+++ b/contrib/netsnmp-perl/haproxy_socket.xml
@@ -0,0 +1,90 @@
+<interface>
+	<name>HAProxy - socket</name>
+	<oid_index>.1.3.6.1.4.1.29385.106.1.3.10001</oid_index>
+	<fields>
+		<feseID>
+			<name>Unique Index</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>input</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.10001</oid>
+		</feseID>
+		<feIID>
+			<name>Proxy ID</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>input</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.27</oid>
+		</feIID>
+		<feSID>
+			<name>Service ID</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>input</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.28</oid>
+		</feSID>
+		<fePxName>
+			<name>Proxy Name</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>input</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.0</oid>
+		</fePxName>
+		<feSvName>
+			<name>Service Name</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>input</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.1</oid>
+		</feSvName>
+		<feSCur>
+			<name>Current Sessions</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.4</oid>
+		</feSCur>
+		<feSMax>
+			<name>Maximum Sessions</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.5</oid>
+		</feSMax>
+		<feSTot>
+			<name>Total Sessions</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.7</oid>
+		</feSTot>
+		<feEReq>
+			<name>Request Errors</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.12</oid>
+		</feEReq>
+		<feBIn>
+			<name>Bytes In</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.8</oid>
+		</feBIn>
+		<feBOut>
+			<name>Bytes Out</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.9</oid>
+		</feBOut>
+		<feDReq>
+			<name>Denied Requests</name>
+			<method>get</method>
+			<source>value</source>
+			<direction>output</direction>
+			<oid>.1.3.6.1.4.1.29385.106.1.3.10</oid>
+		</feDReq>
+	</fields>
+</interface>