diff --git a/EXTRAS/reports/all b/EXTRAS/reports/all
index 21f738adc..d4c65f3f0 100644
--- a/EXTRAS/reports/all
+++ b/EXTRAS/reports/all
@@ -508158,7 +508158,10 @@
               fnFortiGateMib(101) type=24
                 fgModel(1) type=0
                   fgtVM64(30) type=0
+                  fgtVM64VMX(31) type=0
+                  fgtVM64SVM(32) type=0
                   fgtVM64XEN(40) type=0
+                  fosVM64XEN(41) type=0
                   fgtVM64AWS(45) type=0
                   fgtVM64FGCAWS(46) type=0
                   fgtVM64OPC(47) type=0
@@ -508167,6 +508170,21 @@
                   fgtVM64GCP(65) type=0
                   fgtARM64KVM(66) type=0
                   fgtVM64HV(70) type=0
+                  fgt30D(304) type=0
+                  fgt30DPOE(305) type=0
+                  fgt30E(306) type=0
+                  fgr30D(307) type=0
+                  fgr35D(308) type=0
+                  fr30DA(309) type=0
+                  fwf30D(314) type=0
+                  fwf30DPOE(315) type=0
+                  fwf30E(316) type=0
+                  fgt30EG(319) type=0
+                  fg30EN(320) type=0
+                  fg30EI(321) type=0
+                  fw30EN(322) type=0
+                  fw30EI(323) type=0
+                  fw30EG(324) type=0
                   fgt40F(441) type=0
                   fgt41F(442) type=0
                   fg40FI(443) type=0
@@ -508175,6 +508193,25 @@
                   fwf41F(446) type=0
                   fw40FI(447) type=0
                   fw41FI(448) type=0
+                  fgt50E(505) type=0
+                  fwf50E(506) type=0
+                  fgt51E(515) type=0
+                  fwf51E(516) type=0
+                  fw502R(517) type=0
+                  fgt52E(518) type=0
+                  fgt60D(624) type=0
+                  fgt60DPOE(625) type=0
+                  fwf60D(626) type=0
+                  fw60DP(627) type=0
+                  fgt90D(630) type=0
+                  fgt90DPOE(631) type=0
+                  fwf90D(632) type=0
+                  fwf90DPOE(633) type=0
+                  fgt94DPOE(634) type=0
+                  fgt98DPOE(635) type=0
+                  fgt92D(636) type=0
+                  fwf92D(637) type=0
+                  fgr90D(638) type=0
                   fwf60E(639) type=0
                   fgt61E(640) type=0
                   fgt60E(641) type=0
@@ -508182,18 +508219,24 @@
                   fgr60F(643) type=0
                   fgt60F(644) type=0
                   fgt61F(645) type=0
-                  fwf60F(646) type=0
-                  fwf61F(647) type=0
+                  fg60EI(646) type=0
+                  fg60EC(647) type=0
                   fgr60FI(648) type=0
                   fwf61E(649) type=0
                   fgt60EJ(661) type=0
                   fwf60EJ(662) type=0
                   fgt60EV(663) type=0
                   fwf60EV(664) type=0
+                  fgt70D(700) type=0
                   fgt70F(701) type=0
                   fgt71F(702) type=0
                   fr70FB(704) type=0
                   fr70FM(705) type=0
+                  fgt80C(800) type=0
+                  fgt80CM(801) type=0
+                  fgt80D(803) type=0
+                  fwf80CM(810) type=0
+                  fwf81CM(811) type=0
                   fgt80EPOE(841) type=0
                   fgt80E(842) type=0
                   fgt81E(843) type=0
@@ -508218,10 +508261,17 @@
                   fgt100E(1041) type=0
                   fgt100EF(1042) type=0
                   fgt101E(1043) type=0
+                  fgt140D(1401) type=0
+                  fgt140P(1402) type=0
+                  fgt200D(2005) type=0
+                  fgt240D(2006) type=0
+                  fgt200DP(2007) type=0
+                  fgt240DP(2008) type=0
                   fgt200E(2009) type=0
                   fgt201E(2010) type=0
                   fgt200F(2011) type=0
                   fgt201F(2012) type=0
+                  fgt280D(2013) type=0
                   fgt3HD(3006) type=0
                   fgt300E(3007) type=0
                   fgt301E(3008) type=0
@@ -508234,12 +508284,15 @@
                   fgt500D(5004) type=0
                   fgt500E(5005) type=0
                   fgt501E(5006) type=0
+                  fgt600C(6003) type=0
                   fgt600D(6004) type=0
                   fgt600E(6005) type=0
                   fgt601E(6006) type=0
                   fgt600F(6007) type=0
                   fgt601F(6008) type=0
+                  fgt800C(8003) type=0
                   fgt800D(8004) type=0
+                  fgt1000C(10004) type=0
                   fgt1000D(10005) type=0
                   fgt1100E(10006) type=0
                   fgt1101E(10007) type=0
@@ -508261,23 +508314,29 @@
                   fgt3001F(30004) type=0
                   fgt3100D(31000) type=0
                   fgt3200D(32000) type=0
+                  fgt3240C(32401) type=0
                   fgt3400E(34001) type=0
                   fgt3401E(34011) type=0
                   fgt3500F(35001) type=0
                   fgt3501F(35011) type=0
                   fgt3600E(36001) type=0
+                  fgt3600C(36004) type=0
                   fgt3601E(36011) type=0
                   fgt3700D(37000) type=0
+                  fgt3700DX(37001) type=0
                   fgt3800D(38001) type=0
                   fgt4200F(38002) type=0
+                  ffw4200F(38006) type=0
                   fgt3810D(38101) type=0
                   fgt3815D(38150) type=0
                   fgt4400F(39001) type=0
+                  ffw4400F(39007) type=0
                   fgt3960E(39601) type=0
                   fgt3980E(39801) type=0
                   ffw3980E(39804) type=0
                   fgt4201F(42002) type=0
                   fgt4401F(44001) type=0
+                  fgt5001C(50014) type=0
                   fgt5001D(50015) type=0
                   fgt5001E(50016) type=0
                   fgt5001E1(50017) type=0
@@ -508309,14 +508368,20 @@
                   fgvmml(80024) type=0
                   ffvmbb(80025) type=0
                   fgvmpg(80030) type=0
+                  fosVM64(90000) type=0
                   fgtARM64AWS(90007) type=0
                   fgtARM64XEN(90008) type=0
+                  fgtVM64AZUREONDEMAND(90010) type=0
+                  fgtVM64GCPONDEMAND(90018) type=0
                   fgtVM64ALI(90019) type=0
+                  fgtVM64ALIONDEMAND(90020) type=0
                   fgtVM64RAXONDEMAND(90021) type=0
                   fgtVM64IBM(90022) type=0
                   fgtARM64OCI(90025) type=0
                   fgtARM64GCP(90026) type=0
                   fgtARM64AZURE(90027) type=0
+                  fosVM64KVM(90060) type=0
+                  fosVM64HV(90061) type=0
                   ffwVM64(90070) type=0
                   ffwVM64KVm(90071) type=0
                   fgtVM64AZURE(90081) type=0
@@ -508342,6 +508407,7 @@
                     fgTrapAvOversizePass(607) type=21
                     fgTrapAvOversizeBlock(608) type=21
                     fgTrapFazDisconnect(701) type=21
+                    fgTrapFaz(702) type=21
                     fgTrapWcApUp(801) type=21
                     fgTrapWcApDown(802) type=21
                     fgTrapFcSwUp(901) type=21
@@ -508785,6 +508851,7 @@
                     fgManIfIp(1) type=5
                     fgManIfMask(2) type=5
                     fgManIfIp6(3) type=2 hint=2x:
+                    fgFazTrapType(4) type=3
                 fgIntf(7) type=0
                   fgIntfInfo(1) type=0
                   fgIntfTables(2) type=0
@@ -509812,6 +509879,28 @@
                     fmSysVersion(7) type=2 hint=255a
                     fmSysUpTime(8) type=11 units=hundredths of a second
                     fmSysLogRate(9) type=7 units=logs per second
+                    fmSysLogRateHr(10) type=7 hint=d-2 units=logs per second
+                    fmSysLogIndexingRate(11) type=7 hint=d-2 units=logs per second
+                    fmSysLogLagTime(12) type=7 units=second
+                    fmSysLicGbDayToday(13) type=7 hint=d-2
+                    fmSysLicGbDayYesterday(14) type=7 hint=d-2
+                    fmSysLicGbDayWeekAvg(15) type=7 hint=d-2
+                    fmSysDiskInfo(16) type=0
+                      fmSysDiskNumber(1) type=7
+                    fmSysDiskTable(17) type=0
+                      fmSysDiskEntry(1) type=0
+                        fmSysDiskEntIndex(1) type=16 hint=d
+                        fmSysDiskEntName(2) type=2 hint=255a
+                        fmSysDiskEntUsage(3) type=7
+                        fmSysDiskEntCapacity(4) type=7
+                        fmSysDiskEntIOUtil(5) type=7 hint=d-1
+                    fmSysLogForwardInfo(18) type=0
+                      fmSysLogForwardNumber(1) type=7
+                    fmSysLogForwardTable(19) type=0
+                      fmSysLogForwardEntry(1) type=0
+                        fmSysLogForwardIndex(1) type=16 hint=d
+                        fmSysLogForwardName(2) type=2 hint=255a
+                        fmSysLogForwardRate(3) type=7 hint=d-2 units=logs per second
                 faModel(3) type=0
                   fazvm(64) type=0
                   faz100(1000) type=0
@@ -509883,6 +509972,18 @@
                       fmAdomEntOsVersion(7) type=16
                       fmAdomEntMr(8) type=16
                       fmAdomEntVpnMode(9) type=3
+                      fmAdomEntLogRateMinute(10) type=7 hint=d-2 units=logs per second
+                      fmAdomEntArchiveLogRetention(11) type=7 units=days
+                      fmAdomEntArchiveLogQuota(12) type=7
+                      fmAdomEntArchiveLogUsedSpace(13) type=7
+                      fmAdomEntArchiveLogUsedSpacePercent(14) type=7 hint=d-1
+                      fmAdomEntAnalyticsLogRetention(15) type=7 units=days
+                      fmAdomEntAnalyticsLogQuota(16) type=7
+                      fmAdomEntAnalyticsLogUsedSpace(17) type=7
+                      fmAdomEntAnalyticsLogUsedSpacePercent(18) type=7 hint=d-1
+                      fmAdomEntLicGbDayToday(19) type=7 hint=d-2
+                      fmAdomEntLicGbDayYesterday(20) type=7 hint=d-2
+                      fmAdomEntLicGbDayWeekAvg(21) type=7 hint=d-2
                 fmDevice(6) type=0
                   fmDeviceInfo(1) type=0
                     fmDeviceNumber(1) type=16
@@ -509913,6 +510014,10 @@
                       fmDeviceEntAsExpireDate(22) type=2 hint=255a
                       fmDeviceEntPolicyPackageState(23) type=2 hint=255a
                       fmDeviceEntDesc(24) type=2 hint=255a
+                      fmDeviceEntLogRateHour(25) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntLogRateDay(26) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntLogRateWeek(27) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntArchiveLogUsedSpace(28) type=7
                 fmRaid(7) type=0
                   fmRaidInfo(1) type=0
                     fmRaidLevel(1) type=3
@@ -509950,6 +510055,8 @@
                   fmSystemObjectGroup(2) type=22
                   fmNotificationObjComplianceGroup(3) type=22
                   fmSessionComplianceGroup(4) type=22
+                  fmAdomComplianceGroup(5) type=22
+                  fmDeviceComplianceGroup(6) type=22
                   fmMIBCompliance(100) type=26
                 fmUm(11) type=0
                   fmUmContract(1) type=0
@@ -509964,7 +510071,7 @@
                       fmUmFdsServiceFdsServerTable(2) type=0
                         fmUmFdsServiceFdsServerEntry(1) type=0
                           fmUmFdsServiceFdsServerEntryIndex(1) type=16 hint=d
-                          fmUmFdsServiceFdsServerAddr(2) type=0
+                          fmUmFdsServiceFdsServerAddr(2) type=2
                           fmUmFdsServiceFdsServerPort(3) type=15 hint=d
                           fmUmFdsServiceFdsServerTimeZone(4) type=16
                           fmUmFdsServiceFdsServerCurrent(5) type=3
