ADMIN: netsnmp: report "HAProxy" and not "Haproxy" in output descriptions

In the SNMP fields descriptions, "Haproxy" was mentioned, let's make it
consistent with the rest.

diff --git a/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
index 2cf500923106124332a7c4b62382ba63c8be3108..9c4ea3813f974be02aea6f9e593d1767ee0aed05 100644 (file)
--- a/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
+++ b/admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
@@ -517,7 +517,7 @@
                <name>HAProxy Backend Session Stats</name>
                <ds>
                        <t_name></t_name>
-                       <name>|host_description| - Haproxy - |query_bePxName| Backend Session Stats</name>
+                       <name>|host_description| - HAProxy - |query_bePxName| Backend Session Stats</name>
                        <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
                        <t_rra_id></t_rra_id>
                        <t_rrd_step></t_rrd_step>
@@ -608,7 +608,7 @@
                <name>HAProxy Backend Traffic Stats</name>
                <ds>
                        <t_name></t_name>
-                       <name>|host_description| - Haproxy - |query_bePxName| Backend Traffic Stats</name>
+                       <name>|host_description| - HAProxy - |query_bePxName| Backend Traffic Stats</name>
                        <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
                        <t_rra_id></t_rra_id>
                        <t_rrd_step></t_rrd_step>
@@ -747,4 +747,4 @@
                <name>Normal</name>
                <gprint_text>%8.2lf %s</gprint_text>
        </hash_060013e9c43831e54eca8069317a2ce8c6f751>
-</cacti>
\ No newline at end of file
+</cacti>

diff --git a/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml b/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
index 67508d743449b3ab1c7d3b308b69b0d1cbbb38cf..1429b07a73743a39d5009353a6dc2537b3095aa9 100644 (file)
--- a/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
+++ b/admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
@@ -517,7 +517,7 @@
                <name>HAProxy Frontend Session Stats</name>
                <ds>
                        <t_name></t_name>
-                       <name>|host_description| - Haproxy - |query_fePxName| Frontend Session Stats</name>
+                       <name>|host_description| - HAProxy - |query_fePxName| Frontend Session Stats</name>
                        <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
                        <t_rra_id></t_rra_id>
                        <t_rrd_step></t_rrd_step>
@@ -608,7 +608,7 @@
                <name>HAProxy Frontend Traffic Stats</name>
                <ds>
                        <t_name></t_name>
-                       <name>|host_description| - Haproxy - |query_fePxName| Frontend Traffic Stats</name>
+                       <name>|host_description| - HAProxy - |query_fePxName| Frontend Traffic Stats</name>
                        <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
                        <t_rra_id></t_rra_id>
                        <t_rrd_step></t_rrd_step>
@@ -747,4 +747,4 @@
                <name>Normal</name>
                <gprint_text>%8.2lf %s</gprint_text>
        </hash_060013e9c43831e54eca8069317a2ce8c6f751>
-</cacti>
\ No newline at end of file
+</cacti>

diff --git a/admin/netsnmp-perl/haproxy.pl b/admin/netsnmp-perl/haproxy.pl
index f4c3621472700e7b314e15e7a384a376d3388b0f..64684ad01838590cf624b8295001135051d26786 100644 (file)
--- a/admin/netsnmp-perl/haproxy.pl
+++ b/admin/netsnmp-perl/haproxy.pl
@@ -1,5 +1,5 @@
 #
-# Net-SNMP perl plugin for Haproxy
+# Net-SNMP perl plugin for HAProxy
 # Version 0.30
 #
 # Copyright 2007-2010 Krzysztof Piotr Oledzki <ole@ans.pl>
@@ -21,7 +21,7 @@ use IO::Socket::UNIX;
 
 use strict;
 
-my $agent = new NetSNMP::agent('Name' => 'Haproxy');
+my $agent = new NetSNMP::agent('Name' => 'HAProxy');
 my $sa = "/var/run/haproxy.stat";
 
 use constant OID_HAPROXY => '1.3.6.1.4.1.29385.106';
@@ -244,6 +244,6 @@ sub haproxy_info {
        }
 }
 
-$agent->register('Haproxy stat', OID_HAPROXY_STATS, \&haproxy_stat);
-$agent->register('Haproxy info', OID_HAPROXY_INFO, \&haproxy_info);
+$agent->register('HAProxy stat', OID_HAPROXY_STATS, \&haproxy_stat);
+$agent->register('HAProxy info', OID_HAPROXY_INFO, \&haproxy_info);
 

diff --git a/admin/netsnmp-perl/haproxy_backend.xml b/admin/netsnmp-perl/haproxy_backend.xml
index a5dbe543d657300d5316d7737ac44ff30d62b710..26ce63f0849ddcdabaea53702fb67450c34c0a67 100644 (file)
--- a/admin/netsnmp-perl/haproxy_backend.xml
+++ b/admin/netsnmp-perl/haproxy_backend.xml
@@ -1,5 +1,5 @@
 <interface>
-       <name>Haproxy - backend</name>
+       <name>HAProxy - backend</name>
        <oid_index>.1.3.6.1.4.1.29385.106.1.1.10001</oid_index>
        <fields>
                <beIID>

diff --git a/admin/netsnmp-perl/haproxy_frontend.xml b/admin/netsnmp-perl/haproxy_frontend.xml
index 028ebc735394c9067bbc9e53d6f224365d8059b6..ade2a77a7751389d797481464880f60f957fce8c 100644 (file)
--- a/admin/netsnmp-perl/haproxy_frontend.xml
+++ b/admin/netsnmp-perl/haproxy_frontend.xml
@@ -1,5 +1,5 @@
 <interface>
-       <name>Haproxy - frontend</name>
+       <name>HAProxy - frontend</name>
        <oid_index>.1.3.6.1.4.1.29385.106.1.0.10001</oid_index>
        <fields>
                <feIID>