konevsa/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
In the SNMP fields descriptions, "Haproxy" was mentioned, let's make it
consistent with the rest.
This commit is contained in:
Willy Tarreau 2021-05-09 06:41:37 +02:00
parent 84c4e7451e
commit 6613a3df8c
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/netsnmp-perl/cacti_data_query_haproxy_backends.xml
View File

@ -517,7 +517,7 @@
<name>HAProxy Backend Session Stats</name> <name>HAProxy Backend Session Stats</name>
<ds> <ds>
<t_name></t_name> <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> <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
<t_rra_id></t_rra_id> <t_rra_id></t_rra_id>
<t_rrd_step></t_rrd_step> <t_rrd_step></t_rrd_step>
@ -608,7 +608,7 @@
<name>HAProxy Backend Traffic Stats</name> <name>HAProxy Backend Traffic Stats</name>
<ds> <ds>
<t_name></t_name> <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> <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
<t_rra_id></t_rra_id> <t_rra_id></t_rra_id>
<t_rrd_step></t_rrd_step> <t_rrd_step></t_rrd_step>
@ -747,4 +747,4 @@
<name>Normal</name> <name>Normal</name>
<gprint_text>%8.2lf %s</gprint_text> <gprint_text>%8.2lf %s</gprint_text>
</hash_060013e9c43831e54eca8069317a2ce8c6f751> </hash_060013e9c43831e54eca8069317a2ce8c6f751>
</cacti> </cacti>

6
admin/netsnmp-perl/cacti_data_query_haproxy_frontends.xml
View File

@ -517,7 +517,7 @@
<name>HAProxy Frontend Session Stats</name> <name>HAProxy Frontend Session Stats</name>
<ds> <ds>
<t_name></t_name> <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> <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
<t_rra_id></t_rra_id> <t_rra_id></t_rra_id>
<t_rrd_step></t_rrd_step> <t_rrd_step></t_rrd_step>
@ -608,7 +608,7 @@
<name>HAProxy Frontend Traffic Stats</name> <name>HAProxy Frontend Traffic Stats</name>
<ds> <ds>
<t_name></t_name> <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> <data_input_id>hash_030013bf566c869ac6443b0c75d1c32b5a350e</data_input_id>
<t_rra_id></t_rra_id> <t_rra_id></t_rra_id>
<t_rrd_step></t_rrd_step> <t_rrd_step></t_rrd_step>
@ -747,4 +747,4 @@
<name>Normal</name> <name>Normal</name>
<gprint_text>%8.2lf %s</gprint_text> <gprint_text>%8.2lf %s</gprint_text>
</hash_060013e9c43831e54eca8069317a2ce8c6f751> </hash_060013e9c43831e54eca8069317a2ce8c6f751>
</cacti> </cacti>

8
admin/netsnmp-perl/haproxy.pl
View File

@ -1,5 +1,5 @@
# #
# Net-SNMP perl plugin for Haproxy # Net-SNMP perl plugin for HAProxy
# Version 0.30 # Version 0.30
# #
# Copyright 2007-2010 Krzysztof Piotr Oledzki <ole@ans.pl> # Copyright 2007-2010 Krzysztof Piotr Oledzki <ole@ans.pl>
@ -21,7 +21,7 @@ use IO::Socket::UNIX;
use strict; use strict;
my $agent = new NetSNMP::agent('Name' => 'Haproxy'); my $agent = new NetSNMP::agent('Name' => 'HAProxy');
my $sa = "/var/run/haproxy.stat"; my $sa = "/var/run/haproxy.stat";
use constant OID_HAPROXY => '1.3.6.1.4.1.29385.106'; 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 stat', OID_HAPROXY_STATS, \&haproxy_stat);
$agent->register('Haproxy info', OID_HAPROXY_INFO, \&haproxy_info); $agent->register('HAProxy info', OID_HAPROXY_INFO, \&haproxy_info);

2
admin/netsnmp-perl/haproxy_backend.xml
View File

@ -1,5 +1,5 @@
<interface> <interface>
<name>Haproxy - backend</name> <name>HAProxy - backend</name>
<oid_index>.1.3.6.1.4.1.29385.106.1.1.10001</oid_index> <oid_index>.1.3.6.1.4.1.29385.106.1.1.10001</oid_index>
<fields> <fields>
<beIID> <beIID>

2
admin/netsnmp-perl/haproxy_frontend.xml
View File

@ -1,5 +1,5 @@
<interface> <interface>
<name>Haproxy - frontend</name> <name>HAProxy - frontend</name>
<oid_index>.1.3.6.1.4.1.29385.106.1.0.10001</oid_index> <oid_index>.1.3.6.1.4.1.29385.106.1.0.10001</oid_index>
<fields> <fields>
<feIID> <feIID>