@@ -509973,7 +510080,7 @@
                       fmUmFdsServiceFctServerTable(2) type=0
                         fmUmFdsServiceFctServerEntry(1) type=0
                           fmUmFdsServiceFctServerEntryIndex(1) type=16 hint=d
-                          fmUmFdsServiceFctServerAddr(2) type=0
+                          fmUmFdsServiceFctServerAddr(2) type=2
                           fmUmFdsServiceFctServerPort(3) type=15 hint=d
                           fmUmFdsServiceFctServerTimeZone(4) type=16
                           fmUmFdsServiceFctServerCurrent(5) type=3
@@ -510008,7 +510115,7 @@
                       fmUmFgdServiceFgdServerTable(2) type=0
                         fmUmFgdServiceFgdServerEntry(1) type=0
                           fmUmFgdServiceFgdServerEntryIndex(1) type=16 hint=d
-                          fmUmFgdServiceFgdServerAddr(2) type=0
+                          fmUmFgdServiceFgdServerAddr(2) type=2
                           fmUmFgdServiceFgdServerPort(3) type=15 hint=d
                           fmUmFgdServiceFgdServerTimeZone(4) type=16
                           fmUmFgdServiceFgdServerCurrent(5) type=3
@@ -510017,7 +510124,7 @@
                       fmUmFgdServiceFgfqServerTable(2) type=0
                         fmUmFgdServiceFgfqServerEntry(1) type=0
                           fmUmFgdServiceFgfqServerEntryIndex(1) type=16 hint=d
-                          fmUmFgdServiceFgfqServerAddr(2) type=0
+                          fmUmFgdServiceFgfqServerAddr(2) type=2
                           fmUmFgdServiceFgfqServerPort(3) type=15 hint=d
                           fmUmFgdServiceFgfqServerTimeZone(4) type=16
                           fmUmFgdServiceFgfqServerCurrent(5) type=3
@@ -510034,7 +510141,7 @@
                       fmUmFgdQueryStatisticTop10SitesTable(1) type=0
                         fmUmFgdQueryStatisticTop10SitesEntry(1) type=0
                           fmUmFgdQueryStatisticTop10SitesEntryIndex(1) type=16 hint=d
-                          fmUmFgdQueryStatisticTop10SitesEntryAddress(2) type=0
+                          fmUmFgdQueryStatisticTop10SitesEntryAddress(2) type=2
                           fmUmFgdQueryStatisticTop10SitesEntryVisits(3) type=11
                       fmUmFgdQueryStatisticTop10DevicesTable(2) type=0
                         fmUmFgdQueryStatisticTop10DevicesEntry(1) type=0
@@ -510044,13 +510151,13 @@
                       fmUmFgdQueryStatisticQueryHistoryTable(3) type=0
                         fmUmFgdQueryStatisticQueryHistoryEntry(1) type=0
                           fmUmFgdQueryStatisticQueryHistoryEntryIndex(1) type=16 hint=d
-                          fmUmFgdQueryStatisticQueryHistoryEntryBeginTime(2) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryEndTime(3) type=0
+                          fmUmFgdQueryStatisticQueryHistoryEntryBeginTime(2) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryEndTime(3) type=11
                           fmUmFgdQueryStatisticQueryHistoryEntryDeviceName(4) type=2 hint=255a
-                          fmUmFgdQueryStatisticQueryHistoryEntryDeviceAddress(5) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryQueries(6) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryHits(7) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryMisses(8) type=0
+                          fmUmFgdQueryStatisticQueryHistoryEntryDeviceAddress(5) type=2
+                          fmUmFgdQueryStatisticQueryHistoryEntryQueries(6) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryHits(7) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryMisses(8) type=11
                           fmUmFgdQueryStatisticQueryHistoryEntryBandWidth(9) type=2 hint=255a
               fnFortiMailMib(105) type=24
                 fmlTraps(0) type=0
diff --git a/EXTRAS/reports/fortinet b/EXTRAS/reports/fortinet
index 6413ac8f6..6e35ee25b 100644
--- a/EXTRAS/reports/fortinet
+++ b/EXTRAS/reports/fortinet
@@ -354,7 +354,10 @@
               fnFortiGateMib(101) type=24
                 fgModel(1) type=0
                   fgtVM64(30) type=0
+                  fgtVM64VMX(31) type=0
+                  fgtVM64SVM(32) type=0
                   fgtVM64XEN(40) type=0
+                  fosVM64XEN(41) type=0
                   fgtVM64AWS(45) type=0
                   fgtVM64FGCAWS(46) type=0
                   fgtVM64OPC(47) type=0
@@ -363,6 +366,21 @@
                   fgtVM64GCP(65) type=0
                   fgtARM64KVM(66) type=0
                   fgtVM64HV(70) type=0
+                  fgt30D(304) type=0
+                  fgt30DPOE(305) type=0
+                  fgt30E(306) type=0
+                  fgr30D(307) type=0
+                  fgr35D(308) type=0
+                  fr30DA(309) type=0
+                  fwf30D(314) type=0
+                  fwf30DPOE(315) type=0
+                  fwf30E(316) type=0
+                  fgt30EG(319) type=0
+                  fg30EN(320) type=0
+                  fg30EI(321) type=0
+                  fw30EN(322) type=0
+                  fw30EI(323) type=0
+                  fw30EG(324) type=0
                   fgt40F(441) type=0
                   fgt41F(442) type=0
                   fg40FI(443) type=0
@@ -371,6 +389,25 @@
                   fwf41F(446) type=0
                   fw40FI(447) type=0
                   fw41FI(448) type=0
+                  fgt50E(505) type=0
+                  fwf50E(506) type=0
+                  fgt51E(515) type=0
+                  fwf51E(516) type=0
+                  fw502R(517) type=0
+                  fgt52E(518) type=0
+                  fgt60D(624) type=0
+                  fgt60DPOE(625) type=0
+                  fwf60D(626) type=0
+                  fw60DP(627) type=0
+                  fgt90D(630) type=0
+                  fgt90DPOE(631) type=0
+                  fwf90D(632) type=0
+                  fwf90DPOE(633) type=0
+                  fgt94DPOE(634) type=0
+                  fgt98DPOE(635) type=0
+                  fgt92D(636) type=0
+                  fwf92D(637) type=0
+                  fgr90D(638) type=0
                   fwf60E(639) type=0
                   fgt61E(640) type=0
                   fgt60E(641) type=0
@@ -378,18 +415,24 @@
                   fgr60F(643) type=0
                   fgt60F(644) type=0
                   fgt61F(645) type=0
-                  fwf60F(646) type=0
-                  fwf61F(647) type=0
+                  fg60EI(646) type=0
+                  fg60EC(647) type=0
                   fgr60FI(648) type=0
                   fwf61E(649) type=0
                   fgt60EJ(661) type=0
                   fwf60EJ(662) type=0
                   fgt60EV(663) type=0
                   fwf60EV(664) type=0
+                  fgt70D(700) type=0
                   fgt70F(701) type=0
                   fgt71F(702) type=0
                   fr70FB(704) type=0
                   fr70FM(705) type=0
+                  fgt80C(800) type=0
+                  fgt80CM(801) type=0
+                  fgt80D(803) type=0
+                  fwf80CM(810) type=0
+                  fwf81CM(811) type=0
                   fgt80EPOE(841) type=0
                   fgt80E(842) type=0
                   fgt81E(843) type=0
@@ -414,10 +457,17 @@
                   fgt100E(1041) type=0
                   fgt100EF(1042) type=0
                   fgt101E(1043) type=0
+                  fgt140D(1401) type=0
+                  fgt140P(1402) type=0
+                  fgt200D(2005) type=0
+                  fgt240D(2006) type=0
+                  fgt200DP(2007) type=0
+                  fgt240DP(2008) type=0
                   fgt200E(2009) type=0
                   fgt201E(2010) type=0
                   fgt200F(2011) type=0
                   fgt201F(2012) type=0
+                  fgt280D(2013) type=0
                   fgt3HD(3006) type=0
                   fgt300E(3007) type=0
                   fgt301E(3008) type=0
@@ -430,12 +480,15 @@
                   fgt500D(5004) type=0
                   fgt500E(5005) type=0
                   fgt501E(5006) type=0
+                  fgt600C(6003) type=0
                   fgt600D(6004) type=0
                   fgt600E(6005) type=0
                   fgt601E(6006) type=0
                   fgt600F(6007) type=0
                   fgt601F(6008) type=0
+                  fgt800C(8003) type=0
                   fgt800D(8004) type=0
+                  fgt1000C(10004) type=0
                   fgt1000D(10005) type=0
                   fgt1100E(10006) type=0
                   fgt1101E(10007) type=0
@@ -457,23 +510,29 @@
                   fgt3001F(30004) type=0
                   fgt3100D(31000) type=0
                   fgt3200D(32000) type=0
+                  fgt3240C(32401) type=0
                   fgt3400E(34001) type=0
                   fgt3401E(34011) type=0
                   fgt3500F(35001) type=0
                   fgt3501F(35011) type=0
                   fgt3600E(36001) type=0
+                  fgt3600C(36004) type=0
                   fgt3601E(36011) type=0
                   fgt3700D(37000) type=0
+                  fgt3700DX(37001) type=0
                   fgt3800D(38001) type=0
                   fgt4200F(38002) type=0
+                  ffw4200F(38006) type=0
                   fgt3810D(38101) type=0
                   fgt3815D(38150) type=0
                   fgt4400F(39001) type=0
+                  ffw4400F(39007) type=0
                   fgt3960E(39601) type=0
                   fgt3980E(39801) type=0
                   ffw3980E(39804) type=0
                   fgt4201F(42002) type=0
                   fgt4401F(44001) type=0
+                  fgt5001C(50014) type=0
                   fgt5001D(50015) type=0
                   fgt5001E(50016) type=0
                   fgt5001E1(50017) type=0
@@ -505,14 +564,20 @@
                   fgvmml(80024) type=0
                   ffvmbb(80025) type=0
                   fgvmpg(80030) type=0
+                  fosVM64(90000) type=0
                   fgtARM64AWS(90007) type=0
                   fgtARM64XEN(90008) type=0
+                  fgtVM64AZUREONDEMAND(90010) type=0
+                  fgtVM64GCPONDEMAND(90018) type=0
                   fgtVM64ALI(90019) type=0
+                  fgtVM64ALIONDEMAND(90020) type=0
                   fgtVM64RAXONDEMAND(90021) type=0
                   fgtVM64IBM(90022) type=0
                   fgtARM64OCI(90025) type=0
                   fgtARM64GCP(90026) type=0
                   fgtARM64AZURE(90027) type=0
+                  fosVM64KVM(90060) type=0
+                  fosVM64HV(90061) type=0
                   ffwVM64(90070) type=0
                   ffwVM64KVm(90071) type=0
                   fgtVM64AZURE(90081) type=0
@@ -538,6 +603,7 @@
                     fgTrapAvOversizePass(607) type=21
                     fgTrapAvOversizeBlock(608) type=21
                     fgTrapFazDisconnect(701) type=21
+                    fgTrapFaz(702) type=21
                     fgTrapWcApUp(801) type=21
                     fgTrapWcApDown(802) type=21
                     fgTrapFcSwUp(901) type=21
@@ -981,6 +1047,7 @@
                     fgManIfIp(1) type=5
                     fgManIfMask(2) type=5
                     fgManIfIp6(3) type=2 hint=2x:
+                    fgFazTrapType(4) type=3
                 fgIntf(7) type=0
                   fgIntfInfo(1) type=0
                   fgIntfTables(2) type=0
@@ -2008,6 +2075,28 @@
                     fmSysVersion(7) type=2 hint=255a
                     fmSysUpTime(8) type=11 units=hundredths of a second
                     fmSysLogRate(9) type=7 units=logs per second
