From 51780c2123210f2248cbe67ba902a47ac149ee28 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Thu, 3 Mar 2016 15:25:17 +0100 Subject: [PATCH 1/3] Adding GANDI-MIB for packet journey --- mibs/GANDI-MIB | 137 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 mibs/GANDI-MIB diff --git a/mibs/GANDI-MIB b/mibs/GANDI-MIB new file mode 100644 index 0000000000..b29ef900b4 --- /dev/null +++ b/mibs/GANDI-MIB @@ -0,0 +1,137 @@ +GANDI-MIB DEFINITIONS ::= BEGIN + +IMPORTS + MODULE-IDENTITY, OBJECT-TYPE, Counter64 + FROM SNMPv2-SMI + enterprises + FROM RFC1155-SMI + DisplayString + FROM SNMPv2-TC; + +gandiMIB MODULE-IDENTITY + LAST-UPDATED "201510301800Z" + ORGANIZATION "Gandi SAS - www.gandi.net" + CONTACT-INFO + "63-65 Boulevard Massena + 75013 PARIS + FRANCE + + noc@gandi.net" + DESCRIPTION + "The MIB module describe our SNMP Objects" + ::= { enterprises 26384 } + +pktjTable OBJECT-TYPE + SYNTAX SEQUENCE OF pktjTable + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "The Packet Journey table OID." + ::= { gandiMIB 1 } + +statTable OBJECT-TYPE + SYNTAX SEQUENCE OF statTable + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Packet Journey statistics OID." + ::= { pktjTable 1 } + +totalTable OBJECT-TYPE + SYNTAX SEQUENCE OF totalTable + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Total counters" + ::= { statTable 1 } + +packetsCounters OBJECT-TYPE + SYNTAX SEQUENCE OF packetsCounters + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "RX and TX counters passed into DPDK" + ::= { totalTable 1 } + +rxCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "RX packets" + ::= { packetsCounters 0 } + +txCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "TX packets" + ::= { packetsCounters 1 } + + +dropCounters OBJECT-TYPE + SYNTAX SEQUENCE OF dropCounters + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "Dropped packets counters passed into DPDK" + ::= { totalTable 2 } + +dropCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Dropped counter" + ::= { dropCounters 0 } + +acldropCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "ACL Dropped counter" + ::= { dropCounters 1 } + +ratedropCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "Rate Dropped counter" + ::= { dropCounters 2 } + +kniCounters OBJECT-TYPE + SYNTAX SEQUENCE OF kniCounters + MAX-ACCESS not-accessible + STATUS current + DESCRIPTION + "KNI counters" + ::= { totalTable 3 } + +KNIrxCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "KNI RX counter" + ::= { kniCounters 0 } + +KNItxCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "KNI TX counter" + ::= { kniCounters 1 } + +KNIdropCounter OBJECT-TYPE + SYNTAX Counter64 + MAX-ACCESS read-only + STATUS current + DESCRIPTION + "KNI DROP counter" + ::= { kniCounters 2 } + +END From 51cb9ef3d10924fb7c97339e7d81f60533f31c45 Mon Sep 17 00:00:00 2001 From: Xavier Beaudouin Date: Thu, 3 Mar 2016 15:52:44 +0100 Subject: [PATCH 2/3] Initial Gandi Packet Journey support --- html/images/os/gandi.png | Bin 0 -> 1730 bytes includes/definitions.inc.php | 12 ++++++++++++ includes/discovery/os/linux.inc.php | 14 ++++++++++++++ .../sensors/fanspeeds/lmsensors.inc.php | 2 +- .../sensors/temperatures/lm-sensors.inc.php | 2 +- .../discovery/sensors/voltages/linux.inc.php | 2 +- 6 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 html/images/os/gandi.png diff --git a/html/images/os/gandi.png b/html/images/os/gandi.png new file mode 100644 index 0000000000000000000000000000000000000000..25f0db3b62c37a7b003a7377237d1427a90827bc GIT binary patch literal 1730 zcmV;z20i(SP)W+ zYej;%5+wwYxQUS_#l78k9P`k751d6e-Bop}>aYJlB9%%> z{&014bkNk)1c2+hRI62HXJ=6q z{TD}D*;Z4j)B{CPP!t7KRS`lEJO^6{L0elJqobpEp2y0{3b|a4`}gmYNF*=}gG!}B zM@I+!{r$|$%%G|&^>%CD1@C{#z*b92Nkc;eU0q#7A`vo~46CcFY;0`s{rh(SjvhTq zTU#5JWrfDKTS5q=l)u*lQc4WNAel^JSr$`MQ%p`y5{X23_wF64s&f1GZL--cQc84P zM^O}{lsoo>rfJ%yANszJ@B4q(>7Ue9t5wS7GM6u3W@u=L(a}+E-n>b7cQ?6Q4&V2w zR;%IZ1DgRlHVa1Gy?ghA+8PBt(9_eysZ*yobm$O{<4`CR$Y!(b*|UfB^>tKLB@&6y z-rkO;X_%(T%a)kY2mgki*!0oBog87-MieocMl;1BO@cs&CQWcr%9z!q|<2{ z8ymTL^(y&%p1phb^5Vq{jvYHjJRT>VPGg#8XjfHL0-u_uAqEBpWDr$tbg5K|&dyFQ zT)4o-#s-e#kjv#58ylmwwUuNti4X$M^YDG2g@pwM2M1|xZlOifLND5%u}x~~7yOPksJDS+A!>OT%re(u~k48sU1_``<}p<~lDx24}51E~Kv zSgz}G<;oS>+uQLxk60|m*w`4ev$L3{iSPTH8V+due<>ne*ExOqG`g;1+cxodoHuXY zu(Gm3G#bVCeR_L)iO1u_<8ku&Ji4x97zWeR)8zB{{~myp64Ny4@9(ErEK)9)(KL-r zCKGnNq9}BBcGBG3OiN1(*=!cmG>Jx|WHOl$A@!N4?TKw+sA(FpSPWg)Szcb|>C>lS ztu4#q&Ye4~t*zm@E{%>^KXw0K1z(CE$ETQ7}ytRaHZX z1-u?``_j@%!otGBmXf=>yE{aK=Xn&1MRwwv9buSAB*NzE?CfM=VIe$a z?JAec95`@*L?S^X5}{hHhN5FTv8$drbLK()Js{Y=?=w9;O=DwYnBo&BPT)8Wj^l(q zpsFe(BO{^c&@_$LuV3@=KM?2GTpy~GQ+ebd1r?s_}R4NsYY2WulI2MaV zW@l%qR4QT6|NCyZzP=uwOxJaqnwl^S11Tk?QYoZrRaNmkj~_pNgv08$1K8;j;kqv4 z1vF)=}@RKhTfZR=j^=Z|j3s;ct#?c0!krIg_g?9{X3R*r-9 Y7b`j!FL-^#vH$=807*qoM6N<$g3z})8vp "GANDI-MIB", // RX Packets + "txCounter" => "GANDI-MIB", // TX Packets + "dropCounter" => "GANDI-MIB", // Dropped counters + "acldropCounter" => "GANDI-MIB", // ACL Dropped counter + "ratedropCounter" => "GANDI-MIB", // Rate Dropped counter + "KNIrxCounter" => "GANDI-MIB", // KNI RX counter + "KNItxCounter" => "GANDI-MIB", // KNI TX counter + "KNIdropCounter" => "GANDI-MIB", // KNI DROP counter + ); + register_mibs($device, $pktj_mibs, "include/discovery/os/linux.inc.php"); + } else { // Check for Synology DSM $hrSystemInitialLoadParameters = trim(snmp_get($device, 'HOST-RESOURCES-MIB::hrSystemInitialLoadParameters.0', '-Osqnv')); diff --git a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php index 8e288e73de..5396eeccb0 100644 --- a/includes/discovery/sensors/fanspeeds/lmsensors.inc.php +++ b/includes/discovery/sensors/fanspeeds/lmsensors.inc.php @@ -1,7 +1,7 @@ Date: Mon, 7 Mar 2016 10:22:49 +0100 Subject: [PATCH 3/3] Update the discovery of pktj as @murrant suggested. --- includes/discovery/os/linux.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php index 7a48938be5..3ae2e3e6da 100644 --- a/includes/discovery/os/linux.inc.php +++ b/includes/discovery/os/linux.inc.php @@ -50,7 +50,7 @@ if (!$os) { $os = 'airos-af'; } } - else if (trim(snmp_get($device, 'GANDI-MIB::rxCounter.0', '-Osqnv', 'GANDI-MIB')) != '') { + else if (snmp_get($device, 'GANDI-MIB::rxCounter.0', '-Osqnv', 'GANDI-MIB') !== false) { $os = 'pktj'; $pktj_mibs = array ( "rxCounter" => "GANDI-MIB", // RX Packets