diff --git a/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/README.md b/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/README.md
index 74eee31..80fb00c 100644
--- a/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/README.md
+++ b/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/README.md
@@ -38,15 +38,20 @@ Graphs
Installation
------------
-
-1. Install [`if.speed`](https://github.com/jjmartres/Zabbix/tree/master/zbx-scripts/if.speed) in the **ExternalScripts** directory of your Zabbix server and/or proxy. Check your `zabbix_server.conf` and/or `zabbix_proxy.conf` if in doubt.
-2. Then `chmod a+x if.speed`
-3. Install [`if.vdom`](https://github.com/jjmartres/Zabbix/tree/master/zbx-scripts/if.vdom) in the **ExternalScripts** directory of your Zabbix server and/or proxy. Check your `zabbix_server.conf` and/or `zabbix_proxy.conf` if in d>
-4. Then `chmod a+x if.vdom`
-5. Import **zbx-fortinet-interfaces.xml** file into Zabbix.
-6. Add to your host the **{$SNMP_COMMUNITY}** macro with your SNMP community as value.
-7. Add to your host the **{$INTF_REGEXP}** macro with your regular expression as value (ex: -p-|-P-|-pe-|-PE-)
-8. Associate **ZBX-FORTINET-INTERFACES** template to the host.
+1. Add a value mapping named `fgifAdminStatus` with the following values:
+ * 1 => up
+ * 2 => down
+2. Add a value mapping named `fgifOperStatus` with the following values:
+ * 1 => up
+ * 2 => down
+3. Install [`if.speed`](https://github.com/jjmartres/Zabbix/tree/master/zbx-scripts/if.speed) in the **ExternalScripts** directory of your Zabbix server and/or proxy. Check your `zabbix_server.conf` and/or `zabbix_proxy.conf` if in doubt.
+4. Then `chmod a+x if.speed`
+5. Install [`if.vdom`](https://github.com/jjmartres/Zabbix/tree/master/zbx-scripts/if.vdom) in the **ExternalScripts** directory of your Zabbix server and/or proxy. Check your `zabbix_server.conf` and/or `zabbix_proxy.conf` if in d>
+6. Then `chmod a+x if.vdom`
+7. Import **zbx-fortinet-interfaces.xml** file into Zabbix.
+8. Add to your host the **{$SNMP_COMMUNITY}** macro with your SNMP community as value.
+9. Add to your host the **{$INTF_REGEXP}** macro with your regular expression as value (ex: -p-|-P-|-pe-|-PE-)
+10. Associate **ZBX-FORTINET-INTERFACES** template to the host.
### Requirements
diff --git a/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/zbx-fortinet-interfaces.xml b/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/zbx-fortinet-interfaces.xml
index 34ba3ad..6bd35af 100644
--- a/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/zbx-fortinet-interfaces.xml
+++ b/zbx-templates/zbx-fortinet/zbx-fortinet-interfaces/zbx-fortinet-interfaces.xml
@@ -87,7 +87,7 @@
- SNMP interface status (ifAdminStatus)
+ fgifAdminStatus
@@ -135,7 +135,7 @@
0
- if.vdom["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
+ if.vdom["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
300
7
365
@@ -401,7 +401,7 @@
- SNMP interface status (ifOperStatus)
+ fgifOperStatus
@@ -527,7 +527,7 @@
0
- if.speed["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
+ if.speed["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
300
7
365
@@ -563,7 +563,7 @@
- {ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)}>0 & ({ZBX-FORTINET-INTERFACES:ifInOctets[{#SNMPVALUE}].avg(300)})>({ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)})*0.8
+ {ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)}>0 & ({ZBX-FORTINET-INTERFACES:ifInOctets[{#SNMPVALUE}].avg(300)})>({ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)})*0.8
Incoming use on interface {#SNMPVALUE} exceed 80% for the last 5 minutes
0
@@ -590,7 +590,7 @@
0
- {ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)}>0 & ({ZBX-FORTINET-INTERFACES:ifOutOctets[{#SNMPVALUE}].avg(300)})>({ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)})*0.8
+ {ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)}>0 & ({ZBX-FORTINET-INTERFACES:ifOutOctets[{#SNMPVALUE}].avg(300)})>({ZBX-FORTINET-INTERFACES:if.speed["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"].last(0)})*0.8
Outgoing use on interface {#SNMPVALUE} exceed 80% for the last 5 minutes
0
diff --git a/zbx-templates/zbx-fortinet/zbx-fortinet-vpn/zbx-fortinet-vpn.xml b/zbx-templates/zbx-fortinet/zbx-fortinet-vpn/zbx-fortinet-vpn.xml
index 7f13000..0a03471 100644
--- a/zbx-templates/zbx-fortinet/zbx-fortinet-vpn/zbx-fortinet-vpn.xml
+++ b/zbx-templates/zbx-fortinet/zbx-fortinet-vpn/zbx-fortinet-vpn.xml
@@ -55,7 +55,7 @@
0
- vpn.vdom["-d","{HOST.HOST}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
+ vpn.vdom["-d","{HOST.IP}","-c","{$SNMP_COMMUNITY}","-s","{#SNMPINDEX}"]
300
7
365