+                    fmSysLogRateHr(10) type=7 hint=d-2 units=logs per second
+                    fmSysLogIndexingRate(11) type=7 hint=d-2 units=logs per second
+                    fmSysLogLagTime(12) type=7 units=second
+                    fmSysLicGbDayToday(13) type=7 hint=d-2
+                    fmSysLicGbDayYesterday(14) type=7 hint=d-2
+                    fmSysLicGbDayWeekAvg(15) type=7 hint=d-2
+                    fmSysDiskInfo(16) type=0
+                      fmSysDiskNumber(1) type=7
+                    fmSysDiskTable(17) type=0
+                      fmSysDiskEntry(1) type=0
+                        fmSysDiskEntIndex(1) type=16 hint=d
+                        fmSysDiskEntName(2) type=2 hint=255a
+                        fmSysDiskEntUsage(3) type=7
+                        fmSysDiskEntCapacity(4) type=7
+                        fmSysDiskEntIOUtil(5) type=7 hint=d-1
+                    fmSysLogForwardInfo(18) type=0
+                      fmSysLogForwardNumber(1) type=7
+                    fmSysLogForwardTable(19) type=0
+                      fmSysLogForwardEntry(1) type=0
+                        fmSysLogForwardIndex(1) type=16 hint=d
+                        fmSysLogForwardName(2) type=2 hint=255a
+                        fmSysLogForwardRate(3) type=7 hint=d-2 units=logs per second
                 faModel(3) type=0
                   fazvm(64) type=0
                   faz100(1000) type=0
@@ -2079,6 +2168,18 @@
                       fmAdomEntOsVersion(7) type=16
                       fmAdomEntMr(8) type=16
                       fmAdomEntVpnMode(9) type=3
+                      fmAdomEntLogRateMinute(10) type=7 hint=d-2 units=logs per second
+                      fmAdomEntArchiveLogRetention(11) type=7 units=days
+                      fmAdomEntArchiveLogQuota(12) type=7
+                      fmAdomEntArchiveLogUsedSpace(13) type=7
+                      fmAdomEntArchiveLogUsedSpacePercent(14) type=7 hint=d-1
+                      fmAdomEntAnalyticsLogRetention(15) type=7 units=days
+                      fmAdomEntAnalyticsLogQuota(16) type=7
+                      fmAdomEntAnalyticsLogUsedSpace(17) type=7
+                      fmAdomEntAnalyticsLogUsedSpacePercent(18) type=7 hint=d-1
+                      fmAdomEntLicGbDayToday(19) type=7 hint=d-2
+                      fmAdomEntLicGbDayYesterday(20) type=7 hint=d-2
+                      fmAdomEntLicGbDayWeekAvg(21) type=7 hint=d-2
                 fmDevice(6) type=0
                   fmDeviceInfo(1) type=0
                     fmDeviceNumber(1) type=16
@@ -2109,6 +2210,10 @@
                       fmDeviceEntAsExpireDate(22) type=2 hint=255a
                       fmDeviceEntPolicyPackageState(23) type=2 hint=255a
                       fmDeviceEntDesc(24) type=2 hint=255a
+                      fmDeviceEntLogRateHour(25) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntLogRateDay(26) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntLogRateWeek(27) type=7 hint=d-2 units=logs per second
+                      fmDeviceEntArchiveLogUsedSpace(28) type=7
                 fmRaid(7) type=0
                   fmRaidInfo(1) type=0
                     fmRaidLevel(1) type=3
@@ -2146,6 +2251,8 @@
                   fmSystemObjectGroup(2) type=22
                   fmNotificationObjComplianceGroup(3) type=22
                   fmSessionComplianceGroup(4) type=22
+                  fmAdomComplianceGroup(5) type=22
+                  fmDeviceComplianceGroup(6) type=22
                   fmMIBCompliance(100) type=26
                 fmUm(11) type=0
                   fmUmContract(1) type=0
@@ -2160,7 +2267,7 @@
                       fmUmFdsServiceFdsServerTable(2) type=0
                         fmUmFdsServiceFdsServerEntry(1) type=0
                           fmUmFdsServiceFdsServerEntryIndex(1) type=16 hint=d
-                          fmUmFdsServiceFdsServerAddr(2) type=0
+                          fmUmFdsServiceFdsServerAddr(2) type=2
                           fmUmFdsServiceFdsServerPort(3) type=15 hint=d
                           fmUmFdsServiceFdsServerTimeZone(4) type=16
                           fmUmFdsServiceFdsServerCurrent(5) type=3
@@ -2169,7 +2276,7 @@
                       fmUmFdsServiceFctServerTable(2) type=0
                         fmUmFdsServiceFctServerEntry(1) type=0
                           fmUmFdsServiceFctServerEntryIndex(1) type=16 hint=d
-                          fmUmFdsServiceFctServerAddr(2) type=0
+                          fmUmFdsServiceFctServerAddr(2) type=2
                           fmUmFdsServiceFctServerPort(3) type=15 hint=d
                           fmUmFdsServiceFctServerTimeZone(4) type=16
                           fmUmFdsServiceFctServerCurrent(5) type=3
@@ -2204,7 +2311,7 @@
                       fmUmFgdServiceFgdServerTable(2) type=0
                         fmUmFgdServiceFgdServerEntry(1) type=0
                           fmUmFgdServiceFgdServerEntryIndex(1) type=16 hint=d
-                          fmUmFgdServiceFgdServerAddr(2) type=0
+                          fmUmFgdServiceFgdServerAddr(2) type=2
                           fmUmFgdServiceFgdServerPort(3) type=15 hint=d
                           fmUmFgdServiceFgdServerTimeZone(4) type=16
                           fmUmFgdServiceFgdServerCurrent(5) type=3
@@ -2213,7 +2320,7 @@
                       fmUmFgdServiceFgfqServerTable(2) type=0
                         fmUmFgdServiceFgfqServerEntry(1) type=0
                           fmUmFgdServiceFgfqServerEntryIndex(1) type=16 hint=d
-                          fmUmFgdServiceFgfqServerAddr(2) type=0
+                          fmUmFgdServiceFgfqServerAddr(2) type=2
                           fmUmFgdServiceFgfqServerPort(3) type=15 hint=d
                           fmUmFgdServiceFgfqServerTimeZone(4) type=16
                           fmUmFgdServiceFgfqServerCurrent(5) type=3
@@ -2230,7 +2337,7 @@
                       fmUmFgdQueryStatisticTop10SitesTable(1) type=0
                         fmUmFgdQueryStatisticTop10SitesEntry(1) type=0
                           fmUmFgdQueryStatisticTop10SitesEntryIndex(1) type=16 hint=d
-                          fmUmFgdQueryStatisticTop10SitesEntryAddress(2) type=0
+                          fmUmFgdQueryStatisticTop10SitesEntryAddress(2) type=2
                           fmUmFgdQueryStatisticTop10SitesEntryVisits(3) type=11
                       fmUmFgdQueryStatisticTop10DevicesTable(2) type=0
                         fmUmFgdQueryStatisticTop10DevicesEntry(1) type=0
@@ -2240,13 +2347,13 @@
                       fmUmFgdQueryStatisticQueryHistoryTable(3) type=0
                         fmUmFgdQueryStatisticQueryHistoryEntry(1) type=0
                           fmUmFgdQueryStatisticQueryHistoryEntryIndex(1) type=16 hint=d
-                          fmUmFgdQueryStatisticQueryHistoryEntryBeginTime(2) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryEndTime(3) type=0
+                          fmUmFgdQueryStatisticQueryHistoryEntryBeginTime(2) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryEndTime(3) type=11
                           fmUmFgdQueryStatisticQueryHistoryEntryDeviceName(4) type=2 hint=255a
-                          fmUmFgdQueryStatisticQueryHistoryEntryDeviceAddress(5) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryQueries(6) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryHits(7) type=0
-                          fmUmFgdQueryStatisticQueryHistoryEntryMisses(8) type=0
+                          fmUmFgdQueryStatisticQueryHistoryEntryDeviceAddress(5) type=2
+                          fmUmFgdQueryStatisticQueryHistoryEntryQueries(6) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryHits(7) type=11
+                          fmUmFgdQueryStatisticQueryHistoryEntryMisses(8) type=11
                           fmUmFgdQueryStatisticQueryHistoryEntryBandWidth(9) type=2 hint=255a
               fnFortiMailMib(105) type=24
                 fmlTraps(0) type=0
diff --git a/fortinet/README b/fortinet/README
index 4971ab8af..a1a6c78ad 100644
--- a/fortinet/README
+++ b/fortinet/README
@@ -2,27 +2,31 @@ version info, where the mib files were found, and if renamed
 also mention their original name(s). removed devices have been readded
 
 fortinet-core-mib.mib
-	->FORTINET-CORE-MIB-build1828.mib: fortigate 6.4.5
+    ->FORTINET-CORE-MIB-build2463.mib: fortigate 7.4.1
 
 fortinet-fortiadc-mib.mib (manually updated date)
-	->FORTINET-FORTIADC-MIB.mib: fortiadc 6.1.2
+    ->FORTINET-FORTIADC-MIB.mib: fortiadc 6.1.2
 
 fortinet-fortiauthenticator-mib.mib
-	->FORTINET-FORTIAUTHENTICATOR-MIB.mib: fortiauthenticator 6.3.0
+    ->FORTINET-FORTIAUTHENTICATOR-MIB.mib: fortiauthenticator 6.3.0
 
 fortinet-fortigate-mib.mib
-	->FORTINET-FORTIGATE-MIB-build1828.mib: fortigate 6.4.5
-	->FORTINET-FORTIGATE-MIB-build0231.mib: fortigate 6.0.4
-	->FORTINET-FORTIGATE-MIB-build1672.mib: fortigate 5.6.8
+    ->FORTINET-FORTIGATE-MIB-build2463.mib: fortigate 7.4.1
+    ->FORTINET-FORTIGATE-MIB-build1517.mib: fortigate 7.2.5
+    ->FORTINET-FORTIGATE-MIB-build0523.mib: fortigate 7.0.12
+    ->FORTINET-FORTIGATE-MIB-build2093.mib: fortigate 6.4.14
+    ->FORTINET-FORTIGATE-MIB-build1378.mib: fortigate 6.2.15
+    ->FORTINET-FORTIGATE-MIB-build0528.mib: fortigate 6.0.17
+    ->FORTINET-FORTIGATE-MIB-build1727.mib: fortigate 5.6.14
 
 fortinet-fortimail-mib.mib (manually updated date)
-	->FORTINET-FORTIMAIL-MIB.mib: fortimail 6.4.4
+    ->FORTINET-FORTIMAIL-MIB.mib: fortimail 6.4.4
 
 fortinet-fortimanager-fortianalyzer-mib.mib
-	->FORTINET-FORTIMANAGER-FORTIANALYZER-MIB-build2288.mib: fortianalyzer 6.4.5
+    ->FORTINET-FORTIMANAGER-FORTIANALYZER-MIB-build2308.mib: fortianalyzer 7.4.1
 
 fortinet-fortiswitch-mib.mib
-	->FORTINET-FORTISWITCH-MIB.mib: fortiswitch 7.0.0
+    ->FORTINET-FORTISWITCH-MIB.mib: fortiswitch 7.0.0
 
 
 fortinet-mib-280.mib seems obsolete or superseded by fortinet-core-mib.mib but
diff --git a/fortinet/fortinet-fortigate-mib.mib b/fortinet/fortinet-fortigate-mib.mib
index 7365f0f82..dd610519b 100644
--- a/fortinet/fortinet-fortigate-mib.mib
+++ b/fortinet/fortinet-fortigate-mib.mib
@@ -32,7 +32,7 @@ IMPORTS
         FROM SNMPv2-TC;
 
 fnFortiGateMib MODULE-IDENTITY
-    LAST-UPDATED "202303160000Z"
+    LAST-UPDATED "202307210000Z"
     ORGANIZATION
         "Fortinet Technologies, Inc."
     CONTACT-INFO
@@ -42,6 +42,9 @@ fnFortiGateMib MODULE-IDENTITY
          http://www.fortinet.com"
     DESCRIPTION
         "MIB module for Fortinet FortiGate devices."
+    REVISION    "202307210000Z"
+    DESCRIPTION
+        "Add fgTrapFaz for FortiAnalyzer event."
     REVISION    "202303160000Z"
     DESCRIPTION
         "Added OID fgServiceGroupWorkerBlades for 6K7K slbc platform."
