From 5b32f71434a473871247714c6522c13d9719afa3 Mon Sep 17 00:00:00 2001 From: Lorenzo Zafra Date: Thu, 6 Apr 2017 13:38:12 -0600 Subject: [PATCH] newdevice: Added support for Teradici PCoIP card (#6347) * Added device discoery for Teradici PCoIP card * Removed redundant arguments from snmp_get and comments in os definition * Added 'workstations' as a device type --- html/images/logos/teradici.png | Bin 0 -> 6281 bytes html/images/os/teradici.png | Bin 0 -> 1241 bytes includes/definitions.inc.php | 6 ++++++ includes/definitions/teradici-pcoip.yaml | 11 +++++++++++ includes/polling/os/teradici-pcoip.inc.php | 11 +++++++++++ tests/OSDiscoveryTest.php | 5 +++++ tests/snmpsim/teradici-pcoip.snmprec | 2 ++ 7 files changed, 35 insertions(+) create mode 100644 html/images/logos/teradici.png create mode 100644 html/images/os/teradici.png create mode 100644 includes/definitions/teradici-pcoip.yaml create mode 100644 includes/polling/os/teradici-pcoip.inc.php create mode 100644 tests/snmpsim/teradici-pcoip.snmprec diff --git a/html/images/logos/teradici.png b/html/images/logos/teradici.png new file mode 100644 index 0000000000000000000000000000000000000000..51eea4ff2d54a58990aab959a7ca28a1cb1b5e9d GIT binary patch literal 6281 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 literal 0 HcmV?d00001 diff --git a/html/images/os/teradici.png b/html/images/os/teradici.png new file mode 100644 index 0000000000000000000000000000000000000000..23b8a8f87ef8a140b8a390595f3c8a514a327608 GIT binary patch literal 1241 zcma*lX;4#F7zW^LXe@(LP|=Qnpr~z;wS{6pG8GL_3IhxT#7R+#MX|Is3rX0Q1eCA~ z36S8}0!o5NB9$d!2Mc9d5M(h(!kS?Tn`r}KOQ7d6<$s^~&bhzt%sbzE7{1=_x;lnB z5CrLZe2wt~-_!8X)&e)?NqQFqA?$sk7p1U!*QAd(0qA~BLgB1cl9 zsMP4F*!Z}(`1rVl_#|2~jZRNVO-&yz$<2GnmQ->c74s@!&z@Hbs$bO9)rlG!MwQd! z9piGg|rkpJv9Y{Pr09(`rv*VgOQfbV5BoLGBY!>GBbutGPAStnEClECKF5ni&a=q z#4al0u!}exHiylI?_zc_r*!;f*;q|EkIUupxD`C!vx34qg6is; z+S;1B+Ipc-C=v-9M4|>!LsMf@b5mLsJCDmxRY%Ss0CD_R_|yu8Z|he9k`zTv)9vqO-YEF*Wejh zNBVjD!wvp_X=3k7;Lii0p6-~&p*pG;c!noEFfLfsU#xs8?wE^y7rhoW%T@|W6ze-W(I#t}TX(1`s$HX9thH7R zN-Q(TM*OT0>RC|^Zv%Z1nB5OK5K^1`xEtB z=0(TO2iE@R$MV?FyGO#WDAzT!J&K+dz5HWG5>QERZ8|4{uZzqPQp$({!XW8;Ol_#_ z=Cs=Ab^q`7`c-IQ@zBI?lqDyLGk)>qtAem)X`&~sLl3*1TZNCSk#mtYU8>ueGqda6J^>%a#AaI$`K+ki{Bxz|ZbcDV z3f2vB#H}RzCX=VSRSWN%k;gq_RB|y^o*3u^?IJI8oqo+xCNdO8=YkJ*p&yY@;Ke{5 LuHG2_l@Qv$m9E#f literal 0 HcmV?d00001 diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php index cb8d735110..7fe01c0c6e 100644 --- a/includes/definitions.inc.php +++ b/includes/definitions.inc.php @@ -651,6 +651,12 @@ $config['device_types'][$i]['text'] = 'Appliance'; $config['device_types'][$i]['type'] = 'appliance'; $config['device_types'][$i]['icon'] = 'appliance.png'; +$i++; +$config['device_types'][$i]['text'] = 'Workstation'; +$config['device_types'][$i]['type'] = 'workstation'; +$config['device_types'][$i]['icon'] = 'workstation.png'; + + // // No changes below this line # // diff --git a/includes/definitions/teradici-pcoip.yaml b/includes/definitions/teradici-pcoip.yaml new file mode 100644 index 0000000000..4021206ee1 --- /dev/null +++ b/includes/definitions/teradici-pcoip.yaml @@ -0,0 +1,11 @@ +os: teradici-pcoip +text: 'Teradici PCoIP' +type: workstation +icon: teradici +mib_dir: + - teradici +over: + - { graph: device_bits, text: 'Device Bits' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.25071.1 diff --git a/includes/polling/os/teradici-pcoip.inc.php b/includes/polling/os/teradici-pcoip.inc.php new file mode 100644 index 0000000000..5ca5514f9d --- /dev/null +++ b/includes/polling/os/teradici-pcoip.inc.php @@ -0,0 +1,11 @@ +checkOS('symbol'); } + public function testTeradicipcoip() + { + $this->checkOS('teradici-pcoip'); + } + public function testTimos() { $this->checkOS('timos'); diff --git a/tests/snmpsim/teradici-pcoip.snmprec b/tests/snmpsim/teradici-pcoip.snmprec new file mode 100644 index 0000000000..b2330e5e53 --- /dev/null +++ b/tests/snmpsim/teradici-pcoip.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|Teradici SNMP Agent +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.25071.1