From db88c6d760c956b3de82a0ec5a650f6da15a5777 Mon Sep 17 00:00:00 2001 From: Aldemir Akpinar Date: Tue, 26 Sep 2017 21:59:33 +0300 Subject: [PATCH 1/4] Basic hanwha techwin support --- html/images/logos/hanwhatechwin.svg | 1 + html/images/os/hanwhatechwin.svg | 1 + includes/definitions/hanwhatechwin.yaml | 9 +++++++++ tests/snmpsim/hanwhatechwin.snmprec | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 html/images/logos/hanwhatechwin.svg create mode 100644 html/images/os/hanwhatechwin.svg create mode 100644 includes/definitions/hanwhatechwin.yaml create mode 100644 tests/snmpsim/hanwhatechwin.snmprec diff --git a/html/images/logos/hanwhatechwin.svg b/html/images/logos/hanwhatechwin.svg new file mode 100644 index 000000000000..bc0cf13d44f1 --- /dev/null +++ b/html/images/logos/hanwhatechwin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/html/images/os/hanwhatechwin.svg b/html/images/os/hanwhatechwin.svg new file mode 100644 index 000000000000..bc0cf13d44f1 --- /dev/null +++ b/html/images/os/hanwhatechwin.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/includes/definitions/hanwhatechwin.yaml b/includes/definitions/hanwhatechwin.yaml new file mode 100644 index 000000000000..526d2e7d1909 --- /dev/null +++ b/includes/definitions/hanwhatechwin.yaml @@ -0,0 +1,9 @@ +os: hanwhatechwin +text: 'Hanwha Techwin' +type: camera +icon: hanwhatechwin +over: + - { graph: device_bits, text: 'Device Traffic' } +discovery: + - sysObjectId: + - .1.3.6.1.4.1.36849 diff --git a/tests/snmpsim/hanwhatechwin.snmprec b/tests/snmpsim/hanwhatechwin.snmprec new file mode 100644 index 000000000000..51484115b47e --- /dev/null +++ b/tests/snmpsim/hanwhatechwin.snmprec @@ -0,0 +1,2 @@ +1.3.6.1.2.1.1.1.0|4|SAMSUNG iPolis H.264 Premium Level IP Camera +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.36849 From 48d1a33b58f3e9b079755aa5880a34d4cd53975a Mon Sep 17 00:00:00 2001 From: Aldemir Akpinar Date: Fri, 29 Sep 2017 09:54:41 +0300 Subject: [PATCH 2/4] Changed os type to iPolis --- includes/definitions/hanwhatechwin.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/definitions/hanwhatechwin.yaml b/includes/definitions/hanwhatechwin.yaml index 526d2e7d1909..ab5bd01d0277 100644 --- a/includes/definitions/hanwhatechwin.yaml +++ b/includes/definitions/hanwhatechwin.yaml @@ -1,4 +1,4 @@ -os: hanwhatechwin +os: iPolis text: 'Hanwha Techwin' type: camera icon: hanwhatechwin From ca30afa168c441528174df26b921e8ed325d54bd Mon Sep 17 00:00:00 2001 From: Aldemir Akpinar Date: Fri, 29 Sep 2017 16:36:33 +0300 Subject: [PATCH 3/4] Changed file names to ipolis rather than the vendor name --- includes/definitions/{hanwhatechwin.yaml => ipolis.yaml} | 2 +- tests/snmpsim/{hanwhatechwin.snmprec => ipolis.snmprec} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename includes/definitions/{hanwhatechwin.yaml => ipolis.yaml} (90%) rename tests/snmpsim/{hanwhatechwin.snmprec => ipolis.snmprec} (100%) diff --git a/includes/definitions/hanwhatechwin.yaml b/includes/definitions/ipolis.yaml similarity index 90% rename from includes/definitions/hanwhatechwin.yaml rename to includes/definitions/ipolis.yaml index 526d2e7d1909..b19e2d12ada9 100644 --- a/includes/definitions/hanwhatechwin.yaml +++ b/includes/definitions/ipolis.yaml @@ -1,4 +1,4 @@ -os: hanwhatechwin +os: ipolis text: 'Hanwha Techwin' type: camera icon: hanwhatechwin diff --git a/tests/snmpsim/hanwhatechwin.snmprec b/tests/snmpsim/ipolis.snmprec similarity index 100% rename from tests/snmpsim/hanwhatechwin.snmprec rename to tests/snmpsim/ipolis.snmprec From a0c6773c8b178eb05b02ef030b7747c9e6425d26 Mon Sep 17 00:00:00 2001 From: Aldemir Akpinar Date: Sat, 30 Sep 2017 15:19:26 +0300 Subject: [PATCH 4/4] oid fixes --- includes/definitions/ipolis.yaml | 2 +- tests/snmpsim/ipolis.snmprec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/definitions/ipolis.yaml b/includes/definitions/ipolis.yaml index b19e2d12ada9..c1e63ff5ac9f 100644 --- a/includes/definitions/ipolis.yaml +++ b/includes/definitions/ipolis.yaml @@ -6,4 +6,4 @@ over: - { graph: device_bits, text: 'Device Traffic' } discovery: - sysObjectId: - - .1.3.6.1.4.1.36849 + - .1.3.6.1.4.1.36849.1.2. diff --git a/tests/snmpsim/ipolis.snmprec b/tests/snmpsim/ipolis.snmprec index 51484115b47e..fe6a27da33fa 100644 --- a/tests/snmpsim/ipolis.snmprec +++ b/tests/snmpsim/ipolis.snmprec @@ -1,2 +1,2 @@ 1.3.6.1.2.1.1.1.0|4|SAMSUNG iPolis H.264 Premium Level IP Camera -1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.36849 +1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.36849.1.2.91