@@ -570,169 +573,234 @@ fgModel OBJECT IDENTIFIER ::= { fnFortiGateMib 1 }
 
 -- fgModel start
 
-ffvmbb           OBJECT IDENTIFIER ::= { fgModel 80025 }
-ffvmev           OBJECT IDENTIFIER ::= { fgModel 80000 }
-ffw3980E         OBJECT IDENTIFIER ::= { fgModel 39804 }
-ffwVM64          OBJECT IDENTIFIER ::= { fgModel 90070 }
-ffwVM64KVm       OBJECT IDENTIFIER ::= { fgModel 90071 }
+fgtVM64          OBJECT IDENTIFIER ::= { fgModel 30 }
+fgtVM64VMX       OBJECT IDENTIFIER ::= { fgModel 31 }
+fgtVM64SVM       OBJECT IDENTIFIER ::= { fgModel 32 }
+fgtVM64XEN       OBJECT IDENTIFIER ::= { fgModel 40 }
+fosVM64XEN       OBJECT IDENTIFIER ::= { fgModel 41 }
+fgtVM64AWS       OBJECT IDENTIFIER ::= { fgModel 45 }
+fgtVM64FGCAWS    OBJECT IDENTIFIER ::= { fgModel 46 }
+fgtVM64OPC       OBJECT IDENTIFIER ::= { fgModel 47 }
+fgtVM64KVm       OBJECT IDENTIFIER ::= { fgModel 60 }
+fgtVM64FGCKVM    OBJECT IDENTIFIER ::= { fgModel 61 }
+fgtVM64GCP       OBJECT IDENTIFIER ::= { fgModel 65 }
+fgtARM64KVM      OBJECT IDENTIFIER ::= { fgModel 66 }
+fgtVM64HV        OBJECT IDENTIFIER ::= { fgModel 70 }
+fgt30D           OBJECT IDENTIFIER ::= { fgModel 304 }
+fgt30DPOE        OBJECT IDENTIFIER ::= { fgModel 305 }
+fgt30E           OBJECT IDENTIFIER ::= { fgModel 306 }
+fgr30D           OBJECT IDENTIFIER ::= { fgModel 307 }
+fgr35D           OBJECT IDENTIFIER ::= { fgModel 308 }
+fr30DA           OBJECT IDENTIFIER ::= { fgModel 309 }
+fwf30D           OBJECT IDENTIFIER ::= { fgModel 314 }
+fwf30DPOE        OBJECT IDENTIFIER ::= { fgModel 315 }
+fwf30E           OBJECT IDENTIFIER ::= { fgModel 316 }
+fgt30EG          OBJECT IDENTIFIER ::= { fgModel 319 }
+fg30EN           OBJECT IDENTIFIER ::= { fgModel 320 }
+fg30EI           OBJECT IDENTIFIER ::= { fgModel 321 }
+fw30EN           OBJECT IDENTIFIER ::= { fgModel 322 }
+fw30EI           OBJECT IDENTIFIER ::= { fgModel 323 }
+fw30EG           OBJECT IDENTIFIER ::= { fgModel 324 }
+fgt40F           OBJECT IDENTIFIER ::= { fgModel 441 }
+fgt41F           OBJECT IDENTIFIER ::= { fgModel 442 }
 fg40FI           OBJECT IDENTIFIER ::= { fgModel 443 }
 fg41FI           OBJECT IDENTIFIER ::= { fgModel 444 }
-fg900D           OBJECT IDENTIFIER ::= { fgModel 900 }
+fwf40F           OBJECT IDENTIFIER ::= { fgModel 445 }
+fwf41F           OBJECT IDENTIFIER ::= { fgModel 446 }
+fw40FI           OBJECT IDENTIFIER ::= { fgModel 447 }
+fw41FI           OBJECT IDENTIFIER ::= { fgModel 448 }
+fgt50E           OBJECT IDENTIFIER ::= { fgModel 505 }
+fwf50E           OBJECT IDENTIFIER ::= { fgModel 506 }
+fgt51E           OBJECT IDENTIFIER ::= { fgModel 515 }
+fwf51E           OBJECT IDENTIFIER ::= { fgModel 516 }
+fw502R           OBJECT IDENTIFIER ::= { fgModel 517 }
+fgt52E           OBJECT IDENTIFIER ::= { fgModel 518 }
+fgt60D           OBJECT IDENTIFIER ::= { fgModel 624 }
+fgt60DPOE        OBJECT IDENTIFIER ::= { fgModel 625 }
+fwf60D           OBJECT IDENTIFIER ::= { fgModel 626 }
+fw60DP           OBJECT IDENTIFIER ::= { fgModel 627 }
+fgt90D           OBJECT IDENTIFIER ::= { fgModel 630 }
+fgt90DPOE        OBJECT IDENTIFIER ::= { fgModel 631 }
+fwf90D           OBJECT IDENTIFIER ::= { fgModel 632 }
+fwf90DPOE        OBJECT IDENTIFIER ::= { fgModel 633 }
+fgt94DPOE        OBJECT IDENTIFIER ::= { fgModel 634 }
+fgt98DPOE        OBJECT IDENTIFIER ::= { fgModel 635 }
+fgt92D           OBJECT IDENTIFIER ::= { fgModel 636 }
+fwf92D           OBJECT IDENTIFIER ::= { fgModel 637 }
+fgr90D           OBJECT IDENTIFIER ::= { fgModel 638 }
+fwf60E           OBJECT IDENTIFIER ::= { fgModel 639 }
+fgt61E           OBJECT IDENTIFIER ::= { fgModel 640 }
+fgt60E           OBJECT IDENTIFIER ::= { fgModel 641 }
+fgt60EPOE        OBJECT IDENTIFIER ::= { fgModel 642 }
 fgr60F           OBJECT IDENTIFIER ::= { fgModel 643 }
+fgt60F           OBJECT IDENTIFIER ::= { fgModel 644 }
+fgt61F           OBJECT IDENTIFIER ::= { fgModel 645 }
+fg60EI           OBJECT IDENTIFIER ::= { fgModel 646 }
+fg60EC           OBJECT IDENTIFIER ::= { fgModel 647 }
 fgr60FI          OBJECT IDENTIFIER ::= { fgModel 648 }
-fgt1000D         OBJECT IDENTIFIER ::= { fgModel 10005 }
+fwf61E           OBJECT IDENTIFIER ::= { fgModel 649 }
+fgt60EJ          OBJECT IDENTIFIER ::= { fgModel 661 }
+fwf60EJ          OBJECT IDENTIFIER ::= { fgModel 662 }
+fgt60EV          OBJECT IDENTIFIER ::= { fgModel 663 }
+fwf60EV          OBJECT IDENTIFIER ::= { fgModel 664 }
+fgt70D           OBJECT IDENTIFIER ::= { fgModel 700 }
+fgt70F           OBJECT IDENTIFIER ::= { fgModel 701 }
+fgt71F           OBJECT IDENTIFIER ::= { fgModel 702 }
+fr70FB           OBJECT IDENTIFIER ::= { fgModel 704 }
+fr70FM           OBJECT IDENTIFIER ::= { fgModel 705 }
+fgt80C           OBJECT IDENTIFIER ::= { fgModel 800 }
+fgt80CM          OBJECT IDENTIFIER ::= { fgModel 801 }
+fgt80D           OBJECT IDENTIFIER ::= { fgModel 803 }
+fwf80CM          OBJECT IDENTIFIER ::= { fgModel 810 }
+fwf81CM          OBJECT IDENTIFIER ::= { fgModel 811 }
+fgt80EPOE        OBJECT IDENTIFIER ::= { fgModel 841 }
+fgt80E           OBJECT IDENTIFIER ::= { fgModel 842 }
+fgt81E           OBJECT IDENTIFIER ::= { fgModel 843 }
+fgt81EPOE        OBJECT IDENTIFIER ::= { fgModel 844 }
+fgt80F           OBJECT IDENTIFIER ::= { fgModel 845 }
+fgt81F           OBJECT IDENTIFIER ::= { fgModel 846 }
+fgt80FBP         OBJECT IDENTIFIER ::= { fgModel 847 }
+fwf80F           OBJECT IDENTIFIER ::= { fgModel 848 }
+fwf81F           OBJECT IDENTIFIER ::= { fgModel 849 }
+fgt80FPOE        OBJECT IDENTIFIER ::= { fgModel 850 }
+fgt81FPOE        OBJECT IDENTIFIER ::= { fgModel 851 }
+fw81FD           OBJECT IDENTIFIER ::= { fgModel 852 }
+fw81FP           OBJECT IDENTIFIER ::= { fgModel 853 }
+fg900D           OBJECT IDENTIFIER ::= { fgModel 900 }
+fgt90E           OBJECT IDENTIFIER ::= { fgModel 940 }
+fgt91E           OBJECT IDENTIFIER ::= { fgModel 941 }
+fgt100F          OBJECT IDENTIFIER ::= { fgModel 1000 }
+fgt101F          OBJECT IDENTIFIER ::= { fgModel 1001 }
 fgt100D          OBJECT IDENTIFIER ::= { fgModel 1004 }
+fgt140E          OBJECT IDENTIFIER ::= { fgModel 1005 }
+fgt140EP         OBJECT IDENTIFIER ::= { fgModel 1006 }
 fgt100E          OBJECT IDENTIFIER ::= { fgModel 1041 }
 fgt100EF         OBJECT IDENTIFIER ::= { fgModel 1042 }
-fgt100F          OBJECT IDENTIFIER ::= { fgModel 1000 }
 fgt101E          OBJECT IDENTIFIER ::= { fgModel 1043 }
-fgt101F          OBJECT IDENTIFIER ::= { fgModel 1001 }
+fgt140D          OBJECT IDENTIFIER ::= { fgModel 1401 }
+fgt140P          OBJECT IDENTIFIER ::= { fgModel 1402 }
+fgt200D          OBJECT IDENTIFIER ::= { fgModel 2005 }
+fgt240D          OBJECT IDENTIFIER ::= { fgModel 2006 }
+fgt200DP         OBJECT IDENTIFIER ::= { fgModel 2007 }
+fgt240DP         OBJECT IDENTIFIER ::= { fgModel 2008 }
+fgt200E          OBJECT IDENTIFIER ::= { fgModel 2009 }
+fgt201E          OBJECT IDENTIFIER ::= { fgModel 2010 }
+fgt200F          OBJECT IDENTIFIER ::= { fgModel 2011 }
+fgt201F          OBJECT IDENTIFIER ::= { fgModel 2012 }
+fgt280D          OBJECT IDENTIFIER ::= { fgModel 2013 }
+fgt3HD           OBJECT IDENTIFIER ::= { fgModel 3006 }
+fgt300E          OBJECT IDENTIFIER ::= { fgModel 3007 }
+fgt301E          OBJECT IDENTIFIER ::= { fgModel 3008 }
+fgt400D          OBJECT IDENTIFIER ::= { fgModel 4004 }
+fgt400E          OBJECT IDENTIFIER ::= { fgModel 4007 }
+fgt401E          OBJECT IDENTIFIER ::= { fgModel 4008 }
+fgt400EBP        OBJECT IDENTIFIER ::= { fgModel 4009 }
+fgt400F          OBJECT IDENTIFIER ::= { fgModel 4010 }
+fgt401F          OBJECT IDENTIFIER ::= { fgModel 4011 }
+fgt500D          OBJECT IDENTIFIER ::= { fgModel 5004 }
+fgt500E          OBJECT IDENTIFIER ::= { fgModel 5005 }
+fgt501E          OBJECT IDENTIFIER ::= { fgModel 5006 }
+fgt600C          OBJECT IDENTIFIER ::= { fgModel 6003 }
+fgt600D          OBJECT IDENTIFIER ::= { fgModel 6004 }
+fgt600E          OBJECT IDENTIFIER ::= { fgModel 6005 }
+fgt601E          OBJECT IDENTIFIER ::= { fgModel 6006 }
+fgt600F          OBJECT IDENTIFIER ::= { fgModel 6007 }
+fgt601F          OBJECT IDENTIFIER ::= { fgModel 6008 }
+fgt800C          OBJECT IDENTIFIER ::= { fgModel 8003 }
+fgt800D          OBJECT IDENTIFIER ::= { fgModel 8004 }
+fgt1000C         OBJECT IDENTIFIER ::= { fgModel 10004 }
+fgt1000D         OBJECT IDENTIFIER ::= { fgModel 10005 }
 fgt1100E         OBJECT IDENTIFIER ::= { fgModel 10006 }
 fgt1101E         OBJECT IDENTIFIER ::= { fgModel 10007 }
 fgt1200D         OBJECT IDENTIFIER ::= { fgModel 12000 }
