dani
/
pfsense-zabbix
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use interface descriptions instead of hardware names where possible.

This commit is contained in:
Grant Emsley 2020-02-06 11:52:10 -05:00 committed by Grant Emsley
parent 3e0a41e2d1
commit f3078f3281
2 changed files with 35 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
pfsense_zbx.php
View File

@ -57,16 +57,38 @@ function pfz_test(){
function pfz_get_if_name($hwif){
$ifdescrs = get_configured_interface_with_descr(true);
foreach ($ifdescrs as $ifdescr => $ifname){
$ifdescrs = get_configured_interface_with_descr(true);
foreach ($ifdescrs as $ifdescr => $ifname){
$ifinfo = get_interface_info($ifdescr);
if($ifinfo["hwif"]==$hwif){
echo $ifname;
return true;
return $ifname;
}
}
return null;
}
//Interface Discovery
function pfz_interface_discovery() {
$ifaces = get_interface_arr();
$json_string = '{"data":[';
foreach ($ifaces as $iface) {
$json_string .= '{"{#IFNAME}":"' . $iface . '"';
$descr = pfz_get_if_name($iface);
if($descr === null){ $descr = $iface; }
$json_string .= ',"{#IFDESCR}":"' . $descr . '"';
$json_string .= '},';
}
$json_string = rtrim($json_string,",");
$json_string .= "]}";
echo $json_string;
}
@ -324,6 +346,9 @@ function pfz_discovery($section){
case "services":
pfz_services_discovery();
break;
case "interfaces":
pfz_interface_discovery();
break;
}
}

8
template_pfsense_active.xml
View File

@ -2980,7 +2980,7 @@
<type>7</type>
<snmp_community/>
<snmp_oid/>
<key>net.if.discovery</key>
<key>pfsense.discovery[interfaces]</key>
<delay>3600</delay>
<status>0</status>
<allowed_hosts/>
@ -3015,7 +3015,7 @@
<description>Discovery of network interfaces as defined in global regular expression &quot;Network interfaces for discovery&quot;.</description>
<item_prototypes>
<item_prototype>
<name>Incoming network traffic on $1</name>
<name>Incoming network traffic on {#IFDESCR}</name>
<type>7</type>
<snmp_community/>
<snmp_oid/>
@ -3084,7 +3084,7 @@
<master_item/>
</item_prototype>
<item_prototype>
<name>Outgoing network traffic on $1</name>
<name>Outgoing network traffic on {#IFDESCR}</name>
<type>7</type>
<snmp_community/>
<snmp_oid/>
@ -3156,7 +3156,7 @@
<trigger_prototypes/>
<graph_prototypes>
<graph_prototype>
<name>Network traffic on {#IFNAME}</name>
<name>Network traffic on {#IFDESCR}</name>
<width>900</width>
<height>200</height>
<yaxismin>0.0000</yaxismin>