Update standard identifiers (#303)

* Update identifiers

* Title case, add service.component.product

* Change 'Web Cam' to 'IP Camera'

* Change 'POS' to 'Point of Sale'

bin/recog_standardize

@@ -111,7 +111,7 @@ ARGV.each do |arg|
             puts "HW DEVICE MISSING: #{val}"
             hw_device[val] = true
           end          
-        when "service.product"
+        when "service.product", "service.component.product"
           if ! svc_prod[val]
             puts "SERVICE PRODUCT MISSING: #{val}"
             svc_prod[val] = true

identifiers/hw_device.txt

@@ -4,7 +4,7 @@ Access Control
 Alarm Panel
 Appliance
 Audio Encoder
-Broadband router
+Broadband Router
 Building Automation
 Cable Modem
 Check Scanner
@@ -40,10 +40,10 @@ Network Appliance
 Network Audio
 Network Management Device
 PLC
+Power Device
 Power Relay
-Power device
 Powerline
-Print server
+Print Server
 Printer
 Router
 SD-WAN Appliance
@@ -71,7 +71,6 @@ VoIP Switch
 Voice Appliance
 WAP
 WLAN Repeater
-Web cam
 Whiteboard
 Wireless Controller
 Wireless Presenter

identifiers/hw_family.txt

@@ -7,6 +7,7 @@ Communication Manager
 DVR
 DiskStation
 Document Centre
+EDR
 Extended Systems ExtendNet
 FRITZ!Box
 FRITZ!Powerline
@@ -36,6 +37,7 @@ Mac mini
 MacBook
 MacBook Pro
 MegaRAC
+MiiNePort
 Multifunction
 My Book
 NE
@@ -59,6 +61,10 @@ SIP Device
 SIP Gateway
 Service Access Switch
 Service Router
+Simatic HMI
+Simatic NET
+Simatic S7
+Simatic Sinumerik
 SoundPoint
 SoundTouch
 SpeedTouch

identifiers/hw_product.txt

@@ -7,11 +7,13 @@ ADB-4820CD
 APIC
 AV Receiver
 AVC787
+Access Control
 Access Gateway
 Access Point
 Adaptive Security Appliance
 AirPort Express
 AirPort Extreme
+Alarm Panel
 AppDynamics
 Apple TV (2nd generation)
 Apple TV (3rd generation)
@@ -38,6 +40,7 @@ CloudKey
 CommandPost
 ConnectUPS Web Card
 Crosswork SON Appliance
+DCS-932
 DD OS
 DNA Center
 DSL Router
@@ -47,6 +50,9 @@ Discovery
 Document Centre
 DuraFon
 ECOM100
+EDR-G902
+EDR-G903
+EM7
 EP-series
 EXA Signal Analyzer
 Eagle Eye Director II
@@ -67,12 +73,12 @@ FortiManager
 GigaVUE
 HDHomeRun
 HDIPCam
-HDX {hw.model}
 HiPer Access Router Card
 Home Controller
 Home Gateway
 HomePod
 Hue
+HyperFlex Connect
 IA Appliance
 IAM
 IBHLink S7++
@@ -161,20 +167,24 @@ Makito X Decoder
 MediaLink Controller
 MediaSense
 Meeting Management
+Meeting Server
 MegaRAC
 Mercury
 Mergepoint
 Miniserver
 My Book Live
 N5172B Signal Generator
+NAS4Free
 NFVIS
 NPort
 NetScreen
 NetVR
 Netbox
 Network Gateway
 Network Node
+Nexus 1000V
 Nexus Player
+OfficeConnect Switch
 OnHub
 OpenManage
 OpenManage Switch
@@ -195,12 +205,10 @@ RTU
 Rack PDU Card
 Raspberry Pi
 ReadyNAS
-RealPresence Group {hw.model}
-RealPresence Trio {hw.model}
 RecoverPoint
 ReeCam
 Roku
-Room Alert {hw.product.model}
+Room Alert
 S7 DALI Gateway
 SHIELD
 SIP Gateway
@@ -224,23 +232,24 @@ Spot
 Stealthwatch
 Storage Appliance
 Sub
+Sunny WebBox
 SuperStack 3
 SuperStack 3 Firewall
 SuperStack II
 Symmetry EN-2DBC
 System Management
 TelePresence
 TelePresence MCU
-TemPageR {hw.product.model}
 Tenable Appliance
 Tenable Core
-Thermal Label Printer {hw.model}
+Tetration
 Time Capsule
 TouchLink Control Panel
 UCS Manager
 UniFi Cloud Key
 UniFi NVR
 UniFi Security Gateway
+Univerge
 Universal Media Gateway
 VBrick Rev
 Verizon FiOS Router
@@ -256,6 +265,7 @@ Wireless Dock
 Wireless LAN Controller
 Wireless Router
 XCC
+Xfinity Broadband Router
 Xserve (Early 2008)
 Xserve (Early 2009)
 Xserve (Late 2006)
@@ -268,6 +278,7 @@ e-STUDIO
 iCOM Control Panel
 iDRAC
 iLO
+iLO 3
 iMac (21.5-inch, 2017)
 iMac (21.5-inch, Late 2012)
 iMac (21.5-inch, Late 2013)

identifiers/os_architecture.txt

@@ -1,20 +1,10 @@
-680xx
-880xx
 ARM
 ARM64
 Alpha
 MIPS
 MIPS64
-MPC
-PA
 PowerPC
-Risc
 Sparc
 System/6000
-iSeries
-ia64
-pSeries
-s390
-s390x
 x86
 x86_64

identifiers/os_device.txt

@@ -3,38 +3,32 @@ ADSL Router
 ATM DSL Unit
 Alarm Panel
 Appliance
-BBS
-Bridge
-Broadband router
+Broadband Router
 CSU/DSU
 Cable Modem
 Check Scanner
-Console server
 Copier
 DSL Modem
 DSLAM
 DSU/CSU
 DVR
 Device Server
-Domain controller
-Encryption accelerator
-Fax server
-File server
+Fax Server
+File Server
 Firewall
 Frame Relay
-Game console
-General
+HMI Controller
 HiPath
 Hub
 Hypervisor
 IDS
+IP Camera
 IPS
 KVM
 Lights Out Management
 Linux
-Load balancer
+Load Balancer
 Mainframe
-Management
 Management Processor
 Media Gateway
 Mobile
@@ -47,48 +41,34 @@ Network
 Network Audio
 Network Management Device
 Network Scanner
-Network management device
 Onboard Administrator
-PBX
-PDA
 PDU
 PLC
-POS
-Point of sale
-Power device
-Print server
+Point of Sale
+Power Device
+Print Server
 Printer
+Remote Access Server
 Remote Terminal
-Remote access server
 Router
 SD-WAN Appliance
 SSL-VPN
 Scanner
 Security Appliance
-Server
-Specialized
 Storage
 Switch
-Tablet
 Tape library
-Telecom
-Terminal server
 Test Instrument
 UPS
 USB Server
 UnixWare
 VPN
 Video Conferencing
 ViewStation
-Virtualization host
 VoIP
 VoIP Switch
 WAN Accelerator
 WAP
-Web cam
-Web proxy
-Web server
+Web Proxy
 Wireless Controller
 Wireless Presenter
-Workstation
-X terminal