-fgt140E          OBJECT IDENTIFIER ::= { fgModel 1005 }
-fgt140EP         OBJECT IDENTIFIER ::= { fgModel 1006 }
 fgt1500D         OBJECT IDENTIFIER ::= { fgModel 15000 }
 fgt1500DT        OBJECT IDENTIFIER ::= { fgModel 15001 }
-fgt1800F         OBJECT IDENTIFIER ::= { fgModel 15003 }
 fgt1801F         OBJECT IDENTIFIER ::= { fgModel 15002 }
-fgt2000E         OBJECT IDENTIFIER ::= { fgModel 20000 }
-fgt200E          OBJECT IDENTIFIER ::= { fgModel 2009 }
-fgt200F          OBJECT IDENTIFIER ::= { fgModel 2011 }
-fgt201E          OBJECT IDENTIFIER ::= { fgModel 2010 }
-fgt201F          OBJECT IDENTIFIER ::= { fgModel 2012 }
+fgt1800F         OBJECT IDENTIFIER ::= { fgModel 15003 }
 fgt2200E         OBJECT IDENTIFIER ::= { fgModel 18000 }
 fgt2201E         OBJECT IDENTIFIER ::= { fgModel 18001 }
+fgt2000E         OBJECT IDENTIFIER ::= { fgModel 20000 }
 fgt2500E         OBJECT IDENTIFIER ::= { fgModel 25000 }
 fgt2600F         OBJECT IDENTIFIER ::= { fgModel 26000 }
 fgt2601F         OBJECT IDENTIFIER ::= { fgModel 26001 }
 fgt3000D         OBJECT IDENTIFIER ::= { fgModel 30000 }
+fgt3300E         OBJECT IDENTIFIER ::= { fgModel 30001 }
+fgt3301E         OBJECT IDENTIFIER ::= { fgModel 30002 }
 fgt3000F         OBJECT IDENTIFIER ::= { fgModel 30003 }
 fgt3001F         OBJECT IDENTIFIER ::= { fgModel 30004 }
-fgt300E          OBJECT IDENTIFIER ::= { fgModel 3007 }
-fgt301E          OBJECT IDENTIFIER ::= { fgModel 3008 }
 fgt3100D         OBJECT IDENTIFIER ::= { fgModel 31000 }
 fgt3200D         OBJECT IDENTIFIER ::= { fgModel 32000 }
-fgt3300E         OBJECT IDENTIFIER ::= { fgModel 30001 }
-fgt3301E         OBJECT IDENTIFIER ::= { fgModel 30002 }
+fgt3240C         OBJECT IDENTIFIER ::= { fgModel 32401 }
 fgt3400E         OBJECT IDENTIFIER ::= { fgModel 34001 }
 fgt3401E         OBJECT IDENTIFIER ::= { fgModel 34011 }
 fgt3500F         OBJECT IDENTIFIER ::= { fgModel 35001 }
 fgt3501F         OBJECT IDENTIFIER ::= { fgModel 35011 }
 fgt3600E         OBJECT IDENTIFIER ::= { fgModel 36001 }
+fgt3600C         OBJECT IDENTIFIER ::= { fgModel 36004 }
 fgt3601E         OBJECT IDENTIFIER ::= { fgModel 36011 }
 fgt3700D         OBJECT IDENTIFIER ::= { fgModel 37000 }
+fgt3700DX        OBJECT IDENTIFIER ::= { fgModel 37001 }
 fgt3800D         OBJECT IDENTIFIER ::= { fgModel 38001 }
+fgt4200F         OBJECT IDENTIFIER ::= { fgModel 38002 }
+ffw4200F         OBJECT IDENTIFIER ::= { fgModel 38006 }
 fgt3810D         OBJECT IDENTIFIER ::= { fgModel 38101 }
 fgt3815D         OBJECT IDENTIFIER ::= { fgModel 38150 }
+fgt4400F         OBJECT IDENTIFIER ::= { fgModel 39001 }
+ffw4400F         OBJECT IDENTIFIER ::= { fgModel 39007 }
 fgt3960E         OBJECT IDENTIFIER ::= { fgModel 39601 }
 fgt3980E         OBJECT IDENTIFIER ::= { fgModel 39801 }
-fgt3HD           OBJECT IDENTIFIER ::= { fgModel 3006 }
-fgt400D          OBJECT IDENTIFIER ::= { fgModel 4004 }
-fgt400E          OBJECT IDENTIFIER ::= { fgModel 4007 }
-fgt400EBP        OBJECT IDENTIFIER ::= { fgModel 4009 }
-fgt400F          OBJECT IDENTIFIER ::= { fgModel 4010 }
-fgt401E          OBJECT IDENTIFIER ::= { fgModel 4008 }
-fgt401F          OBJECT IDENTIFIER ::= { fgModel 4011 }
-fgt40F           OBJECT IDENTIFIER ::= { fgModel 441 }
-fgt41F           OBJECT IDENTIFIER ::= { fgModel 442 }
-fgt4200F         OBJECT IDENTIFIER ::= { fgModel 38002 }
+ffw3980E         OBJECT IDENTIFIER ::= { fgModel 39804 }
 fgt4201F         OBJECT IDENTIFIER ::= { fgModel 42002 }
-fgt4400F         OBJECT IDENTIFIER ::= { fgModel 39001 }
 fgt4401F         OBJECT IDENTIFIER ::= { fgModel 44001 }
+fgt5001C         OBJECT IDENTIFIER ::= { fgModel 50014 }
 fgt5001D         OBJECT IDENTIFIER ::= { fgModel 50015 }
 fgt5001E         OBJECT IDENTIFIER ::= { fgModel 50016 }
 fgt5001E1        OBJECT IDENTIFIER ::= { fgModel 50017 }
-fgt500D          OBJECT IDENTIFIER ::= { fgModel 5004 }
-fgt500E          OBJECT IDENTIFIER ::= { fgModel 5005 }
-fgt501E          OBJECT IDENTIFIER ::= { fgModel 5006 }
 fgt6000F         OBJECT IDENTIFIER ::= { fgModel 60001 }
-fgt600D          OBJECT IDENTIFIER ::= { fgModel 6004 }
-fgt600E          OBJECT IDENTIFIER ::= { fgModel 6005 }
-fgt600F          OBJECT IDENTIFIER ::= { fgModel 6007 }
-fgt601E          OBJECT IDENTIFIER ::= { fgModel 6006 }
-fgt601F          OBJECT IDENTIFIER ::= { fgModel 6008 }
-fgt60E           OBJECT IDENTIFIER ::= { fgModel 641 }
-fgt60EJ          OBJECT IDENTIFIER ::= { fgModel 661 }
-fgt60EPOE        OBJECT IDENTIFIER ::= { fgModel 642 }
-fgt60EV          OBJECT IDENTIFIER ::= { fgModel 663 }
-fgt60F           OBJECT IDENTIFIER ::= { fgModel 644 }
-fgt61E           OBJECT IDENTIFIER ::= { fgModel 640 }
-fgt61F           OBJECT IDENTIFIER ::= { fgModel 645 }
 fgt7000E         OBJECT IDENTIFIER ::= { fgModel 70001 }
 fgt7000F         OBJECT IDENTIFIER ::= { fgModel 71201 }
-fgt70F           OBJECT IDENTIFIER ::= { fgModel 701 }
-fgt71F           OBJECT IDENTIFIER ::= { fgModel 702 }
-fgt800D          OBJECT IDENTIFIER ::= { fgModel 8004 }
-fgt80E           OBJECT IDENTIFIER ::= { fgModel 842 }
-fgt80EPOE        OBJECT IDENTIFIER ::= { fgModel 841 }
-fgt80F           OBJECT IDENTIFIER ::= { fgModel 845 }
-fgt80FBP         OBJECT IDENTIFIER ::= { fgModel 847 }
-fgt80FPOE        OBJECT IDENTIFIER ::= { fgModel 850 }
-fgt81E           OBJECT IDENTIFIER ::= { fgModel 843 }
-fgt81EPOE        OBJECT IDENTIFIER ::= { fgModel 844 }
-fgt81F           OBJECT IDENTIFIER ::= { fgModel 846 }
-fgt81FPOE        OBJECT IDENTIFIER ::= { fgModel 851 }
-fgt90E           OBJECT IDENTIFIER ::= { fgModel 940 }
-fgt91E           OBJECT IDENTIFIER ::= { fgModel 941 }
-fgtARM64AWS      OBJECT IDENTIFIER ::= { fgModel 90007 }
-fgtARM64AZURE    OBJECT IDENTIFIER ::= { fgModel 90027 }
-fgtARM64GCP      OBJECT IDENTIFIER ::= { fgModel 90026 }
-fgtARM64KVM      OBJECT IDENTIFIER ::= { fgModel 66 }
-fgtARM64OCI      OBJECT IDENTIFIER ::= { fgModel 90025 }
-fgtARM64XEN      OBJECT IDENTIFIER ::= { fgModel 90008 }
-fgtVM64          OBJECT IDENTIFIER ::= { fgModel 30 }
-fgtVM64ALI       OBJECT IDENTIFIER ::= { fgModel 90019 }
-fgtVM64AWS       OBJECT IDENTIFIER ::= { fgModel 45 }
-fgtVM64AZURE     OBJECT IDENTIFIER ::= { fgModel 90081 }
-fgtVM64FGCAWS    OBJECT IDENTIFIER ::= { fgModel 46 }
-fgtVM64FGCKVM    OBJECT IDENTIFIER ::= { fgModel 61 }
-fgtVM64GCP       OBJECT IDENTIFIER ::= { fgModel 65 }
-fgtVM64HV        OBJECT IDENTIFIER ::= { fgModel 70 }
-fgtVM64IBM       OBJECT IDENTIFIER ::= { fgModel 90022 }
-fgtVM64KVm       OBJECT IDENTIFIER ::= { fgModel 60 }
-fgtVM64OPC       OBJECT IDENTIFIER ::= { fgModel 47 }
-fgtVM64RAXONDEMAND OBJECT IDENTIFIER ::= { fgModel 90021 }
-fgtVM64XEN       OBJECT IDENTIFIER ::= { fgModel 40 }
+ffvmev           OBJECT IDENTIFIER ::= { fgModel 80000 }
+fgvmev           OBJECT IDENTIFIER ::= { fgModel 80001 }
+fgvmxx           OBJECT IDENTIFIER ::= { fgModel 80002 }
 fgtvmx           OBJECT IDENTIFIER ::= { fgModel 80003 }
-fgv16v           OBJECT IDENTIFIER ::= { fgModel 80015 }
-fgv32v           OBJECT IDENTIFIER ::= { fgModel 80016 }
 fgvm00           OBJECT IDENTIFIER ::= { fgModel 80004 }
 fgvm01           OBJECT IDENTIFIER ::= { fgModel 80005 }
 fgvm02           OBJECT IDENTIFIER ::= { fgModel 80006 }
 fgvm04           OBJECT IDENTIFIER ::= { fgModel 80007 }
 fgvm08           OBJECT IDENTIFIER ::= { fgModel 80008 }
 fgvm16           OBJECT IDENTIFIER ::= { fgModel 80009 }
+fgvm32           OBJECT IDENTIFIER ::= { fgModel 80010 }
 fgvm1v           OBJECT IDENTIFIER ::= { fgModel 80011 }
 fgvm2v           OBJECT IDENTIFIER ::= { fgModel 80012 }
-fgvm32           OBJECT IDENTIFIER ::= { fgModel 80010 }
 fgvm4v           OBJECT IDENTIFIER ::= { fgModel 80013 }
 fgvm8v           OBJECT IDENTIFIER ::= { fgModel 80014 }
