Merge pull request #26 from barbosm/shaping_metrics

Shaping metrics
mbdraks · Jun 18, 2020 · c700627 · c700627
2 parents dd47023 + 0c3ddb2
commit c700627
Show file tree

Hide file tree

Showing 3 changed files with 545 additions and 28 deletions.
diff --git a/COVERAGE.md b/COVERAGE.md
@@ -3,7 +3,7 @@
 # Coverage Summary
 
     Full OID list: 1554
-    Coverage: 69 (4.44%)
+    Coverage: 84 (5.41%)
 
 # Coverage Detailed
 
@@ -69,6 +69,21 @@ FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgSystem.fgVWLHealthCheckLink.fgV
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgSystem.fgVWLHealthCheckLink.fgVWLHealthCheckLinkTable.fgVWLHealthCheckLinkTableEntry.fgVWLHealthCheckLinkPacketSend|1.3.6.1.4.1.12356.101.4.9.2.1.7
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgSystem.fgVWLHealthCheckLink.fgVWLHealthCheckLinkTable.fgVWLHealthCheckLinkTableEntry.fgVWLHealthCheckLinkPacketRecv|1.3.6.1.4.1.12356.101.4.9.2.1.8
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgSystem.fgVWLHealthCheckLink.fgVWLHealthCheckLinkTable.fgVWLHealthCheckLinkTableEntry.fgVWLHealthCheckLinkPacketLoss|1.3.6.1.4.1.12356.101.4.9.2.1.9
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntVdom|1.3.6.1.4.1.12356.101.7.2.1.1.1
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntEstUpBandwidth|1.3.6.1.4.1.12356.101.7.2.1.1.2
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntEstDownBandwidth|1.3.6.1.4.1.12356.101.7.2.1.1.3
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcAllocatedBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.1
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcGuaranteedBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.2
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcMaxBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.3
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcCurrentBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.4
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcBytes|1.3.6.1.4.1.12356.101.7.5.2.1.5
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcDrops|1.3.6.1.4.1.12356.101.7.5.2.1.6
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInAllocatedBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.1
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInGuaranteedBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.2
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInMaxBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.3
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInCurrentBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.4
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInBytes|1.3.6.1.4.1.12356.101.7.5.3.1.5
+FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInDrops|1.3.6.1.4.1.12356.101.7.5.3.1.6
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIps.fgIpsTables.fgIpsStatsTable.fgIpsStatsEntry.fgIpsIntrusionsDetected|1.3.6.1.4.1.12356.101.9.2.1.1.1
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIps.fgIpsTables.fgIpsStatsTable.fgIpsStatsEntry.fgIpsIntrusionsBlocked|1.3.6.1.4.1.12356.101.9.2.1.1.2
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIps.fgIpsTables.fgIpsStatsTable.fgIpsStatsEntry.fgIpsCritSevDetections|1.3.6.1.4.1.12356.101.9.2.1.1.3
@@ -1512,9 +1527,6 @@ FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgMgmt.fgFmTrapPrefix.fgFmTrapIfC
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgMgmt.fgAdmin.fgAdminOptions.fgAdminIdleTimeout|1.3.6.1.4.1.12356.101.6.1.1.1
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgMgmt.fgAdmin.fgAdminOptions.fgAdminLcdProtection|1.3.6.1.4.1.12356.101.6.1.1.2
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgMgmt.fgAdmin.fgAdminTables.fgAdminTable.fgAdminEntry.fgAdminVdom|1.3.6.1.4.1.12356.101.6.1.2.1.1.1
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntVdom|1.3.6.1.4.1.12356.101.7.2.1.1.1
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntEstUpBandwidth|1.3.6.1.4.1.12356.101.7.2.1.1.2
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfTables.fgIntfTable.fgIntfEntry.fgIntfEntEstDownBandwidth|1.3.6.1.4.1.12356.101.7.2.1.1.3
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVrrps.fgIntfVrrpCount|1.3.6.1.4.1.12356.101.7.3.1
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVrrps.fgIntfVrrpTable.fgIntfVrrpEntry.fgIntfVrrpEntIndex|1.3.6.1.4.1.12356.101.7.3.2.1.1
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVrrps.fgIntfVrrpTable.fgIntfVrrpEntry.fgIntfVrrpEntVrId|1.3.6.1.4.1.12356.101.7.3.2.1.2
@@ -1527,18 +1539,6 @@ FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVlanHbs.fgIntfVlanHb
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVlanHbs.fgIntfVlanHbTable.fgIntfVlanHbEntry.fgIntfVlanHbEntIfName|1.3.6.1.4.1.12356.101.7.4.2.1.2
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVlanHbs.fgIntfVlanHbTable.fgIntfVlanHbEntry.fgIntfVlanHbEntSerial|1.3.6.1.4.1.12356.101.7.4.2.1.3
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfVlanHbs.fgIntfVlanHbTable.fgIntfVlanHbEntry.fgIntfVlanHbEntState|1.3.6.1.4.1.12356.101.7.4.2.1.4
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcAllocatedBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.1
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcGuaranteedBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.2
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcMaxBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.3
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcCurrentBandwidth|1.3.6.1.4.1.12356.101.7.5.2.1.4
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcBytes|1.3.6.1.4.1.12356.101.7.5.2.1.5
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcTable.fgIntfBcEntry.fgIntfBcDrops|1.3.6.1.4.1.12356.101.7.5.2.1.6
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInAllocatedBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.1
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInGuaranteedBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.2
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInMaxBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.3
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInCurrentBandwidth|1.3.6.1.4.1.12356.101.7.5.3.1.4
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInBytes|1.3.6.1.4.1.12356.101.7.5.3.1.5
-FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgIntf.fgIntfBcs.fgIntfBcInTable.fgIntfBcInEntry.fgIntfBcInDrops|1.3.6.1.4.1.12356.101.7.5.3.1.6
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgAntivirus.fgAvTables.fgAvStatsTable.fgAvStatsEntry.fgAvVirusDetected|1.3.6.1.4.1.12356.101.8.2.1.1.1
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgAntivirus.fgAvTables.fgAvStatsTable.fgAvStatsEntry.fgAvIMAPVirusBlocked|1.3.6.1.4.1.12356.101.8.2.1.1.10
 FORTINET-FORTIGATE-MIB:fortinet.fnFortiGateMib.fgAntivirus.fgAvTables.fgAvStatsTable.fgAvStatsEntry.fgAvFTPVirusDetected|1.3.6.1.4.1.12356.101.8.2.1.1.11

