From 80c8b70ad4809f846b1877c88b57a976fa805558 Mon Sep 17 00:00:00 2001
From: flatterlight <github@wrind.de>
Date: Sun, 13 Dec 2015 09:55:23 +0100
Subject: [PATCH 1/5] added suport for samsung printer

---
 html/images/os/samsungprinter.png            | Bin 0 -> 1329 bytes
 includes/definitions.inc.php                 |   8 ++++++++
 includes/discovery/os/samsungprinter.inc.php |   6 ++++++
 includes/polling/os/samsungprinter.inc.php   |  12 ++++++++++++
 4 files changed, 26 insertions(+)
 create mode 100644 html/images/os/samsungprinter.png
 create mode 100644 includes/discovery/os/samsungprinter.inc.php
 create mode 100644 includes/polling/os/samsungprinter.inc.php

diff --git a/html/images/os/samsungprinter.png b/html/images/os/samsungprinter.png
new file mode 100644
index 0000000000000000000000000000000000000000..f3fac3a423a7f127a6353ee53f28b95150b3312c
GIT binary patch
literal 1329
zcmV-11<v}3P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F8000E|Nkl<Zc-qC+
zdrVVT90%}kDNvv=5ELRAQ>UoGh)SJ0WTBg|#l@+h)4|M~an8()#Yv1h#i7nWKsN`Q
zdjSTt$b5hd1The=Oq7SfkijbQ=tEwuLMf#WdfR(<y%!coP>7T6B)>F0_jk_kb5Gjd
z{&@JG2XExW_V`q<Sph+tDVknBNK%tV%Nd^GjkP;BXtQ23Agw8_A#yXadexoHG)>W?
z0*+=@MXR-gKh(87bnoglfTqV+Va&T^s!a71BEZ+#P??*2toHYU<IMEHzX0(W<<SjF
zt>jKy&p2=F*~WsGz37&!$;a!;3gel#2DVsKY?7C~&%D+OsmgsKiw_Uc3^!xmu@BZ6
zbbUoEVE4~AKEG1a@y#G<wMBh6Iq>1E$dgoEJ^LvO*qm6LeM_p2v`O`$;X~f5E0Y|G
zWC0QJh1VJsn%8X!m_#aCsw7{mVF9b+3W%omKCvwUFPP-5HCg*Pz{>rXiIz^SO#!Y(
zS=%4K9^e3P?#m-&-8!2Bga%n#-MIs6S-^@tzY$9HfK36;`Zihp`8W<B-knQyJk;A1
zAQ)(sHC#9t!2({}b&2TK7;Fk~>~EDfW*_8EAb4jE@jz=7d$>9xVapQm?RbbyxrH^s
zGZ8v}D)yw@M3`tA-dO01r0g2(es3v`WR&6USLYzW&kdK#mGE?Pg1keG=<xZ7J5`30
zJHwH5u^JmfXXD7(+eq9N!afuBrd2|tCt<H`kxO&F<W6AOXBUYc-Jsal%LVDXLXn<d
zfpaDGNR4|RMuQ$_ifR!enu}#~eNbB4g3zE@IFwR^Z4t|%>d`_{SdFzSM3A=L$G#84
zu{t&l=?9}w(I{tg_kMpF(QgIeFIhK=t6I@z5`wRj%bPC6b3a6{#9Scy2Fzk_4=02L
zdSjz_HeyfYAT2HmKW5*Ai@*`yp002fI6ySl4|ke7kVDkNcd|PI{e5AjC>Tv7?kdy_
zAPlQ_rQqAxNObq~WB$yk*mv?WHmzKYDa;<pS*56ycESlJMRWd94iL2CJfSm^Vox^#
z61Rw8wOVjE<qCGJ55ehz+XxPv0h8InZWz9F4(gjbQG2%?VM}JSfZXeULaos;ClU-r
zS1(RvUdQ%z%W;nZEe?1I2^l3wh<S&7F7N#=5843}plesO-#Enq7JhP$(3>pmhmf+8
zFl+9EW?m<9P+Fz3^JY2+2;81U7|ql_-vV18tbIyl*RAw*EMVTYvxM0~iyu#zXoN+h
zP<EGRtmgn9WfEp9#3Pd?5<zO@_f_SmhX7k8gqh-rM@yV21lh{~Duw_7TTc@t#TP#*
zc_I*GudH2Fab^gxCH)!+ho}A_dEN-Jr>$L8DS4L#_^(gMhue#*##;0|5rf^0%@1m`
zH?aWkpop*B10(l?XE)};=YpUq^h=9M`sLLzEWqB`eZlnAhbwt5lLg~h|6dWbNo(%9
z@ylU~H2yT)gxI-F6P@r0`8Wm+LLQGdc5m`b2&UDdEk;^XpI=~5H6=1L<&RhLboE>G
z_2k7Hqxr%qjy!t-#)6C&K|kv8m>jFI&#Y~_R%}$?OJ$}BCbT0fc-T3*L<s#BZ4h`(
z_vbqbow?5LDVtLkSoA$yktdZWO(t`Hm%^xOzD`?ArOagAqvDUQj<z|U2`?smnGj;!
nP4LqXYp9@#i9RMQ!x#PrPHBi+<!LLN00000NkvXXu0mjfTJLh=

literal 0
HcmV?d00001

diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 82d55adfde..066f5a2c19 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -1063,6 +1063,7 @@ $config['os'][$os]['icon']             = 'comet';
 $config['os'][$os]['over'][0]['graph'] = 'device_temperature';
 $config['os'][$os]['over'][0]['text']  = 'temperature';
 
+    //printer
 $os = 'dell-laser';
 $config['os'][$os]['group']            = 'printer';
 $config['os'][$os]['text']             = 'Dell Laser';
@@ -1150,6 +1151,13 @@ $config['os'][$os]['over'][0]['text']  = 'Toner';
 $config['os'][$os]['ifname']           = 1;
 $config['os'][$os]['type']             = 'printer';
 
+$os ='samsungprinter';
+$config['os'][$os]['group']            = 'printer';
+$config['os'][$os]['text']             = 'Samsung Printer';
+$config['os'][$os]['type']             = 'printer';
+$config['os'][$os]['over'][0]['graph'] = 'device_toner';
+$config['os'][$os]['over'][0]['text']  = 'Toner';
+    
 $os = '3com';
 $config['os'][$os]['text']             = '3Com';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
diff --git a/includes/discovery/os/samsungprinter.inc.php b/includes/discovery/os/samsungprinter.inc.php
new file mode 100644
index 0000000000..2746febc6c
--- /dev/null
+++ b/includes/discovery/os/samsungprinter.inc.php
@@ -0,0 +1,6 @@
+<?php
+if (!$os) {
+    if (strstr($sysDescr, 'Samsung CLX')) {
+        $os = 'samsungprinterOS';
+    }
+}
\ No newline at end of file
diff --git a/includes/polling/os/samsungprinter.inc.php b/includes/polling/os/samsungprinter.inc.php
new file mode 100644
index 0000000000..121aa95006
--- /dev/null
+++ b/includes/polling/os/samsungprinter.inc.php
@@ -0,0 +1,12 @@
+<?php
+// private::enterprises.236.11.5.11.53.31.1.4.0 = STRING: "CLX-3170 Series"
+$hardware = trim(snmp_get($device, '1.3.6.1.4.1.236.11.5.11.53.31.1.4.0', '-OQv', '', ''), '" ');
+// mgnt::mib-2.43.5.1.1.17.1 = STRING: "QUV960066FJ124"
+$serial = trim(snmp_get($device, '1.3.6.1.2.1.43.5.1.1.17.1', '-OQv', '', ''), '" ');
+// mgnt::mib-2.1.1 = STRING: "Samsung CLX-3170 Series;V1.00.01.64 Sep-27-2010;Engine 1.77.81;NIC V4.01.20(CLX-3170) 02-05-2010;S/N JFJIUTM748HJGK983"
+$osin = trim(snmp_get($device, '1.3.6.1.2.1.1.1', '-OQv', '', ''), '" ');
+//$osin = "Samsung CLX-3170 Series;V1.00.01.64 Sep-27-2010;Engine 1.77.81;NIC V4.01.20(CLX-3170) 02-05-2010;S/N JFJIUTM748HJGK983";
+$osar = preg_split('/;S\/N [A-Z0-9]+/',$osin,-1);
+$os = array_shift($osar);
+//print_r($osar);
+//echo $os;
\ No newline at end of file

From 936b17d294acfe3dc8b9c731115312b4da37538f Mon Sep 17 00:00:00 2001
From: flatterlight <github@wrind.de>
Date: Fri, 18 Dec 2015 17:49:50 +0100
Subject: [PATCH 2/5] signed Contributor Agreement

I agree to the conditions of the Contributor Agreement
contained in doc/General/Contributing.md.
---
 AUTHORS.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index 81e7e5739f..e37abce85b 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -74,6 +74,7 @@ Contributors to LibreNMS:
 - Rick Hodger <rick@fuzzi.org.uk> (Tatermen)
 - Eldon Koyle <ekoyle@gmail.com> (ekoyle)
 - Jonathan Bailey <jcbailey@code0.net> (jcbailey2)
-- Ruairi Carroll <ruairi.carroll@gmail.com> (rucarrol) 
+- Ruairi Carroll <ruairi.carroll@gmail.com> (rucarrol)
 - Maxim Tsyplakov <maxim.tsyplakov@gmail.com> (tsypa)
+- D. Britz <github@wrind.de> (flatterlight)
 [1]: http://observium.org/ "Observium web site"

From 984491510742cf684e47fb421c9684fe186641b1 Mon Sep 17 00:00:00 2001
From: flatterlight <github@wrind.de>
Date: Fri, 18 Dec 2015 17:50:38 +0100
Subject: [PATCH 3/5] fixed OS variable

---
 includes/discovery/os/samsungprinter.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/samsungprinter.inc.php b/includes/discovery/os/samsungprinter.inc.php
index 2746febc6c..0a0ea24d65 100644
--- a/includes/discovery/os/samsungprinter.inc.php
+++ b/includes/discovery/os/samsungprinter.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!$os) {
     if (strstr($sysDescr, 'Samsung CLX')) {
-        $os = 'samsungprinterOS';
+        $os = 'samsungprinter';
     }
 }
\ No newline at end of file

From eab707daf76f8008f4627021bde19b8a7ef4d097 Mon Sep 17 00:00:00 2001
From: flatterlight <github@wrind.de>
Date: Tue, 29 Dec 2015 23:02:11 +0100
Subject: [PATCH 4/5] Update samsungprinter.inc.php

newline
---
 includes/discovery/os/samsungprinter.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/samsungprinter.inc.php b/includes/discovery/os/samsungprinter.inc.php
index 0a0ea24d65..db03b051ff 100644
--- a/includes/discovery/os/samsungprinter.inc.php
+++ b/includes/discovery/os/samsungprinter.inc.php
@@ -3,4 +3,4 @@ if (!$os) {
     if (strstr($sysDescr, 'Samsung CLX')) {
         $os = 'samsungprinter';
     }
-}
\ No newline at end of file
+}

From 41a0b40da268235235b58b2b3b278cbaafd98888 Mon Sep 17 00:00:00 2001
From: flatterlight <github@wrind.de>
Date: Tue, 29 Dec 2015 23:35:47 +0100
Subject: [PATCH 5/5] Update samsungprinter.inc.php

last new line ;)
---
 includes/polling/os/samsungprinter.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/polling/os/samsungprinter.inc.php b/includes/polling/os/samsungprinter.inc.php
index 121aa95006..ca41526214 100644
--- a/includes/polling/os/samsungprinter.inc.php
+++ b/includes/polling/os/samsungprinter.inc.php
@@ -9,4 +9,4 @@ $osin = trim(snmp_get($device, '1.3.6.1.2.1.1.1', '-OQv', '', ''), '" ');
 $osar = preg_split('/;S\/N [A-Z0-9]+/',$osin,-1);
 $os = array_shift($osar);
 //print_r($osar);
-//echo $os;
\ No newline at end of file
+//echo $os;