+fgv16v           OBJECT IDENTIFIER ::= { fgModel 80015 }
+fgv32v           OBJECT IDENTIFIER ::= { fgModel 80016 }
+fgvulv           OBJECT IDENTIFIER ::= { fgModel 80019 }
+fgvmul           OBJECT IDENTIFIER ::= { fgModel 80020 }
+fgvmsl           OBJECT IDENTIFIER ::= { fgModel 80021 }
+fgvmsb           OBJECT IDENTIFIER ::= { fgModel 80022 }
 fgvmel           OBJECT IDENTIFIER ::= { fgModel 80023 }
-fgvmev           OBJECT IDENTIFIER ::= { fgModel 80001 }
 fgvmml           OBJECT IDENTIFIER ::= { fgModel 80024 }
+ffvmbb           OBJECT IDENTIFIER ::= { fgModel 80025 }
 fgvmpg           OBJECT IDENTIFIER ::= { fgModel 80030 }
-fgvmsb           OBJECT IDENTIFIER ::= { fgModel 80022 }
-fgvmsl           OBJECT IDENTIFIER ::= { fgModel 80021 }
-fgvmul           OBJECT IDENTIFIER ::= { fgModel 80020 }
-fgvmxx           OBJECT IDENTIFIER ::= { fgModel 80002 }
-fgvulv           OBJECT IDENTIFIER ::= { fgModel 80019 }
-fr70FB           OBJECT IDENTIFIER ::= { fgModel 704 }
-fr70FM           OBJECT IDENTIFIER ::= { fgModel 705 }
-fw40FI           OBJECT IDENTIFIER ::= { fgModel 447 }
-fw41FI           OBJECT IDENTIFIER ::= { fgModel 448 }
-fw81FD           OBJECT IDENTIFIER ::= { fgModel 852 }
-fw81FP           OBJECT IDENTIFIER ::= { fgModel 853 }
-fwf40F           OBJECT IDENTIFIER ::= { fgModel 445 }
-fwf41F           OBJECT IDENTIFIER ::= { fgModel 446 }
-fwf60E           OBJECT IDENTIFIER ::= { fgModel 639 }
-fwf60EJ          OBJECT IDENTIFIER ::= { fgModel 662 }
-fwf60EV          OBJECT IDENTIFIER ::= { fgModel 664 }
-fwf60F           OBJECT IDENTIFIER ::= { fgModel 646 }
-fwf61E           OBJECT IDENTIFIER ::= { fgModel 649 }
-fwf61F           OBJECT IDENTIFIER ::= { fgModel 647 }
-fwf80F           OBJECT IDENTIFIER ::= { fgModel 848 }
-fwf81F           OBJECT IDENTIFIER ::= { fgModel 849 }
+fosVM64          OBJECT IDENTIFIER ::= { fgModel 90000 }
+fgtARM64AWS      OBJECT IDENTIFIER ::= { fgModel 90007 }
+fgtARM64XEN      OBJECT IDENTIFIER ::= { fgModel 90008 }
+fgtVM64AZUREONDEMAND OBJECT IDENTIFIER ::= { fgModel 90010 }
+fgtVM64GCPONDEMAND OBJECT IDENTIFIER ::= { fgModel 90018 }
+fgtVM64ALI       OBJECT IDENTIFIER ::= { fgModel 90019 }
+fgtVM64ALIONDEMAND OBJECT IDENTIFIER ::= { fgModel 90020 }
+fgtVM64RAXONDEMAND OBJECT IDENTIFIER ::= { fgModel 90021 }
+fgtVM64IBM       OBJECT IDENTIFIER ::= { fgModel 90022 }
+fgtARM64OCI      OBJECT IDENTIFIER ::= { fgModel 90025 }
+fgtARM64GCP      OBJECT IDENTIFIER ::= { fgModel 90026 }
+fgtARM64AZURE    OBJECT IDENTIFIER ::= { fgModel 90027 }
+fosVM64KVM       OBJECT IDENTIFIER ::= { fgModel 90060 }
+fosVM64HV        OBJECT IDENTIFIER ::= { fgModel 90061 }
+ffwVM64          OBJECT IDENTIFIER ::= { fgModel 90070 }
+ffwVM64KVm       OBJECT IDENTIFIER ::= { fgModel 90071 }
+fgtVM64AZURE     OBJECT IDENTIFIER ::= { fgModel 90081 }
 
 -- fgModel end
 
@@ -4429,6 +4497,19 @@ fgManIfIp6 OBJECT-TYPE
         "IPv6 address of the interface listed in the trap"
     ::= { fgMgmtTrapObjects 3 }
 
+fgFazTrapType OBJECT-TYPE
+    SYNTAX      INTEGER {
+                  mainFailover(1),
+                  altFailover(2)
+                }
+    MAX-ACCESS  accessible-for-notify
+    STATUS      current
+    DESCRIPTION
+        "Fortianalyzer trap type, there are 2 different values as below:
+           mainFailover(1)    - Fortianalyzer main server failover and alternate server take over.
+           altFailover(2)     - Fortianalyzer alternate server failover and main server take over."
+    ::= { fgMgmtTrapObjects 4 }
+
 --
 -- fortinet.fnFortiGateMib.fgIntf
 --
@@ -12992,6 +13073,13 @@ fgTrapFazDisconnect NOTIFICATION-TYPE
         "The device has been disconnected from the FortiAnalyzer."
     ::= { fgTrapPrefix 701 }
     
+fgTrapFaz NOTIFICATION-TYPE
+    OBJECTS     { fnSysSerial, sysName, fgFazTrapType }
+    STATUS      current
+    DESCRIPTION
+        "A trap for Fortianalyzer event."
+    ::= { fgTrapPrefix 702}
+
 fgTrapWcApUp NOTIFICATION-TYPE
     OBJECTS     { fnSysSerial, sysName, fgWcApVdom, fgWcApSerial, fgWcApName }
     STATUS      current
@@ -13103,7 +13191,7 @@ fgFmTrapGroup NOTIFICATION-GROUP
     ::= { fgMibConformance 1 }
 
 fgFmTrapObjectGroup OBJECT-GROUP
-    OBJECTS     { fgManIfIp, fgManIfMask,fgManIfIp6 }
+    OBJECTS     { fgManIfIp, fgManIfMask,fgManIfIp6, fgFazTrapType }
     STATUS      current
     DESCRIPTION 
         "These objects support the traps in the fgFmTrapGroup."
@@ -13411,7 +13499,7 @@ fgNotificationGroup NOTIFICATION-GROUP
                   fgTrapAvPattern, fgTrapAvFragmented, 
                   fgTrapAvEnterConserve, fgTrapAvBypass, 
                   fgTrapAvOversizePass, fgTrapAvOversizeBlock, 
-                  fgTrapFazDisconnect, fgTrapWcApUp, fgTrapWcApDown, fgTrapDeviceNew, 
+                  fgTrapFazDisconnect, fgTrapFaz, fgTrapWcApUp, fgTrapWcApDown, fgTrapDeviceNew, 
                   fgTrapPerCpuHigh, fgTrapDhcp, fgTrapPoolUsage,
                   fgTrapFcSwUp, fgTrapFcSwDown, fgTrapServerLoadBalanceRealServerDown,
                   fgTrapSlbc }
diff --git a/fortinet/fortinet-fortimanager-fortianalyzer-mib.mib b/fortinet/fortinet-fortimanager-fortianalyzer-mib.mib
index 814ad9eff..c51225678 100644
--- a/fortinet/fortinet-fortimanager-fortianalyzer-mib.mib
+++ b/fortinet/fortinet-fortimanager-fortianalyzer-mib.mib
@@ -6,7 +6,7 @@ IMPORTS
         FROM FORTINET-CORE-MIB
     sysName
         FROM SNMPv2-MIB
-    InetPortNumber
+    InetPortNumber, InetAddress
         FROM INET-ADDRESS-MIB
     MODULE-COMPLIANCE, NOTIFICATION-GROUP, OBJECT-GROUP
         FROM SNMPv2-CONF
@@ -18,7 +18,7 @@ IMPORTS
 
 
 fnFortiManagerMib MODULE-IDENTITY
-    LAST-UPDATED "202105130000Z"
+    LAST-UPDATED "202204230000Z"
     ORGANIZATION
         "Fortinet Technologies, Inc."
     CONTACT-INFO
@@ -26,58 +26,77 @@ fnFortiManagerMib MODULE-IDENTITY
          email: support@fortinet.com
          http://www.fortinet.com"
     DESCRIPTION
-         "Add support for UM (FDS/FGD service)."
+        "A MIB module containing definitions of managed objects implemented by FortiManager/FortiAnalyzer products."
+    REVISION      "202204230000Z"
+    DESCRIPTION
+        "Add the following objects.
+         fmDeviceEntLogRateHour,         fmDeviceEntLogRateDay,
+         fmDeviceEntLogRateWeek,         fmDeviceEntArchiveLogUsedSpace,
+         fmAdomEntLogRateMinute,         fmAdomEntArchiveLogRetention,
+         fmAdomEntArchiveLogQuota,       fmAdomEntArchiveLogUsedSpacePercent,
+         fmAdomEntArchiveLogUsedSpace,   fmAdomEntAnalyticsLogRetention,
+         fmAdomEntAnalyticsLogQuota,     fmAdomEntAnalyticsLogUsedSpacePercent,
+         fmAdomEntAnalyticsLogUsedSpace, fmAdomEntLicGbDayToday,
+         fmAdomEntLicGbDayYesterday,     fmAdomEntLicGbDayWeekAvg,
+         fmSysLogRateHr,                 fmSysLogIndexingRate,
+         fmSysLogLagTime,                fmSysLicGbDayToday,
+         fmSysLicGbDayYesterday,         fmSysLicGbDayWeekAvg,
+         fmSysDiskInfo,                  fmSysDiskTable,
+         fmSysLogForwardInfo,            fmSysLogForwardTable."
+    REVISION    "202202040000Z"
+    DESCRIPTION
+        "Add support for UM (FDS/FGD service)."
     REVISION    "202105130000Z"
     DESCRIPTION
-         "Change fmDeviceEntPolicyPackageState syntax."
+        "Change fmDeviceEntPolicyPackageState syntax."
     REVISION    "202002120000Z"
     DESCRIPTION
-         "Add fmVdomNumber."
+        "Add fmVdomNumber."
     REVISION    "201908210000Z"
     DESCRIPTION
-         "HW sensors."
+        "HW sensors."
     REVISION    "201808070000Z"
     DESCRIPTION
-         "NPI faz800F, fmg300F."
+        "NPI faz800F, fmg300F."
     REVISION    "201710130000Z"
     DESCRIPTION
-         "NPI faz200F, faz300F, fmg200F."
+        "NPI faz200F, faz300F, fmg200F."
     REVISION    "201707270000Z"
     DESCRIPTION
-         "Added model names faz1000E, fmg400E,
-		  faz400E, fmg300E,
-		  faz3500F,
-		  faz3000F, fmg3000F,
-		  faz2000E, fmg2000E,
-		  faz3700F."
+        "Added model names faz1000E, fmg400E,
+         faz400E, fmg300E,
+         faz3500F,
+         faz3000F, fmg3000F,
+         faz2000E, fmg2000E,
+         faz3700F."
     REVISION    "201706280000Z"
     DESCRIPTION
-         "Add fmSysVersion,fmSysUpTime,fmLogRate,fmAdom,fmDevice,fmRaid,fmPower,fmHa"
+        "Add fmSysVersion,fmSysUpTime,fmLogRate,fmAdom,fmDevice,fmRaid,fmPower,fmHa"
     REVISION    "201508150000Z"
     DESCRIPTION
-         "NPI faz200E, fmg200E."
+        "NPI faz200E, fmg200E."
     REVISION    "201506120000Z"
     DESCRIPTION
-         "Add model names faz3000E, fmg4000E, faz1000D, fmg1000D."
+        "Add model names faz3000E, fmg4000E, faz1000D, fmg1000D."
     REVISION    "201404220000Z"
     DESCRIPTION
-         "Added fmSysCpuUsageExcludedNice.
-          Added fmTrapCpuThresholdExcludeNice."
+        "Added fmSysCpuUsageExcludedNice.
+         Added fmTrapCpuThresholdExcludeNice."
     REVISION    "201306100000Z"
     DESCRIPTION