diff --git a/README.md b/README.md
@@ -24,6 +24,8 @@ by a Fortinet FortiGate device.
 You can tune the following macros, which are used by some triggers:
 - {$CPU.UTIL.CRIT} = 80
 - {$MEMORY.UTIL.MAX} = 80
+- {$IF_ID1} = 1; IF ID where Egress Shaping is configured
+- {$IF_IN_ID1} = 2; IF ID where Ingress Shaping is configured
 
 ### Template Links
 - Template Module EtherLike-MIB SNMPv2
@@ -32,12 +34,18 @@ You can tune the following macros, which are used by some triggers:
 
 ### Discovery Rules
 - CPU Cores
-- Interfaces
+- Network Interfaces (standard and FOS specific metrics)
 - SD-WAN Performance SLA
 - SOC3 Processor
 - High Availability
+- Interface-based Shaping (Ingress and Egress)
 
 ### Items Collected
+- Network Interfaces
+    - Bits received/sent, discards, errors
+    - Type, operational status, speed
+    - Estimated bandwidth (upstream and downstream)
+
 - CPU
     - CPU usage
     - CPU usage per core (1m and 5s)
@@ -90,6 +98,9 @@ You can tune the following macros, which are used by some triggers:
         - Detected by severity level
         - Detected by signature or anomaly
 
+- Interface-based Shaping (Ingress and Egress)
+    - Allocated, Guaranteed, Maximum and Current Bandwidth
+    - Byte rate and Packet drops
 
 ### Triggers
 - CPU
@@ -103,6 +114,10 @@ You can tune the following macros, which are used by some triggers:
     - High ICMP ping loss
 
 ### Graphs
+- Network Interfaces
+    - Network traffic
+    - Estimated bandwidth
+
 - CPU
     - CPU usage
 
@@ -132,6 +147,9 @@ You can tune the following macros, which are used by some triggers:
 - IPS
     - All IPS metrics
 
+- Interface-based Shaping (Ingress and Egress)
+    - All metrics
+
 ### Host Screens
 - System Performance
     - CPU
@@ -145,7 +163,6 @@ You can tune the following macros, which are used by some triggers:
 - High Availability
     - All graph prototypes available
 
-
 ### Host Inventory
 This template will automatically populate the following host inventory fields:
 - Name
@@ -157,7 +174,6 @@ This template will automatically populate the following host inventory fields:
 - Contact
 - Location
 
-
 ## Feedback
 Please send your comments, requests for additional items and bug reports at [Issues](https://github.com/barbosm/fortinet-zabbix/issues).
 
@@ -174,7 +190,6 @@ Each items will almost always generate some automatic graphs, here's some sample
 ![High Availability 01](/static/ha_screen_01.png)
 ![High Availability 02](/static/ha_screen_02.png)
 
-
 ## Known Issues
 No support for VDOMs at this time