-         "Add support for FortiAnalyzer."
+        "Add support for FortiAnalyzer."
     REVISION    "201303270000Z"
     DESCRIPTION
-         "Added license gb/day and device quota trap. fmTrapLicGbDayThreshold
-          and fmTrapLicDevQuotaThreshold"
+        "Added license gb/day and device quota trap. fmTrapLicGbDayThreshold
+         and fmTrapLicDevQuotaThreshold"
     REVISION    "201211260000Z"
     DESCRIPTION
-         "Added commas between notifications in NOTIFICATION-GROUP.
-          Added imports from SNMPv2-SMI and SNMPv2-TC.
-          imported `OBJECT-GROUP' from module SNMPv2-CONF"
+        "Added commas between notifications in NOTIFICATION-GROUP.
+         Added imports from SNMPv2-SMI and SNMPv2-TC.
+         imported `OBJECT-GROUP' from module SNMPv2-CONF"
     REVISION    "201204200000Z"
     DESCRIPTION
-         "Added RAID trap fmTrapRAIDStatusChange."
+        "Added RAID trap fmTrapRAIDStatusChange."
     REVISION    "201103250000Z"
     DESCRIPTION
         "Added fmSysMemUsed,fmSysMemCapacity,fmSysCpuUsage.
@@ -99,6 +118,25 @@ fnFortiManagerMib MODULE-IDENTITY
         "Initial version of FORTINET-FORTIMANAGER-MIB."
     ::= { fortinet 103 }
 
+--
+-- Type definition
+--
+FmTenths ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "d-1"
+    STATUS       current
+    DESCRIPTION
+        "An integer to be displayed with one decimal place,
+        e.g. 12345 displayed as 1234.5."
+    SYNTAX      Gauge32
+
+FmHundredths ::= TEXTUAL-CONVENTION
+    DISPLAY-HINT "d-2"
+    STATUS       current
+    DESCRIPTION
+        "An integer to be displayed with two decimal places,
+        e.g. 12345 displayed as 123.45."
+    SYNTAX      Gauge32
+---
 
 --
 -- fortinet.fnFortiManagerMib.fmTraps
@@ -421,6 +459,198 @@ fmSysLogRate OBJECT-TYPE
         "Log receiving rate in number of logs per second."
     ::= { fmSystemInfo 9 }
 
+fmSysLogRateHr OBJECT-TYPE
+    SYNTAX      FmHundredths
+    UNITS       "logs per second"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Log receiving rate in number of logs per second in higher resolution with two decimal places,
+        e.g., value 12345 should be interpreted as 123.45 logs per second."
+    ::= { fmSystemInfo 10 }
+
+fmSysLogIndexingRate OBJECT-TYPE
+    SYNTAX      FmHundredths
+    UNITS       "logs per second"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "After logs are received, they will be indexed. It shows log indexing rate in number of logs per second with two decimal places."
+    ::= { fmSystemInfo 11 }
+
+fmSysLogLagTime OBJECT-TYPE
+    SYNTAX      Gauge32
+    UNITS       "second"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The time difference between log receiving and indexing."
+    ::= { fmSystemInfo 12 }
+
+fmSysLicGbDayToday OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The gibi bytes (GiB) of logs received today with two decimal places."
+    ::= { fmSystemInfo 13 }
+
+fmSysLicGbDayYesterday OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The gibi bytes (GiB) of logs received yesterday with two decimal places."
+    ::= { fmSystemInfo 14 }
+
+fmSysLicGbDayWeekAvg OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The daily average gibi bytes (GiB) of logs received over last seven days with two decimal places."
+    ::= { fmSystemInfo 15 }
+
+--- fmsys disk table
+fmSysDiskInfo OBJECT IDENTIFIER
+    ::= { fmSystemInfo 16 }
+
+fmSysDiskNumber OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The number of disks in fmSysDiskTable."
+    ::= { fmSysDiskInfo 1 }
+
+fmSysDiskTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF FmSysDiskEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "The table of disks on this device.
+        Every type of disk is an entry of this table."
+    ::= { fmSystemInfo 17 }
+
+fmSysDiskEntry OBJECT-TYPE
+    SYNTAX      FmSysDiskEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "An entry containing disk detailed info."
+    INDEX       { fmSysDiskEntIndex }
+    ::= { fmSysDiskTable 1 }
+
+FmSysDiskEntry ::= SEQUENCE {
+    fmSysDiskEntIndex      FnIndex,
+    fmSysDiskEntName       DisplayString,
+    fmSysDiskEntUsage      Gauge32,
+    fmSysDiskEntCapacity   Gauge32,
+    fmSysDiskEntIOUtil     FmTenths
+}
+
+fmSysDiskEntIndex OBJECT-TYPE
+    SYNTAX      FnIndex
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "An index value that uniquely identifies the disk entry."
+    ::= { fmSysDiskEntry 1 }
+
+fmSysDiskEntName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The name of the disk."
+    ::= { fmSysDiskEntry 2 }
+
+fmSysDiskEntUsage OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Current disk usage (MB)."
+    ::= { fmSysDiskEntry 3 }
+
+fmSysDiskEntCapacity OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Total disk capacity (MB)."
+    ::= { fmSysDiskEntry 4 }
+
+fmSysDiskEntIOUtil OBJECT-TYPE
+    SYNTAX      FmTenths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Current disk IO utilization (percentage) with one decimal place."
+    ::= { fmSysDiskEntry 5 }
+---
+
+--- fmsys log-forward table
+fmSysLogForwardInfo OBJECT IDENTIFIER
+    ::= { fmSystemInfo 18 }
+
+fmSysLogForwardNumber OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The number of log-forward targets in fmSysLogForwardTable."
+    ::= { fmSysLogForwardInfo 1 }
+
+fmSysLogForwardTable OBJECT-TYPE
+    SYNTAX      SEQUENCE OF FmSysLogForwardEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "The table of log-forward targets configured on the device."
+    ::= { fmSystemInfo 19 }
+
+fmSysLogForwardEntry OBJECT-TYPE
+    SYNTAX      FmSysLogForwardEntry
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "An entry containing information applicable to a particular log-forward target."
+    INDEX       { fmSysLogForwardIndex }
+    ::= { fmSysLogForwardTable 1 }
+
+FmSysLogForwardEntry ::= SEQUENCE {
+    fmSysLogForwardIndex   FnIndex,
+    fmSysLogForwardName    DisplayString,
+    fmSysLogForwardRate    FmHundredths
+}
+
+fmSysLogForwardIndex OBJECT-TYPE
+    SYNTAX      FnIndex
+    MAX-ACCESS  not-accessible
+    STATUS      current
+    DESCRIPTION
+        "An index value that uniquely identifies the log-forward target."
+    ::= { fmSysLogForwardEntry 1 }
+
+fmSysLogForwardName OBJECT-TYPE
+    SYNTAX      DisplayString
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The name of the log-forward target."
+    ::= { fmSysLogForwardEntry 2 }
+
+fmSysLogForwardRate OBJECT-TYPE
+    SYNTAX      FmHundredths
+    UNITS       "logs per second"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Log forwarding rate to the particular target in number of logs per second with two decimal places."
+    ::= { fmSysLogForwardEntry 3 }
+---
+
 fmTrapHASwitch NOTIFICATION-TYPE
     OBJECTS     { fnSysSerial, sysName }
     STATUS      current
@@ -794,15 +1024,27 @@ fmAdomEntry OBJECT-TYPE
     ::= { fmAdomTable 1 }
 
 FmAdomEntry ::= SEQUENCE {
-    fmAdomEntIndex     FnIndex,
-    fmAdomEntName      DisplayString,
-    fmAdomEntState     FnBoolState,
-    fmAdomEntMode      FmAdomEntMode,
-    fmAdomEntFgtNumber Integer32,
-    fmAdomEntPolicyPackageNumber Integer32,
-    fmAdomEntOsVersion Integer32,
-    fmAdomEntMr        Integer32,
-    fmAdomEntVpnMode   FmAdomEntVpnMode
+    fmAdomEntIndex                         FnIndex,
+    fmAdomEntName                          DisplayString,
+    fmAdomEntState                         FnBoolState,
+    fmAdomEntMode                          FmAdomEntMode,
+    fmAdomEntFgtNumber                     Integer32,
+    fmAdomEntPolicyPackageNumber           Integer32,
+    fmAdomEntOsVersion                     Integer32,
+    fmAdomEntMr                            Integer32,
+    fmAdomEntVpnMode                       FmAdomEntVpnMode,
+    fmAdomEntLogRateMinute                 FmHundredths,
+    fmAdomEntArchiveLogRetention           Gauge32,
+    fmAdomEntArchiveLogQuota               Gauge32,
+    fmAdomEntArchiveLogUsedSpace           Gauge32,
+    fmAdomEntArchiveLogUsedSpacePercent    FmTenths,
+    fmAdomEntAnalyticsLogRetention         Gauge32,
+    fmAdomEntAnalyticsLogQuota             Gauge32,
+    fmAdomEntAnalyticsLogUsedSpace         Gauge32,
+    fmAdomEntAnalyticsLogUsedSpacePercent  FmTenths,
+    fmAdomEntLicGbDayToday                 FmHundredths,
+    fmAdomEntLicGbDayYesterday             FmHundredths,
+    fmAdomEntLicGbDayWeekAvg               FmHundredths
 }
 
 fmAdomEntIndex OBJECT-TYPE
@@ -896,6 +1138,106 @@ fmAdomEntVpnMode OBJECT-TYPE
         "Adom VPN mode"
     ::= { fmAdomEntry 9 }
 
+fmAdomEntLogRateMinute OBJECT-TYPE
+    SYNTAX      FmHundredths
+    UNITS       "logs per second"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The adom log receiving rate in number of logs per second over last one minute with two decimal places."
+    ::= { fmAdomEntry 10 }
+
+fmAdomEntArchiveLogRetention OBJECT-TYPE
+    SYNTAX      Gauge32
+    UNITS       "days"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The number of days adom archive logs will be kept according to the data policy."
+    ::= { fmAdomEntry 11 }
+
+fmAdomEntArchiveLogQuota OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The maximum disk space (MB) allocated for adom archive logs."
+    ::= { fmAdomEntry 12 }
+
+fmAdomEntArchiveLogUsedSpace OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Disk space (MB) adom archive logs have used."
+    ::= { fmAdomEntry 13 }
+
+fmAdomEntArchiveLogUsedSpacePercent OBJECT-TYPE
+    SYNTAX      FmTenths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Disk usage percentage of quota for adom archive logs with one decimal place."
+    ::= { fmAdomEntry 14 }
+
+fmAdomEntAnalyticsLogRetention OBJECT-TYPE
+    SYNTAX      Gauge32
+    UNITS       "days"
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The number of days adom analytics logs will be kept according to the data policy."
+    ::= { fmAdomEntry 15 }
+
+fmAdomEntAnalyticsLogQuota OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The maximum disk space (MB) allocated for adom analytics logs."
+    ::= { fmAdomEntry 16 }
+
+fmAdomEntAnalyticsLogUsedSpace OBJECT-TYPE
+    SYNTAX      Gauge32
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Disk space (MB) adom analytics logs have used."
+    ::= { fmAdomEntry 17 }
+
+fmAdomEntAnalyticsLogUsedSpacePercent OBJECT-TYPE
+    SYNTAX      FmTenths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "Disk usage percentage of quota for adom analytics logs with one decimal place."
+    ::= { fmAdomEntry 18 }
+
+fmAdomEntLicGbDayToday OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The gibi bytes (GiB) of adom logs received today with two decimal places."
+    ::= { fmAdomEntry 19 }
+
+fmAdomEntLicGbDayYesterday OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The gibi bytes (GiB) of adom logs received yesterday with two decimal places."
+    ::= { fmAdomEntry 20 }
+
+fmAdomEntLicGbDayWeekAvg OBJECT-TYPE
+    SYNTAX      FmHundredths
+    MAX-ACCESS  read-only
+    STATUS      current
+    DESCRIPTION
+        "The daily average gibi bytes (GiB) of adom logs received over last seven days with two decimal places."
+    ::= { fmAdomEntry 21 }
+---
+
 --
 -- fortinet.fnFortiManagerMib.fmDevice
 --
@@ -941,30 +1283,34 @@ fmDeviceEntry OBJECT-TYPE
     ::= { fmDeviceTable 1 }
 
 FmDeviceEntry ::= SEQUENCE {
-    fmDeviceEntIndex     FnIndex,
-    fmDeviceEntName      DisplayString,
-    fmDeviceEntSn        DisplayString,
-    fmDeviceEntMode      FmDeviceEntMode,
-    fmDeviceEntAdom      DisplayString,
-    fmDeviceEntIp        DisplayString,
-    fmDeviceEntOsVersion Integer32,
-    fmDeviceEntMr        Integer32,
-    fmDeviceEntBuild     Integer32,
-    fmDeviceEntHaMode    FmDeviceEntHaMode,
-    fmDeviceEntHaGroup   DisplayString,
-    fmDeviceEntConnectState FmDeviceEntConnectState,
-    fmDeviceEntDbState   FmDeviceEntDbState,
-    fmDeviceEntConfigState  FmDeviceEntConfigState,
-    fmDeviceEntState     FmDeviceEntState,
-    fmDeviceEntPlatform  DisplayString,
-    fmDeviceEntVdomEnabled  FnBoolState,
-    fmDeviceEntSupportState FmDeviceEntSupportState,
-    fmDeviceEntAvExpireDate DisplayString,
-    fmDeviceEntIpsExpireDate DisplayString,
-    fmDeviceEntWfExpireDate DisplayString,
-    fmDeviceEntAsExpireDate DisplayString,
-    fmDeviceEntPolicyPackageState DisplayString,
-    fmDeviceEntDesc      DisplayString
+    fmDeviceEntIndex                FnIndex,
+    fmDeviceEntName                 DisplayString,
+    fmDeviceEntSn                   DisplayString,
+    fmDeviceEntMode                 FmDeviceEntMode,
+    fmDeviceEntAdom                 DisplayString,
+    fmDeviceEntIp                   DisplayString,
+    fmDeviceEntOsVersion            Integer32,
+    fmDeviceEntMr                   Integer32,
+    fmDeviceEntBuild                Integer32,
+    fmDeviceEntHaMode               FmDeviceEntHaMode,
+    fmDeviceEntHaGroup              DisplayString,
+    fmDeviceEntConnectState         FmDeviceEntConnectState,
+    fmDeviceEntDbState              FmDeviceEntDbState,
+    fmDeviceEntConfigState          FmDeviceEntConfigState,
+    fmDeviceEntState                FmDeviceEntState,
+    fmDeviceEntPlatform             DisplayString,
+    fmDeviceEntVdomEnabled          FnBoolState,
+    fmDeviceEntSupportState         FmDeviceEntSupportState,
+    fmDeviceEntAvExpireDate         DisplayString,
+    fmDeviceEntIpsExpireDate        DisplayString,
+    fmDeviceEntWfExpireDate         DisplayString,
+    fmDeviceEntAsExpireDate         DisplayString,
+    fmDeviceEntPolicyPackageState   DisplayString,
+    fmDeviceEntDesc                 DisplayString,
+    fmDeviceEntLogRateHour          FmHundredths,
+    fmDeviceEntLogRateDay           FmHundredths,
+    fmDeviceEntLogRateWeek          FmHundredths,
+    fmDeviceEntArchiveLogUsedSpace  Gauge32
 }
 
 fmDeviceEntIndex OBJECT-TYPE
@@ -1245,6 +1591,41 @@ fmDeviceEntDesc OBJECT-TYPE
         "The description of the device"
     ::= { fmDeviceEntry 24 }
 
+fmDeviceEntLogRateHour  OBJECT-TYPE
+    SYNTAX       FmHundredths
+    UNITS        "logs per second"
+    MAX-ACCESS   read-only
+    STATUS       current
+    DESCRIPTION
+        "The device log receiving rate in number of logs per second over last one hour with two decimal places."
+    ::= { fmDeviceEntry 25}
+
+fmDeviceEntLogRateDay  OBJECT-TYPE
+    SYNTAX       FmHundredths
+    UNITS        "logs per second"
+    MAX-ACCESS   read-only
+    STATUS       current
+    DESCRIPTION
+        "The device log receiving rate in number of logs per second over last one day with two decimal places."
+    ::= { fmDeviceEntry 26}
+
+fmDeviceEntLogRateWeek  OBJECT-TYPE
+    SYNTAX       FmHundredths
+    UNITS        "logs per second"
+    MAX-ACCESS   read-only
+    STATUS       current
+    DESCRIPTION
+        "The device log receiving rate in number of logs per second over last seven days with two decimal places."
+    ::= { fmDeviceEntry 27}
+
+fmDeviceEntArchiveLogUsedSpace  OBJECT-TYPE
+    SYNTAX       Gauge32
+    MAX-ACCESS   read-only
+    STATUS       current
+    DESCRIPTION
+        "Disk space (MB) device archive logs have used."
+    ::= { fmDeviceEntry 28}
+
 --
 -- fortinet.fnFortiManagerMib.fmRaid
 --
@@ -1362,10 +1743,10 @@ FmRaidDiskEntState ::= TEXTUAL-CONVENTION
         "Raid disk status"
     SYNTAX      INTEGER {
         unavailable (0),
-        unused (1),
-        ok (2),
-        rebuilding (3),
-        failed (4),
+        failed (1),
+        unused (2),
+        ok (3),
+        rebuilding (4),
         spare (5)
     }
 
@@ -1627,16 +2008,29 @@ fmTrapsComplianceGroup NOTIFICATION-GROUP
                     fmTrapLogDataRateThreshold,
                     fmTrapLicGbDayThreshold,
                     fmTrapLicDevQuotaThreshold,
-                    fmTrapCpuThresholdExcludeNice }
+                    fmTrapCpuThresholdExcludeNice,
+                    fmTrapPowerStateChange,
+                    fmTrapFanStateChange,
+                    fmTrapTemperatureStateChange,
+                    fmTrapVoltageStateChange }
     STATUS      current
     DESCRIPTION
         "Event notifications"
     ::= { fmMIBConformance 1 }
 
 fmSystemObjectGroup OBJECT-GROUP
-    OBJECTS     { fmSysMemUsed, fmSysMemCapacity,
-                  fmSysCpuUsage, fmSysDiskCapacity,
-                  fmSysDiskUsage, fmSysCpuUsageExcludedNice }
+    OBJECTS     { fmSysMemUsed,         fmSysMemCapacity,
+                  fmSysCpuUsage,        fmSysDiskCapacity,
+                  fmSysDiskUsage,       fmSysCpuUsageExcludedNice,
+                  fmSysVersion,         fmSysUpTime,
+                  fmSysLogRate,         fmSysLogRateHr,
+                  fmSysLogLagTime,      fmSysLogIndexingRate,
+                  fmSysLicGbDayToday,   fmSysLicGbDayYesterday,
+                  fmSysLicGbDayWeekAvg, fmSysDiskNumber,
+                  fmSysDiskEntName,     fmSysDiskEntUsage,
+                  fmSysDiskEntCapacity, fmSysDiskEntIOUtil,
+                  fmSysLogForwardName,  fmSysLogForwardNumber, 
+                  fmSysLogForwardRate }
     STATUS      current
     DESCRIPTION
         "Objects pertaining to the system status of the device."
@@ -1667,6 +2061,44 @@ fmSessionComplianceGroup OBJECT-GROUP
     DESCRIPTION "Session related instrumentation"
 	::= { fmMIBConformance 4 }
 
+fmAdomComplianceGroup OBJECT-GROUP
+    OBJECTS     { fmAdomEnabled,                  fmAdomNumber,
+                  fmAdomMax,                      fmAdomEntName,
+                  fmAdomEntState,                 fmAdomEntMode,
+                  fmAdomEntFgtNumber,             fmAdomEntPolicyPackageNumber,
+                  fmAdomEntOsVersion,             fmAdomEntMr,
+                  fmAdomEntVpnMode,               fmAdomEntLogRateMinute,
+                  fmAdomEntArchiveLogRetention,   fmAdomEntArchiveLogQuota,
+                  fmAdomEntArchiveLogUsedSpace,   fmAdomEntArchiveLogUsedSpacePercent,
+                  fmAdomEntAnalyticsLogRetention, fmAdomEntAnalyticsLogQuota,
+                  fmAdomEntAnalyticsLogUsedSpace, fmAdomEntAnalyticsLogUsedSpacePercent,
+                  fmAdomEntLicGbDayToday,         fmAdomEntLicGbDayYesterday,
+                  fmAdomEntLicGbDayWeekAvg }
+    STATUS      current
+    DESCRIPTION
+        "Adom-related configuration and statistics."
+    ::= { fmMIBConformance 5 }
+
+fmDeviceComplianceGroup OBJECT-GROUP
+    OBJECTS     { fmDeviceNumber,                 fmVdomNumber,
+                  fmDeviceEntName,                fmDeviceEntSn,
+                  fmDeviceEntMode,                fmDeviceEntAdom,
+                  fmDeviceEntIp,                  fmDeviceEntOsVersion,
+                  fmDeviceEntMr,                  fmDeviceEntBuild,
+                  fmDeviceEntHaMode,              fmDeviceEntHaGroup,
+                  fmDeviceEntConnectState,        fmDeviceEntDbState,
+                  fmDeviceEntConfigState,         fmDeviceEntState,
+                  fmDeviceEntPlatform,            fmDeviceEntVdomEnabled,
+                  fmDeviceEntSupportState,        fmDeviceEntAvExpireDate,
+                  fmDeviceEntIpsExpireDate,       fmDeviceEntWfExpireDate,
+                  fmDeviceEntAsExpireDate,        fmDeviceEntPolicyPackageState,
+                  fmDeviceEntDesc,                fmDeviceEntLogRateHour,
+                  fmDeviceEntLogRateDay,          fmDeviceEntLogRateWeek,
+                  fmDeviceEntArchiveLogUsedSpace }
+    STATUS      current
+    DESCRIPTION
+        "Device-related configuration and statistics."
+    ::= { fmMIBConformance 6 }
 
 fmMIBCompliance MODULE-COMPLIANCE
     STATUS      current
@@ -1691,6 +2123,14 @@ fmMIBCompliance MODULE-COMPLIANCE
         DESCRIPTION
    	          "IP session related implementation."
 
+        GROUP   fmAdomComplianceGroup
+        DESCRIPTION
+              "This group is mandatory for adom-related configuration and statistics."
+
+        GROUP   fmDeviceComplianceGroup
+        DESCRIPTION
+              "This group is mandatory for device-related configuration and statistics."
+
     ::= { fmMIBConformance 100 }
 
 --
@@ -2512,14 +2952,14 @@ fmUmFgdQueryStatisticQueryHistoryEntryIndex OBJECT-TYPE
     ::= { fmUmFgdQueryStatisticQueryHistoryEntry 1 }
 
 fmUmFgdQueryStatisticQueryHistoryEntryBeginTime OBJECT-TYPE
-    SYNTAX      Couter64
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION ""
     ::= { fmUmFgdQueryStatisticQueryHistoryEntry 2 }
 
 fmUmFgdQueryStatisticQueryHistoryEntryEndTime OBJECT-TYPE
-    SYNTAX      Couter64
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION ""
@@ -2540,21 +2980,21 @@ fmUmFgdQueryStatisticQueryHistoryEntryDeviceAddress OBJECT-TYPE
     ::= { fmUmFgdQueryStatisticQueryHistoryEntry 5 }
 
 fmUmFgdQueryStatisticQueryHistoryEntryQueries OBJECT-TYPE
-    SYNTAX      Couter64
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION ""
     ::= { fmUmFgdQueryStatisticQueryHistoryEntry 6 }
 
 fmUmFgdQueryStatisticQueryHistoryEntryHits OBJECT-TYPE
-    SYNTAX      Couter64
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION ""
     ::= { fmUmFgdQueryStatisticQueryHistoryEntry 7 }
 
 fmUmFgdQueryStatisticQueryHistoryEntryMisses OBJECT-TYPE
-    SYNTAX      Couter64
+    SYNTAX      Counter64
     MAX-ACCESS  read-only
     STATUS      current
     DESCRIPTION ""